about summary refs log tree commit diff
path: root/chart/templates/job-assets-precompile.yaml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-08-15 14:33:05 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-08-15 14:33:05 +0200
commite2a7a458d6c62a312b868375b05d663fbca6f20d (patch)
treef8067c389d1414670574118f5f4115aeffe05061 /chart/templates/job-assets-precompile.yaml
parent3f15326a05a926e9f001800a48ac2addbd3aa833 (diff)
parent113dd90aa3e8dd930fa343a2dea52e64bf63eb06 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'chart/templates/job-assets-precompile.yaml')
-rw-r--r--chart/templates/job-assets-precompile.yaml12
1 files changed, 4 insertions, 8 deletions
diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml
index 825a7e916..4aa8d1407 100644
--- a/chart/templates/job-assets-precompile.yaml
+++ b/chart/templates/job-assets-precompile.yaml
@@ -50,21 +50,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 }}