fst: rm the global startup probe def. as it fails to load values

fst/templates/_helpers.tpl

@@ -74,6 +74,28 @@ Namespace definition
 {{- end }}
 {{- end }}
 
+{{/*
+Return the proper EOS image name:tag
+*/}}
+{{- define "eos.image" -}}
+{{- $repositoryName := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | toString -}}
+
+{{- if .Values.global }}
+    {{- if and .Values.global.repository .Values.global.tag }}
+        {{- printf "%s:%s" .Values.global.repository .Values.global.tag -}}
+    {{- else if .Values.global.repository -}}
+        {{- printf "%s:%s" .Values.global.repository $tag -}}
+    {{- else if .Values.global.tag -}}
+        {{- printf "%s:%s" $repositoryName .Values.global.tag -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 MGM hostname definition
   Used to set the hostname of the MGM (short format) where:
@@ -175,32 +197,3 @@ EOS GeoTag definition
   {{ $geotag }}
 {{- end }}
 {{- end }}
-
-{{/*
-StartupProbe definition
-*/}}
-{{- define "fst.startupProbe" -}}
-  {{- if .Values.startupProbe.enabled }}
-startupProbe:
-    {{- if .Values.startupProbe.tcpSocket }}
-  tcpSocket:
-    host: {{ .Values.startupProbe.tcpSocket.host }}
-    port: {{ .Values.startupProbe.tcpSocket.port }}
-    {{- end }}
-  failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-  periodSeconds: {{ .Values.startupProbe.periodSeconds }}
-{{- else }}
-  {{- if .Values.global }}
-    {{- with .Values.global }}
-      {{- if .fst.startupProbe.enabled }}
-startupProbe:
-  tcpSocket:
-    host: {{ $.Release.Name }}-mgm
-    port: {{ .service.xrootd_mgm.port }}
-  failureThreshold: {{ .fst.startupProbe.failureThreshold }}
-  periodSeconds: {{ .fst.startupProbe.periodSeconds }}
-        {{- end }}
-      {{- end }}
-    {{- end }}
-  {{- end }}
-{{- end }}

fst/templates/service.yaml

@@ -8,19 +8,11 @@ metadata:
 spec:
   clusterIP: None
   ports:
-    {{- if .Values.global }}
-    - port: {{ .Values.global.service.fst.port }}
-    {{- else }}
     - port: {{ .Values.service.fst.port }}
-    {{- end }}
       targetPort: fst
       protocol: TCP
       name: fst
-    {{- if .Values.global }}
-    - port: {{ .Values.global.service.microhttp.port }}
-    {{- else }}
     - port: {{ .Values.service.microhttp.port }}
-    {{- end }}
       targetPort: microhttp
       protocol: TCP
       name: microhttp

fst/templates/statefulset.yaml

@@ -78,7 +78,7 @@ spec:
         {{- end }}
       containers:
         - name: eos-fst
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: {{ include "eos.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["/bin/sh", "-c"]
           args: ["/usr/bin/xrootd -n fst -c /etc/xrd.cf.fst -l /var/log/eos/xrdlog.fst -Rdaemon"]
@@ -118,7 +118,6 @@ spec:
           #   httpGet:
           #     path: /
           #     port: http
-          {{- include "fst.startupProbe" . | nindent 10 }}
           volumeMounts:
             - name: fst-cfgmap-xrd-cf-fst
               mountPath: /etc/xrd.cf.fst