Fix helm postgresql secret (#19678)

* Revert "Fix helm chart use of Postgres Password (#19537)"

This reverts commit 6094a916b1.

* Revert "Fix PostgreSQL password reference for jobs (#19504)"

This reverts commit dae954ef11.

* Revert "Fix PostgreSQL password reference (#19502)"

This reverts commit 9bf6a8af82.

* Correct default username in postgresql auth
This commit is contained in:
Alex Nordlund 2022-11-08 17:18:57 +01:00 committed by GitHub
parent 9358fd295d
commit d3afd7a2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 11 deletions

View File

@ -59,7 +59,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -76,7 +76,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -44,7 +44,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -62,7 +62,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -60,7 +60,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -61,7 +61,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -66,7 +66,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -60,7 +60,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }} name: {{ template "mastodon.postgresql.secretName" . }}
key: postgres-password key: password
- name: "REDIS_PASSWORD" - name: "REDIS_PASSWORD"
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

View File

@ -37,7 +37,7 @@ data:
{{- end }} {{- end }}
{{- if not .Values.postgresql.enabled }} {{- if not .Values.postgresql.enabled }}
{{- if not .Values.postgresql.auth.existingSecret }} {{- if not .Values.postgresql.auth.existingSecret }}
postgres-password: "{{ .Values.postgresql.auth.password | b64enc }}" password: "{{ .Values.postgresql.auth.password | b64enc }}"
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}

View File

@ -141,7 +141,7 @@ postgresql:
# postgresqlHostname: preexisting-postgresql # postgresqlHostname: preexisting-postgresql
auth: auth:
database: mastodon_production database: mastodon_production
username: postgres username: mastodon
# you must set a password; the password generated by the postgresql chart will # you must set a password; the password generated by the postgresql chart will
# be rotated on each upgrade: # be rotated on each upgrade:
# https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade
@ -149,7 +149,7 @@ postgresql:
# Set same value as above # Set same value as above
postgresPassword: "" postgresPassword: ""
# you can also specify the name of an existing Secret # 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: "" existingSecret: ""
# https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters