From a65978c5db636739bf67ae5468f1d4343d43331d Mon Sep 17 00:00:00 2001
From: Corey Zuares <corey@phc.health>
Date: Wed, 29 Jan 2025 15:02:19 -0500
Subject: [PATCH] feat: Add ability to specify initContainers

---
 charts/zitadel/Chart.yaml                      | 2 +-
 charts/zitadel/templates/debug_replicaset.yaml | 7 +++++++
 charts/zitadel/templates/deployment.yaml       | 5 ++++-
 charts/zitadel/templates/initjob.yaml          | 7 +++++++
 charts/zitadel/templates/setupjob.yaml         | 7 +++++++
 charts/zitadel/values.yaml                     | 6 ++++++
 6 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
index 2bce703..6ffd052 100644
--- 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.2
+version: 8.11.3
 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
index 4cf81ce..f610823 100644
--- a/charts/zitadel/templates/debug_replicaset.yaml
+++ b/charts/zitadel/templates/debug_replicaset.yaml
@@ -31,6 +31,13 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
+      initContainers:
+      {{- if .Values.zitadel.initContainers }}
+        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- end }}
+      {{- if .Values.zitadel.debug.initContainers }}
+        {{- toYaml .Values.zitadel.debug.initContainers | nindent 8 }}
+      {{- 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
index f48fa62..11ddbae 100644
--- a/charts/zitadel/templates/deployment.yaml
+++ b/charts/zitadel/templates/deployment.yaml
@@ -204,8 +204,11 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 14 }}
-      {{- if .Values.zitadel.selfSignedCert.enabled }}
       initContainers:
+      {{- if .Values.zitadel.initContainers }}
+        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- end }}
+      {{- if .Values.zitadel.selfSignedCert.enabled }}
         - name: generate-self-signed-cert
           image: alpine/openssl
           env:
diff --git a/charts/zitadel/templates/initjob.yaml b/charts/zitadel/templates/initjob.yaml
index 8495b30..8e16f5e 100644
--- a/charts/zitadel/templates/initjob.yaml
+++ b/charts/zitadel/templates/initjob.yaml
@@ -35,6 +35,13 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
       restartPolicy: OnFailure
+      initContainers:
+      {{- if .Values.zitadel.initContainers }}
+        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- end }}
+      {{- if .Values.initJob.initContainers }}
+        {{- toYaml .Values.initJob.initContainers | nindent 8 }}
+      {{- 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
index d82af60..a490c8a 100644
--- a/charts/zitadel/templates/setupjob.yaml
+++ b/charts/zitadel/templates/setupjob.yaml
@@ -37,6 +37,13 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       enableServiceLinks: false
       restartPolicy: OnFailure
+      initContainers:
+      {{- if .Values.zitadel.initContainers }}
+        {{- toYaml .Values.zitadel.initContainers | nindent 8 }}
+      {{- end }}
+      {{- if .Values.setupJob.initContainers }}
+        {{- toYaml .Values.setupJob.initContainers | nindent 8 }}
+      {{- end }}
       containers:
       {{- if .Values.zitadel.extraContainers }}
         {{- toYaml .Values.zitadel.extraContainers | nindent 8 }}
diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
index dfbcce0..50ef1db 100644
--- a/charts/zitadel/values.yaml
+++ b/charts/zitadel/values.yaml
@@ -73,8 +73,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: []
@@ -221,6 +225,7 @@ initJob:
   resources: {}
   backoffLimit: 5
   activeDeadlineSeconds: 300
+  initContainers: []
   extraContainers: []
   podAnnotations: {}
   podAdditionalLabels: {}
@@ -239,6 +244,7 @@ setupJob:
     helm.sh/hook-weight: "2"
   resources: {}
   activeDeadlineSeconds: 300
+  initContainers: []
   extraContainers: []
   podAnnotations: {}
   podAdditionalLabels: {}