From ca32982ff9fc4ae0cb1ab3c8bfbc29668f8089bf Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sat, 19 Feb 2022 22:05:17 +0100
Subject: [PATCH] matrix-synapse: Use modern redis auth values

---
 charts/matrix-synapse/Chart.yaml             | 2 +-
 charts/matrix-synapse/templates/_helpers.tpl | 4 +++-
 charts/matrix-synapse/templates/secrets.yaml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
index eb04c9a..ef882d8 100644
--- a/charts/matrix-synapse/Chart.yaml
+++ b/charts/matrix-synapse/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
 appVersion: 1.52.0
 
 type: application
-version: 2.1.26
+version: 2.1.27
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-synapse/templates/_helpers.tpl b/charts/matrix-synapse/templates/_helpers.tpl
index c7b07d0..2e51789 100644
--- a/charts/matrix-synapse/templates/_helpers.tpl
+++ b/charts/matrix-synapse/templates/_helpers.tpl
@@ -253,8 +253,10 @@ Set redis port
 Set redis password
 */}}
 {{- define "matrix-synapse.redis.password" -}}
-{{- if .Values.redis.enabled -}}
+{{- if .Values.redis.password -}}
 {{ .Values.redis.password }}
+{{- else if .Values.redis.auth.password -}}
+{{ .Values.redis.auth.password }}
 {{- else if .Values.externalRedis.password -}}
 {{ .Values.externalRedis.password }}
 {{- end -}}
diff --git a/charts/matrix-synapse/templates/secrets.yaml b/charts/matrix-synapse/templates/secrets.yaml
index 2f15d67..d818295 100644
--- a/charts/matrix-synapse/templates/secrets.yaml
+++ b/charts/matrix-synapse/templates/secrets.yaml
@@ -66,7 +66,7 @@ stringData:
     redis:
       enabled: true
       host: {{ $redisHost | quote }}
-{{- if or .Values.redis.usePassword .Values.redis.password .Values.externalRedis.password }}
+{{- if or .Values.redis.auth.enabled .Values.redis.usePassword .Values.redis.password .Values.redis.auth.password .Values.externalRedis.password }}
   {{- if and $redisPass (not .Values.redis.existingSecret)  }}
       password: {{ $redisPass | quote }}
   {{- else }}