From 8268839d80d5b2e1aa1185db2f3da1e85258471d Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sun, 2 Apr 2023 14:48:51 +0200
Subject: [PATCH] matrix-media-repo: Remove old postgres sanitycheck

---
 charts/matrix-media-repo/Chart.yaml             | 2 +-
 charts/matrix-media-repo/templates/_helpers.tpl | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/charts/matrix-media-repo/Chart.yaml b/charts/matrix-media-repo/Chart.yaml
index 62c91c4..03623c2 100644
--- a/charts/matrix-media-repo/Chart.yaml
+++ b/charts/matrix-media-repo/Chart.yaml
@@ -5,7 +5,7 @@ description: Matrix media repository with multi-domain in mind.
 appVersion: 1.2.13
 
 type: application
-version: 2.0.2
+version: 2.1.0
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-media-repo/templates/_helpers.tpl b/charts/matrix-media-repo/templates/_helpers.tpl
index 4a768e5..1310312 100644
--- a/charts/matrix-media-repo/templates/_helpers.tpl
+++ b/charts/matrix-media-repo/templates/_helpers.tpl
@@ -120,9 +120,6 @@ Set postgresql username
 */}}
 {{- define "matrix-media-repo.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" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.username is required" .Values.externalPostgresql.username }}
@@ -134,9 +131,6 @@ Set postgresql password
 */}}
 {{- define "matrix-media-repo.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 "" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.password is required" .Values.externalPostgresql.password }}
@@ -148,9 +142,6 @@ Set postgresql database
 */}}
 {{- define "matrix-media-repo.postgresql.database" -}}
 {{- if .Values.postgresql.enabled -}}
-{{-  if .Values.postgresql.postgresqlDatabase -}}
-{{-    fail "You need to switch to the new postgresql.auth values." -}}
-{{-  end -}}
 {{- .Values.postgresql.auth.database | default "synapse" }}
 {{- else -}}
 {{ required "A valid externalPostgresql.database is required" .Values.externalPostgresql.database }}