fix: conditionals

zitadel · Feb 19, 2025 · 1ade9a9 · 1ade9a9
1 parent e8a7ac1
commit 1ade9a9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/charts/zitadel/templates/debug_replicaset.yaml b/charts/zitadel/templates/debug_replicaset.yaml
@@ -31,12 +31,14 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
+      {{- if or .Values.zitadel.initContainers .Values.debug.initContainers }}
       initContainers:
-      {{- if .Values.zitadel.initContainers }}
-        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zitadel.debug.initContainers }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.zitadel.debug.initContainers }}
-        {{- toYaml .Values.zitadel.debug.initContainers | nindent 8 }}
       {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}

diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
@@ -204,9 +204,10 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 14 }}
+      {{- if or .Values.zitadel.selfSignedCert.enabled .Values.zitadel.initContainers}}
       initContainers:
-      {{- if .Values.zitadel.initContainers }}
-        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.zitadel.selfSignedCert.enabled }}
         - name: generate-self-signed-cert
@@ -230,6 +231,7 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
       {{- end }}
+      {{- end }}
       volumes:
       - name: zitadel-config-yaml
         configMap:

diff --git a/charts/zitadel/templates/initjob.yaml b/charts/zitadel/templates/initjob.yaml
@@ -35,12 +35,14 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
       restartPolicy: OnFailure
+      {{- if or .Values.zitadel.initContainers .Values.initJob.initContainers }}
       initContainers:
-      {{- if .Values.zitadel.initContainers }}
-        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.initJob.initContainers }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.initJob.initContainers }}
-        {{- toYaml .Values.initJob.initContainers | nindent 8 }}
       {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}

diff --git a/charts/zitadel/templates/setupjob.yaml b/charts/zitadel/templates/setupjob.yaml
@@ -37,12 +37,14 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
       restartPolicy: OnFailure
+      {{- if or .Values.zitadel.initContainers .Values.setupJob.initContainers }}
       initContainers:
-      {{- if .Values.zitadel.initContainers }}
-        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.setupJob.initContainers }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.setupJob.initContainers }}
-        {{- toYaml .Values.setupJob.initContainers | nindent 8 }}
       {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}