From 89fd74827fa5488f39ddf425c5fb16e16d6cca33 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Thu, 9 Mar 2023 18:27:50 +0100
Subject: [PATCH] matrix-synapse: Remove old-style pgsql auth errors

This migration workaround has caused issues for some users, and should no
longer be necessary
---
 charts/matrix-synapse/templates/_helpers.tpl | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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