From 75417ef741fa0a5a1620f0e9e32a2f6b293a130c Mon Sep 17 00:00:00 2001
From: Simon Hirtreiter <simon.hirtreiter@muenchen.de>
Date: Mon, 15 Dec 2025 13:31:23 +0100
Subject: [PATCH 1/2] feat: extraEnv per deployment

---
 zammad/templates/deployment-nginx.yaml       |  3 +++
 zammad/templates/deployment-railsserver.yaml |  5 ++++-
 zammad/templates/deployment-scheduler.yaml   |  3 +++
 zammad/templates/deployment-websocket.yaml   |  3 +++
 zammad/values.yaml                           | 10 +++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/zammad/templates/deployment-nginx.yaml b/zammad/templates/deployment-nginx.yaml
index aa728cbc..65af2cc9 100644
--- a/zammad/templates/deployment-nginx.yaml
+++ b/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
diff --git a/zammad/templates/deployment-railsserver.yaml b/zammad/templates/deployment-railsserver.yaml
index 9bc6dd5c..f2b2d48e 100644
--- a/zammad/templates/deployment-railsserver.yaml
+++ b/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
diff --git a/zammad/templates/deployment-scheduler.yaml b/zammad/templates/deployment-scheduler.yaml
index 283f87b4..f264317d 100644
--- a/zammad/templates/deployment-scheduler.yaml
+++ b/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:
diff --git a/zammad/templates/deployment-websocket.yaml b/zammad/templates/deployment-websocket.yaml
index 4e7161d1..491f1527 100755
--- a/zammad/templates/deployment-websocket.yaml
+++ b/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
diff --git a/zammad/values.yaml b/zammad/values.yaml
index 5edde436..773afda0 100755
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -141,6 +141,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: {}
@@ -229,6 +231,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: {}
@@ -292,6 +296,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: {}
@@ -383,6 +389,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: {}
@@ -540,7 +548,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"

From c799fcccc66bc8574398f9d3ad40d5f37eec9a60 Mon Sep 17 00:00:00 2001
From: Simon Hirtreiter <simon.hirtreiter@muenchen.de>
Date: Mon, 15 Dec 2025 14:54:33 +0100
Subject: [PATCH 2/2] chore: bump chart version 15.6.0

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

diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index dd29be7c..f990f928 100755
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 15.5.0
+version: 15.6.0
 appVersion: 6.5.2-46
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org