diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 18:49:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-06 18:49:46 +0100 |
commit | 54101563bbadbfafd9291a867d7fbea6df3a8b7b (patch) | |
tree | fcf9a125f6ebc3ad4182fa0edcbd7101b33aebb0 /chart/templates | |
parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
parent | 21d6bc16893a9dd24c5ef54cf2f554846c8eca5b (diff) |
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'chart/templates')
-rw-r--r-- | chart/templates/deployment-sidekiq.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml index 56ba257b5..4b108d79d 100644 --- a/chart/templates/deployment-sidekiq.yaml +++ b/chart/templates/deployment-sidekiq.yaml @@ -82,6 +82,18 @@ spec: secretKeyRef: name: {{ template "mastodon.redis.secretName" . }} key: redis-password + {{- if (and .Values.mastodon.s3.enabled .Values.mastodon.s3.existingSecret) }} + - name: "AWS_SECRET_ACCESS_KEY" + valueFrom: + secretKeyRef: + name: {{ .Values.mastodon.s3.existingSecret }} + key: AWS_SECRET_ACCESS_KEY + - name: "AWS_ACCESS_KEY_ID" + valueFrom: + secretKeyRef: + name: {{ .Values.mastodon.s3.existingSecret }} + key: AWS_ACCESS_KEY_ID + {{- end -}} {{- if .Values.mastodon.smtp.existingSecret }} - name: "SMTP_LOGIN" valueFrom: |