From 93e07b9fdd7d5c32f4effd4ff9952d5380ae0f2c Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Tue, 8 Apr 2025 15:36:47 +0200
Subject: [PATCH] Simplification

---
 templates/_db-migrate.tpl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/_db-migrate.tpl b/templates/_db-migrate.tpl
index 735e1f6..69bbbb9 100644
--- a/templates/_db-migrate.tpl
+++ b/templates/_db-migrate.tpl
@@ -102,15 +102,11 @@ spec:
             - name: "REDIS_PASSWORD"
               valueFrom:
                 secretKeyRef:
-                  {{- if .prepare }}
-                  {{- if and (not .Values.redis.enabled) (and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret)) (.Values.redis.auth.password) }}
+                  {{- if and (.prepare) (not .Values.redis.enabled) (and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret)) (.Values.redis.auth.password) }}
                   name: {{ template "mastodon.redis.secretName" . }}-pre-install
                   {{- else }}
                   name: {{ template "mastodon.redis.secretName" . }}
                   {{- end }}
-                  {{- else }}
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  {{- end }}
                   key: redis-password
           {{- if .preDeploy }}
             - name: "SKIP_POST_DEPLOYMENT_MIGRATIONS"