Allow S3 to use an existing secret (#18997)

2 years ago · 42ef7b3705
parent a09033d81f
commit 42ef7b3705
1 changed files with 12 additions and 0 deletions
--- a/chart/templates/deployment-web.yaml
+++ b/chart/templates/deployment-web.yaml
@ -70,6 +70,18 @@ spec:
                  key: redis-password
            - name: "PORT"
              value: {{ .Values.mastodon.web.port | quote }}
+            {{- 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 (not .Values.mastodon.s3.enabled) }}
          volumeMounts:
            - name: assets