From 55a6b54f8ee6b04845f1a4a8507ba9907670a739 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Sun, 14 Feb 2021 11:16:32 -0800 Subject: [PATCH] helm: add option for external db (#15722) --- chart/Chart.yaml | 1 + chart/templates/configmap-env.yaml | 4 ++++ chart/templates/cronjob-media-remove.yaml | 2 +- chart/templates/deployment-sidekiq.yaml | 4 ++++ chart/templates/deployment-streaming.yaml | 4 ++++ chart/templates/deployment-web.yaml | 4 ++++ chart/templates/job-assets-precompile.yaml | 4 ++++ chart/templates/job-chewy-upgrade.yaml | 4 ++++ chart/templates/job-create-admin.yaml | 4 ++++ chart/templates/job-db-migrate.yaml | 4 ++++ chart/templates/secrets.yaml | 3 +++ chart/values.yaml.template | 4 ++++ 12 files changed, 41 insertions(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 19f9c64c74..a1db340e6b 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -30,6 +30,7 @@ dependencies: - name: postgresql version: "8.x.x" repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled - name: redis version: "10.x.x" repository: https://charts.bitnami.com/bitnami diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml index 27351e97ef..2f93a4b3ce 100644 --- a/chart/templates/configmap-env.yaml +++ b/chart/templates/configmap-env.yaml @@ -5,7 +5,11 @@ metadata: labels: {{- include "mastodon.labels" . | nindent 4 }} data: + {{- if .Values.postgresql.enabled }} DB_HOST: {{ template "mastodon.postgresql.fullname" . }} + {{- else }} + DB_HOST: {{ .Values.postgresql.postgresqlHostname }} + {{- end }} DB_NAME: {{ .Values.postgresql.postgresqlDatabase }} DB_POOL: {{ .Values.application.sidekiq.concurrency | quote }} DB_PORT: "5432" diff --git a/chart/templates/cronjob-media-remove.yaml b/chart/templates/cronjob-media-remove.yaml index 8a01a25518..5d78f3395c 100644 --- a/chart/templates/cronjob-media-remove.yaml +++ b/chart/templates/cronjob-media-remove.yaml @@ -55,7 +55,7 @@ spec: {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql {{- else }} - name: {{ template "mastodon.fullname" . }}-postgresql + name: {{ template "mastodon.fullname" . }} {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml index 5457183a3c..f300a5e632 100644 --- a/chart/templates/deployment-sidekiq.yaml +++ b/chart/templates/deployment-sidekiq.yaml @@ -73,7 +73,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/deployment-streaming.yaml b/chart/templates/deployment-streaming.yaml index 5d642d72c7..02efcc3dc3 100644 --- a/chart/templates/deployment-streaming.yaml +++ b/chart/templates/deployment-streaming.yaml @@ -43,7 +43,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml index 5010e567a8..a531aa4872 100644 --- a/chart/templates/deployment-web.yaml +++ b/chart/templates/deployment-web.yaml @@ -59,7 +59,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/job-assets-precompile.yaml b/chart/templates/job-assets-precompile.yaml index 5472e06d6c..32e5c71d35 100644 --- a/chart/templates/job-assets-precompile.yaml +++ b/chart/templates/job-assets-precompile.yaml @@ -53,7 +53,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/job-chewy-upgrade.yaml b/chart/templates/job-chewy-upgrade.yaml index 789fcff837..4d645168a5 100644 --- a/chart/templates/job-chewy-upgrade.yaml +++ b/chart/templates/job-chewy-upgrade.yaml @@ -54,7 +54,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/job-create-admin.yaml b/chart/templates/job-create-admin.yaml index 3c5bdd6eb2..aabb593acd 100644 --- a/chart/templates/job-create-admin.yaml +++ b/chart/templates/job-create-admin.yaml @@ -59,7 +59,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml index e078323868..dd687a066a 100644 --- a/chart/templates/job-db-migrate.yaml +++ b/chart/templates/job-db-migrate.yaml @@ -53,7 +53,11 @@ spec: - name: "DB_PASS" valueFrom: secretKeyRef: + {{- if .Values.postgresql.enabled }} name: {{ .Release.Name }}-postgresql + {{- else }} + name: {{ template "mastodon.fullname" . }} + {{- end }} key: postgresql-password - name: "REDIS_PASSWORD" valueFrom: diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml index 74f4b15161..80f24a1211 100644 --- a/chart/templates/secrets.yaml +++ b/chart/templates/secrets.yaml @@ -26,3 +26,6 @@ data: {{- else }} VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.secrets.vapid.public_key }} {{- end }} + {{- if not .Values.postgresql.enabled }} + postgresql-password: "{{ .Values.postgresql.postgresqlPassword | b64enc }}" + {{- end }} diff --git a/chart/values.yaml.template b/chart/values.yaml.template index 9e50c6daca..a57621b9e5 100644 --- a/chart/values.yaml.template +++ b/chart/values.yaml.template @@ -95,6 +95,10 @@ elasticsearch: # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters postgresql: + # disable if you want to use an existing db; in which case the values below + # must match those of that external postgres instance + enabled: true + # postgresqlHostname: preexisting-postgresql postgresqlDatabase: mastodon_production # you must set a password; the password generated by the postgresql chart will # be rotated on each upgrade: