feat: extraEnv per deployment

Author: simonhir

zammad/templates/deployment-nginx.yaml

@@ -58,6 +58,9 @@ spec:
           env:
             {{- include "zammad.env" . | nindent 12 }}
             {{- include "zammad.env.failOnPendingMigrations" . | nindent 12 }}
+            {{- with .Values.zammadConfig.nginx.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: http
               containerPort: 8080

zammad/templates/deployment-railsserver.yaml

@@ -46,7 +46,7 @@ spec:
       {{- end }}
       containers:
         {{- with .Values.zammadConfig.railsserver.sidecars }}
-        {{- toYaml . | nindent 8}}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
         - name: zammad-railsserver
           {{- include "zammad.containerSpec" (merge (dict "containerConfig" .Values.zammadConfig.railsserver) .) | nindent 10 }}
@@ -63,6 +63,9 @@ spec:
           env:
             {{- include "zammad.env" . | nindent 12 }}
             {{- include "zammad.env.failOnPendingMigrations" . | nindent 12 }}
+            {{- with .Values.zammadConfig.railsserver.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: railsserver
               containerPort: 3000

zammad/templates/deployment-scheduler.yaml

@@ -62,6 +62,9 @@ spec:
           env:
             {{- include "zammad.env" . | nindent 12 }}
             {{- include "zammad.env.failOnPendingMigrations" . | nindent 12 }}
+            {{- with .Values.zammadConfig.scheduler.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             {{- include "zammad.volumeMounts" . | nindent 12 }}
       volumes:

zammad/templates/deployment-websocket.yaml

@@ -52,6 +52,9 @@ spec:
           env:
             {{- include "zammad.env" . | nindent 12 }}
             {{- include "zammad.env.failOnPendingMigrations" . | nindent 12 }}
+            {{- with .Values.zammadConfig.websocket.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: websocket
               containerPort: 6042

zammad/values.yaml

@@ -139,6 +139,8 @@ zammadConfig:
       privileged: false
     # can be used to add additional containers / sidecars
     sidecars: []
+    # additional environment vars (values should be unique between deployment and global extraEnv)
+    extraEnv: []
     podLabels: {}
       # my-label: "value"
     podAnnotations: {}
@@ -227,6 +229,8 @@ zammadConfig:
     trustedProxies: "['127.0.0.1', '::1']"
     listenAddress: "[::]"
     webConcurrency: 0
+    # additional environment vars (values should be unique between deployment and global extraEnv)
+    extraEnv: []
     # tmpdir will be used by all Zammad/Rails containers
     tmpdir: "/opt/zammad/tmp"
     podLabels: {}
@@ -290,6 +294,8 @@ zammadConfig:
       privileged: false
     # can be used to add additional containers / sidecars
     sidecars: []
+    # additional environment vars (values should be unique between deployment and global extraEnv)
+    extraEnv: []
     podLabels: {}
       # my-label: "value"
     podAnnotations: {}
@@ -381,6 +387,8 @@ zammadConfig:
     listenAddress: "::"
     # can be used to add additional containers / sidecars
     sidecars: []
+    # additional environment vars (values should be unique between deployment and global extraEnv)
+    extraEnv: []
     podLabels: {}
       # my-label: "value"
     podAnnotations: {}
@@ -538,7 +546,7 @@ zammadConfig:
       podSpec: {}
       # my-podspec: "value"
 
-# additional environment vars added to all zammad services
+# additional environment vars added to all zammad services (values should be unique between deployment and global extraEnv)
 extraEnv: []
   # - name: FOO_BAR
   #   value: "foobar"