From 17ef8eca18b781d29ca385038468cba2b9236e16 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Tue, 17 Dec 2024 20:37:43 +0100
Subject: [PATCH] Patch level image updates and nginx config improvement (#309)

---
 .github/updatecli.yaml                |  4 ++--
 zammad/Chart.yaml                     | 14 +++++++-------
 zammad/templates/configmap-nginx.yaml |  2 ++
 zammad/values.yaml                    |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/updatecli.yaml b/.github/updatecli.yaml
index bf8fc24c..7612aa13 100644
--- a/.github/updatecli.yaml
+++ b/.github/updatecli.yaml
@@ -6,9 +6,9 @@ sources:
     spec:
       image: "zammad/zammad-docker-compose"
       architecture: "linux/amd64"
-      tagfilter: "^6\\.4\\.1$"
+      # tagfilter: "^6\\.4\\.1$"
       # tagfilter: "^6\\.4\\.1-\\d{1}"
-      # tagfilter: "^6\\.4\\.1-\\d{2}"
+      tagfilter: "^6\\.4\\.1-\\d{2}"
       # tagfilter: "^6\\.4\\.1-\\d{3}"
   alpine:
     kind: dockerimage
diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 12c535ae..58ea9192 100755
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: zammad
-version: 13.0.5
-appVersion: 6.4.1
+version: 13.0.6
+appVersion: 6.4.1-10
 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
 icon: https://raw.githubusercontent.com/zammad/zammad-documentation/main/images/zammad_logo_600x520.png
@@ -16,21 +16,21 @@ maintainers:
 dependencies:
   - name: elasticsearch
     repository: https://charts.bitnami.com/bitnami
-    version: 21.3.26
+    version: 21.4.1
     condition: zammadConfig.elasticsearch.enabled
   - name: minio
-    version: 14.8.6
+    version: 14.10.1
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.minio.enabled
   - name: memcached
-    version: 7.5.3
+    version: 7.6.0
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.memcached.enabled
   - name: postgresql
-    version: 16.2.5
+    version: 16.3.2
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.postgresql.enabled
   - name: redis
-    version: 20.4.0
+    version: 20.6.0
     repository: https://charts.bitnami.com/bitnami
     condition: zammadConfig.redis.enabled
diff --git a/zammad/templates/configmap-nginx.yaml b/zammad/templates/configmap-nginx.yaml
index bd5d52c0..185e871a 100644
--- a/zammad/templates/configmap-nginx.yaml
+++ b/zammad/templates/configmap-nginx.yaml
@@ -69,6 +69,7 @@ data:
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $http_host;
             proxy_set_header CLIENT_IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             {{- range .Values.zammadConfig.nginx.websocketExtraHeaders }}
@@ -82,6 +83,7 @@ data:
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $http_host;
             proxy_set_header CLIENT_IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_read_timeout 86400;
diff --git a/zammad/values.yaml b/zammad/values.yaml
index fb477fc4..0573091e 100755
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -334,7 +334,7 @@ zammadConfig:
       enabled: true
       image:
         repository: alpine
-        tag: "3.20.3"
+        tag: "3.21.0"
         pullPolicy: IfNotPresent
       command:
         - /bin/sh