From 6094a916b185ae0634e016004deb4cec11afbaca Mon Sep 17 00:00:00 2001
From: Ben Hardill <b.hardill@gmail.com>
Date: Sun, 30 Oct 2022 00:30:16 +0100
Subject: [PATCH] Fix helm chart use of Postgres Password (#19537)
Fixes #19536
---
chart/templates/cronjob-media-remove.yaml | 2 +-
chart/templates/deployment-sidekiq.yaml | 2 +-
chart/templates/deployment-streaming.yaml | 2 +-
chart/templates/deployment-web.yaml | 2 +-
chart/templates/job-assets-precompile.yaml | 2 +-
chart/templates/job-chewy-upgrade.yaml | 2 +-
chart/templates/job-create-admin.yaml | 2 +-
chart/templates/job-db-migrate.yaml | 2 +-
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 4ca45804a2..1dced69ec7 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 44d3b82035..56ba257b59 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 6b7c3cdd9a..564f53f433 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 c5d177e513..0878aa9b87 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 c20b4a370c..37009822e6 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 cf7b59b58a..a4bac63abc 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 bb9094cdab..c1c0bdaed5 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 0b386c0870..848ed36441 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 135d5b61a4..2a91c34934 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 -}}
--
GitLab