diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index 8d0dbd1d..96fbf8e0 100755 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: zammad -version: 15.2.5 +version: 15.3.0 appVersion: 6.5.2-22 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 80c4e3a6..16fa3ba2 100755 --- a/zammad/templates/_helpers.tpl +++ b/zammad/templates/_helpers.tpl @@ -165,6 +165,13 @@ S3 access URL value: "http://{{ .Values.minio.auth.rootUser }}:{{ .Values.minio.auth.rootPassword }}@{{ include "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true" {{- end -}} {{- end -}} +{{- if .Values.secrets.s3.useExisting -}} +- name: S3_URL + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.s3.secretName }} + key: {{ .Values.secrets.s3.secretKey }} +{{- end -}} {{- end -}} {{- end -}} diff --git a/zammad/values.yaml b/zammad/values.yaml index 30c5d361..bac79c32 100755 --- a/zammad/values.yaml +++ b/zammad/values.yaml @@ -53,6 +53,10 @@ secrets: useExisting: false secretKey: redis-password secretName: redis-pass + s3: + useExisting: false + secretKey: s3-url + secretName: s3-url securityContext: fsGroup: 1000