feat: support extraVolumes and extraVolumeMounts (#205)

Add extraVolumes and extraVolumeMounts; closes #127
zitadel · May 24, 2024 · 68cc3e3 · 68cc3e3
1 parent 262325f
commit 68cc3e3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
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.51.3"
-version: 7.14.0
+version: 7.15.0
 kubeVersion: ">= 1.21.0-0"
 icon: https://zitadel.com/zitadel-logo-dark.svg
 maintainers:

diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
@@ -160,6 +160,9 @@ spec:
           - name: tls
             mountPath: /etc/tls
           {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 14 }}
       initContainers:
@@ -268,6 +271,9 @@ spec:
       - name: tls
         emptyDir: {}
       {{- end }}
+      {{- with .Values.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/zitadel/templates/initjob.yaml b/charts/zitadel/templates/initjob.yaml
@@ -94,6 +94,9 @@ spec:
             mountPath: /config
           - name: chowned-secrets
             mountPath: /.secrets
+          {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.initJob.resources | nindent 14 }}
         {{- if .Values.initJob.extraContainers }}
@@ -178,6 +181,9 @@ spec:
       {{- end }}
       - name: chowned-secrets
         emptyDir: {}
+      {{- with .Values.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/zitadel/templates/setupjob.yaml b/charts/zitadel/templates/setupjob.yaml
@@ -101,6 +101,9 @@ spec:
           - name: machinekey
             mountPath: "/machinekey"
           {{- end}}
+          {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.setupJob.resources | nindent 12 }}
         {{- if include "deepCheck" (dict "root" .Values "path" (splitList "." "zitadel.configmapConfig.FirstInstance.Org.Machine")) }}
@@ -200,6 +203,9 @@ spec:
       {{- end }}
       - name: chowned-secrets
         emptyDir: {}
+      {{- with .Values.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
@@ -235,3 +235,15 @@ pdb:
   minAvailable: 1
   # maxUnavailable: 1
   annotations: {}
+
+extraVolumes: []
+  # - name: ca-certs
+  #   secret:
+  #     defaultMode: 420
+  #     secretName: ca-certs
+
+extraVolumeMounts: []
+  # - name: ca-certs
+  #   mountPath: /etc/ssl/certs/myca.pem
+  #   subPath: myca.pem
+  #   readOnly: true