From be16de054b7c0c927c531e93e6a95dcf9fef9022 Mon Sep 17 00:00:00 2001
From: Stijn Brouwers <stijn@bdcommit.com>
Date: Mon, 26 Feb 2024 10:05:42 +0100
Subject: [PATCH] bugfix(minio): Fix authentication bug when using existing
 secret (#253)

---
 zammad/Chart.yaml             |  2 +-
 zammad/templates/_helpers.tpl | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 1ed914ad..c23c730c 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 10.3.0
+version: 10.3.1
 appVersion: 6.2.0-1
 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
diff --git a/zammad/templates/_helpers.tpl b/zammad/templates/_helpers.tpl
index 1d7c8d1a..9a4a8a61 100644
--- a/zammad/templates/_helpers.tpl
+++ b/zammad/templates/_helpers.tpl
@@ -115,8 +115,18 @@ S3 access URL
   value: {{ . | quote }}
 {{- else -}}
 {{- if .Values.zammadConfig.minio.enabled -}}
+{{- if .Values.minio.auth.existingSecret -}}
+{{ $existingSecret := (lookup "v1" "Secret" .Release.Namespace .Values.minio.auth.existingSecret) }}
+{{- if $existingSecret }}
 - name: S3_URL
-  value: "http://zammadadmin:zammadadmin@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true"
+  value: "http://{{ index $existingSecret "data" "root-user" | b64dec }}:{{ index $existingSecret "data" "root-password" | b64dec }}@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true"
+{{- else }}
+{{- fail "Unable to retrieve the secret used to set the minio authentication values (Values.minio.auth.existingSecret)" }}
+{{- end -}}
+{{- else -}}
+- name: S3_URL
+  value: "http://{{ .Values.minio.auth.rootUser }}:{{ .Values.minio.auth.rootPassword }}@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true"
+{{- end -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}