pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

matrix-synapse: Remove old-style pgsql auth errors

Browse source 
This migration workaround has caused issues for some users, and should no
longer be necessary
This commit is contained in:
Alexander Olofsson 2023-03-09 18:27:50 +01:00
parent 572ba5d417
commit 89fd74827f
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
charts/matrix-synapse/templates/_helpers.tpl
View file

@ -150,10 +150,7 @@ Set postgresql username
*/}} */}}
{{- define "matrix-synapse.postgresql.username" -}} {{- define "matrix-synapse.postgresql.username" -}}
{{- if .Values.postgresql.enabled -}} {{- if .Values.postgresql.enabled -}}
{{- if .Values.postgresql.postgresqlUsername -}} {{ required "A valid postgresql.auth.username is required" .Values.postgresql.auth.username }}
{{- fail "You need to switch to the new postgresql.auth values." -}}
{{- end -}}
{{- .Values.postgresql.auth.username | default "postgres" }}
{{- else -}} {{- else -}}
{{ required "A valid externalPostgresql.username is required" .Values.externalPostgresql.username }} {{ required "A valid externalPostgresql.username is required" .Values.externalPostgresql.username }}
{{- end -}} {{- end -}}
@ -164,10 +161,7 @@ Set postgresql password
*/}} */}}
{{- define "matrix-synapse.postgresql.password" -}} {{- define "matrix-synapse.postgresql.password" -}}
{{- if .Values.postgresql.enabled -}} {{- if .Values.postgresql.enabled -}}
{{- if .Values.postgresql.postgresqlPassword -}} {{ required "A valid postgresql.auth.password is required" .Values.postgresql.auth.password }}
{{- fail "You need to switch to the new postgresql.auth values." -}}
{{- end -}}
{{- .Values.postgresql.auth.password | default "synapse" }}
{{- else if not (and .Values.externalPostgresql.existingSecret .Values.externalPostgresql.existingSecretPasswordKey) -}} {{- else if not (and .Values.externalPostgresql.existingSecret .Values.externalPostgresql.existingSecretPasswordKey) -}}
{{ required "A valid externalPostgresql.password is required" .Values.externalPostgresql.password }} {{ required "A valid externalPostgresql.password is required" .Values.externalPostgresql.password }}
{{- end -}} {{- end -}}