diff --git a/charts/openproject/templates/secret_s3.yaml b/charts/openproject/templates/secret_s3.yaml index 8906b4e..6f98036 100644 --- a/charts/openproject/templates/secret_s3.yaml +++ b/charts/openproject/templates/secret_s3.yaml @@ -10,13 +10,13 @@ stringData: OPENPROJECT_ATTACHMENTS__STORAGE: fog OPENPROJECT_FOG_CREDENTIALS_PROVIDER: AWS {{ $secret := (lookup "v1" "Secret" "openproject" .Values.s3.auth.existingSecret) | default (dict "data" dict) -}} - OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: {{ + OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: {{- default .Values.s3.auth.accessKeyId (get $secret.data .Values.s3.auth.secretKeys.accessKeyId) }} - OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY: {{ + OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY: {{- default .Values.s3.auth.secretAccessKey (get $secret.data .Values.s3.auth.secretKeys.secretAccessKey) }} - {{- if .Values.s3.endpoint -}} + {{ if .Values.s3.endpoint -}} OPENPROJECT_FOG_CREDENTIALS_ENDPOINT: {{ .Values.s3.endpoint }} {{- end }} OPENPROJECT_FOG_DIRECTORY: {{ .Values.s3.bucketName }}