feat: Add ability to specify initContainers (#305)

* feat: Add ability to specify initContainers * Update Chart.yaml * fix: conditionals
zitadel · Feb 20, 2025 · 25f1b44 · 25f1b44
1 parent e4fce6f
commit 25f1b44
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 2 deletions.
diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
@@ -3,7 +3,7 @@ name: zitadel
 description: A Helm chart for ZITADEL
 type: application
 appVersion: v2.67.2
-version: 8.11.3
+version: 8.12.0
 kubeVersion: '>= 1.21.0-0'
 icon: https://zitadel.com/zitadel-logo-dark.svg
 maintainers:

diff --git a/charts/zitadel/templates/debug_replicaset.yaml b/charts/zitadel/templates/debug_replicaset.yaml
@@ -31,6 +31,15 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
+      {{- if or .Values.zitadel.initContainers .Values.debug.initContainers }}
+      initContainers:
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.zitadel.debug.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}
         {{- toYaml .Values.zitadel.extraContainers | nindent 8 }}

diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
@@ -204,8 +204,12 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 14 }}
-      {{- if .Values.zitadel.selfSignedCert.enabled }}
+      {{- if or .Values.zitadel.selfSignedCert.enabled .Values.zitadel.initContainers}}
       initContainers:
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.zitadel.selfSignedCert.enabled }}
         - name: generate-self-signed-cert
           image: alpine/openssl
           env:
@@ -227,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,6 +35,15 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
       restartPolicy: OnFailure
+      {{- if or .Values.zitadel.initContainers .Values.initJob.initContainers }}
+      initContainers:
+      {{- with .Values.zitadel.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.initJob.initContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}
         {{- toYaml .Values.zitadel.extraContainers | nindent 8 }}

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

diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
@@ -79,8 +79,12 @@ zitadel:
     annotations:
       helm.sh/hook: pre-install,pre-upgrade
       helm.sh/hook-weight: "1"
+    initContainers: []
     extraContainers: []
 
+  # initContainers allow you to add any init containers you wish to use globally.
+  # Additionally, they follow the same structure as extraContainers
+  initContainers: []
   # extraContainers allows you to add any sidecar containers you wish to use globally.
   # Currently this is the Zitadel Deployment, Setup Job**, Init Job** and debug_replicaset**  **If Enabled
   extraContainers: []
@@ -227,6 +231,7 @@ initJob:
   resources: {}
   backoffLimit: 5
   activeDeadlineSeconds: 300
+  initContainers: []
   extraContainers: []
   podAnnotations: {}
   podAdditionalLabels: {}
@@ -245,6 +250,7 @@ setupJob:
     helm.sh/hook-weight: "2"
   resources: {}
   activeDeadlineSeconds: 300
+  initContainers: []
   extraContainers: []
   podAnnotations: {}
   podAdditionalLabels: {}