From 3ff9582449b3dee22867191ebc56a6f4a633b452 Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Fri, 1 Mar 2024 09:34:04 +0100
Subject: [PATCH 1/2] fix: setup with secret config

---
 charts/zitadel/templates/setupjob.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/zitadel/templates/setupjob.yaml b/charts/zitadel/templates/setupjob.yaml
index 551b5b15..ad89dbfe 100644
--- a/charts/zitadel/templates/setupjob.yaml
+++ b/charts/zitadel/templates/setupjob.yaml
@@ -42,19 +42,23 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - setup
+            - --masterkeyFromEnv
             - --config
             - /config/zitadel-config-yaml
+            - --steps
+            - /config/zitadel-config-yaml
             {{- if .Values.zitadel.secretConfig }}
             - --config
             - /.secrets/zitadel-secrets-yaml/zitadel-secrets-yaml
+            - --steps
+            - /.secrets/zitadel-secrets-yaml/zitadel-secrets-yaml
             {{- end }}
             {{- if and .Values.zitadel.configSecretName .Values.zitadel.configSecretKey }}
             - --config
             - /.secrets/zitadel-secret-config-yaml/{{ .Values.zitadel.configSecretKey }}
-            {{- end }}
             - --steps
-            - /config/zitadel-config-yaml
-            - --masterkeyFromEnv
+            - /.secrets/zitadel-secret-config-yaml/{{ .Values.zitadel.configSecretKey }}
+            {{- end }}
             {{- if .Values.setupJob.additionalArgs }}
             {{- toYaml .Values.setupJob.additionalArgs | nindent 12 }}
             {{- end }}

From 21dc09516335d1f7e89284c1ed53f3d4f7e4551b Mon Sep 17 00:00:00 2001
From: Elio Bischof <elio@zitadel.com>
Date: Fri, 1 Mar 2024 09:38:03 +0100
Subject: [PATCH 2/2] patch

---
 charts/zitadel/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
index dd3082b9..76c7bed9 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.46.0"
-version: 7.8.0
+version: 7.8.1
 kubeVersion: ">= 1.21.0-0"
 icon: https://zitadel.com/zitadel-logo-dark.svg
 maintainers: