diff options
| author | Alex Nordlund <deep.alexander@gmail.com> | 2022-11-08 17:18:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 17:18:57 +0100 |
| commit | d3afd7a2f1c12de4d02777585550183b04167625 (patch) | |
| tree | 08ad2c45071e80fafa38173751b16621158e000b | |
| parent | 9358fd295d5ffa960bbdfc0c28d45553cb78a3de (diff) | |
Fix helm postgresql secret (#19678)
* Revert "Fix helm chart use of Postgres Password (#19537)"
This reverts commit 6094a916b185ae0634e016004deb4cec11afbaca.
* Revert "Fix PostgreSQL password reference for jobs (#19504)"
This reverts commit dae954ef111b8e0ab17812d156f6c955b77d9859.
* Revert "Fix PostgreSQL password reference (#19502)"
This reverts commit 9bf6a8af82391fa8b32112deb4a36a0cfc68143e.
* Correct default username in postgresql auth
| -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 | ||||
| -rw-r--r-- | chart/values.yaml | 4 |
10 files changed, 11 insertions, 11 deletions
diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml index 1dced69ec78..160aee20421 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml index 4b108d79df6..994a66445ea 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml index 564f53f4331..12203a530bb 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml index 0878aa9b870..ab722c77b1c 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml index 37009822e65..faa51a20d9d 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml index a4bac63abc7..ae6fb38e129 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml index c1c0bdaed59..659c00671fc 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml index 848ed36441a..8e4f70dfb1d 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: postgres-password + key: password - name: "REDIS_PASSWORD" valueFrom: secretKeyRef: diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml index 2a91c349342..d7ac936ce50 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 }} - postgres-password: "{{ .Values.postgresql.auth.password | b64enc }}" + password: "{{ .Values.postgresql.auth.password | b64enc }}" {{- end }} {{- end }} {{- end -}} diff --git a/chart/values.yaml b/chart/values.yaml index dc57d86209d..ef349c0875e 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -141,7 +141,7 @@ postgresql: # postgresqlHostname: preexisting-postgresql auth: database: mastodon_production - username: postgres + username: mastodon # you must set a password; the password generated by the postgresql chart will # be rotated on each upgrade: # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade @@ -149,7 +149,7 @@ postgresql: # Set same value as above postgresPassword: "" # you can also specify the name of an existing Secret - # with a key of postgres-password set to the password you want + # with a key of password set to the password you want existingSecret: "" # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters |