about summary refs log tree commit diff
path: root/chart/templates/job-chewy-upgrade.yaml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-08-15 16:35:15 +0200
committerGitHub <noreply@github.com>2022-08-15 16:35:15 +0200
commitaba0032f540407d88144ac637a59fce69625546f (patch)
tree4ce630b36a8b36c51b1224d87b97e198e63c2edf /chart/templates/job-chewy-upgrade.yaml
parent3f15326a05a926e9f001800a48ac2addbd3aa833 (diff)
parent41fa50ac8655e0c15cf5e93fa14f9ce847aec88f (diff)
Merge pull request #1825 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'chart/templates/job-chewy-upgrade.yaml')
-rw-r--r--chart/templates/job-chewy-upgrade.yaml12
1 files changed, 4 insertions, 8 deletions
diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml
index cc68a3385..16b4f75a7 100644
--- a/chart/templates/job-chewy-upgrade.yaml
+++ b/chart/templates/job-chewy-upgrade.yaml
@@ -51,21 +51,17 @@ spec:
             - configMapRef:
                 name: {{ include "mastodon.fullname" . }}-env
             - secretRef:
-                name: {{ template "mastodon.fullname" . }}
+                name: {{ template "mastodon.secretName" . }}
           env:
             - name: "DB_PASS"
               valueFrom:
                 secretKeyRef:
-                  {{- if .Values.postgresql.enabled }}
-                  name: {{ .Release.Name }}-postgresql
-                  {{- else }}
-                  name: {{ template "mastodon.fullname" . }}
-                  {{- end }}
-                  key: postgresql-password
+                  name: {{ template "mastodon.postgresql.secretName" . }}
+                  key: password
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}-redis
+                  name: {{ template "mastodon.redis.secretName" . }}
                   key: redis-password
             - name: "PORT"
               value: {{ .Values.mastodon.web.port | quote }}