diff options
| author | Ben Hardill <b.hardill@gmail.com> | 2022-10-30 00:30:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-30 01:30:16 +0200 |
| commit | 6094a916b185ae0634e016004deb4cec11afbaca (patch) | |
| tree | 4cd63e12b59ae0ab5dacb6748f9da1c5b4c8feac | |
| parent | 30ef11022487364256656efee3cee92db2c839b2 (diff) | |
Fix helm chart use of Postgres Password (#19537)
Fixes #19536
| -rw-r--r-- | chart/templates/cronjob-media-remove.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/deployment-sidekiq.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/deployment-streaming.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/deployment-web.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/job-assets-precompile.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/job-chewy-upgrade.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/job-create-admin.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/job-db-migrate.yaml | 2 | ||||
| -rw-r--r-- | chart/templates/secrets.yaml | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml index 4ca45804a..1dced69ec 100644 --- a/chart/templates/cronjob-media-remove.yaml +++ b/chart/templates/cronjob-media-remove.yaml @@ -59,7 +59,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml index 44d3b8203..56ba257b5 100644 --- a/chart/templates/deployment-sidekiq.yaml +++ b/chart/templates/deployment-sidekiq.yaml @@ -76,7 +76,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml index 6b7c3cdd9..564f53f43 100644 --- a/chart/templates/deployment-streaming.yaml +++ b/chart/templates/deployment-streaming.yaml @@ -44,7 +44,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml index c5d177e51..0878aa9b8 100644 --- a/chart/templates/deployment-web.yaml +++ b/chart/templates/deployment-web.yaml @@ -62,7 +62,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml index c20b4a370..37009822e 100644 --- a/chart/templates/job-assets-precompile.yaml +++ b/chart/templates/job-assets-precompile.yaml @@ -60,7 +60,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml index cf7b59b58..a4bac63ab 100644 --- a/chart/templates/job-chewy-upgrade.yaml +++ b/chart/templates/job-chewy-upgrade.yaml @@ -61,7 +61,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml index bb9094cda..c1c0bdaed 100644 --- a/chart/templates/job-create-admin.yaml +++ b/chart/templates/job-create-admin.yaml @@ -66,7 +66,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml index 0b386c087..848ed3644 100644 --- a/chart/templates/job-db-migrate.yaml +++ b/chart/templates/job-db-migrate.yaml @@ -60,7 +60,7 @@ spec: valueFrom: secretKeyRef: name: {{ template "mastodon.postgresql.secretName" . }} - key: postgresql-password + key: postgres-password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml index 135d5b61a..2a91c3493 100644 --- a/chart/templates/secrets.yaml +++ b/chart/templates/secrets.yaml @@ -37,7 +37,7 @@ data: {{- end }} {{- if not .Values.postgresql.enabled }} {{- if not .Values.postgresql.auth.existingSecret }} - postgresql-password: "{{ .Values.postgresql.auth.password | b64enc }}" + postgres-password: "{{ .Values.postgresql.auth.password | b64enc }}" {{- end }} {{- end }} {{- end -}} |