Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch level image updates and nginx config improvement #309

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/updatecli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions zammad/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions zammad/templates/configmap-nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion zammad/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ zammadConfig:
enabled: true
image:
repository: alpine
tag: "3.20.3"
tag: "3.21.0"
pullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down