forked from treehouse/mastodon
Fix helm postgresql secret (#19678)
* Revert "Fix helm chart use of Postgres Password (#19537)" This reverts commitmain^26094a916b1
. * Revert "Fix PostgreSQL password reference for jobs (#19504)" This reverts commitdae954ef11
. * Revert "Fix PostgreSQL password reference (#19502)" This reverts commit9bf6a8af82
. * Correct default username in postgresql auth
parent
9358fd295d
commit
d3afd7a2f1
|
@ -59,7 +59,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -76,7 +76,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -44,7 +44,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -62,7 +62,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -60,7 +60,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -61,7 +61,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -66,7 +66,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -60,7 +60,7 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mastodon.postgresql.secretName" . }}
|
||||
key: postgres-password
|
||||
key: password
|
||||
- name: "REDIS_PASSWORD"
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
@ -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 -}}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue