Merge pull request #141 from aogier/feature/secret-env

secret env vars
docker-mailserver · Jan 27, 2025 · f50ceda · f50ceda
2 parents 0ad4d47 + dc45b8c
commit f50ceda
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/charts/docker-mailserver/Chart.yaml b/charts/docker-mailserver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "14.0.0"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 4.0.7
+version: 4.1.0
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:

diff --git a/charts/docker-mailserver/templates/deployment.yaml b/charts/docker-mailserver/templates/deployment.yaml
@@ -102,8 +102,12 @@ spec:
           env:
           {{- range $pkey, $pval := .Values.deployment.env }}
           - name: {{ $pkey }}
+            {{- if kindIs "map" $pval }}
+            {{- toYaml $pval | nindent 12 }}
+            {{- else }}
             value: {{ quote $pval }}
-          {{- end }} 
+            {{- end }}
+          {{- end }}
 
           {{- if .Values.certificate }}
           - name: SSL_TYPE
@@ -114,6 +118,14 @@ spec:
             value: /tmp/dms/custom-certs/tls.key
           {{- end }}
 
+          {{- if .Values.deployment.secretEnvironments }}
+          envFrom:
+          {{- range .Values.deployment.secretEnvironments }}
+          - secretRef:
+              name: {{ . | quote }}
+          {{- end }}
+          {{- end }}
+
           resources:
 {{ toYaml .Values.deployment.resources | indent 12 }}
           securityContext: