Fix tests after tricky cherry-picks

astronomer · Feb 6, 2024 · 303ea25 · 303ea25
1 parent 0abc690
commit 303ea25
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/charts/kibana/templates/_helpers.tpl b/charts/kibana/templates/_helpers.tpl
@@ -63,3 +63,11 @@ imagePullSecrets:
   - name: {{ .Values.global.privateRegistry.secretName }}
 {{- end -}}
 {{- end -}}
+
+{{- define "kibana.securityContext" -}}
+{{- if or (eq ( toString ( .Values.securityContext.runAsUser )) "auto") ( .Values.global.openshiftEnabled ) }}
+{{- omit  .Values.securityContext "runAsUser" | toYaml | nindent 12 }}
+{{- else }}
+{{- .Values.securityContext | toYaml | nindent 12 }}
+{{- end -}}
+{{- end }}
diff --git a/charts/prometheus/templates/_helpers.yaml b/charts/prometheus/templates/_helpers.yaml
@@ -85,3 +85,11 @@ imagePullSecrets:
   - name: {{ .Values.global.privateRegistry.secretName }}
 {{- end -}}
 {{- end -}}
+
+{{- define "prometheus.securityContext" -}}
+{{- if or (eq ( toString ( .Values.securityContext.runAsUser )) "auto") ( .Values.global.openshiftEnabled )  }}
+{{- omit  .Values.securityContext "runAsUser" | toYaml | nindent 12 }}
+{{- else }}
+{{- .Values.securityContext | toYaml | nindent 12 }}
+{{- end -}}
+{{- end }}
diff --git a/charts/prometheus/templates/prometheus-statefulset.yaml b/charts/prometheus/templates/prometheus-statefulset.yaml
@@ -83,7 +83,7 @@ spec:
             - --volume-dir=/etc/prometheus/config
           image: {{ include "configReloader.image" . }}
           imagePullPolicy: {{ .Values.images.prometheus.pullPolicy }}
-          securityContext: {{ toYaml .Values.securityContext| nindent 12 }}
+          securityContext: {{ template "prometheus.securityContext" . }}
           resources:
 {{ toYaml .Values.configMapReloader.resources | indent 12 }}
           volumeMounts:
@@ -94,7 +94,7 @@ spec:
 
         - name: prometheus
           image: {{ include "prometheus.image" . }}
-          securityContext: {{ toYaml .Values.securityContext| nindent 12 }}
+          securityContext: {{ template "prometheus.securityContext" . }}
           imagePullPolicy: {{ .Values.images.prometheus.pullPolicy }}
           resources: {{ toYaml .Values.resources | nindent 12 }}
           args: