Skip to content

Commit d0d1dad

Browse files
authored
feat: Allow existing secret for S3_URL (#381)
* feat: Allow existing secret for S3_URL * Bump version
1 parent 407e007 commit d0d1dad

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

zammad/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: zammad
3-
version: 15.2.5
3+
version: 15.3.0
44
appVersion: 6.5.2-22
55
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.
66
home: https://zammad.org

zammad/templates/_helpers.tpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ S3 access URL
165165
value: "http://{{ .Values.minio.auth.rootUser }}:{{ .Values.minio.auth.rootPassword }}@{{ include "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true"
166166
{{- end -}}
167167
{{- end -}}
168+
{{- if .Values.secrets.s3.useExisting -}}
169+
- name: S3_URL
170+
valueFrom:
171+
secretKeyRef:
172+
name: {{ .Values.secrets.s3.secretName }}
173+
key: {{ .Values.secrets.s3.secretKey }}
174+
{{- end -}}
168175
{{- end -}}
169176
{{- end -}}
170177

zammad/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ secrets:
5353
useExisting: false
5454
secretKey: redis-password
5555
secretName: redis-pass
56+
s3:
57+
useExisting: false
58+
secretKey: s3-url
59+
secretName: s3-url
5660

5761
securityContext:
5862
fsGroup: 1000

0 commit comments

Comments
 (0)