From 0c6f2594d5cfb4e6a5748ab99b3971ca1eb11e50 Mon Sep 17 00:00:00 2001
From: Tim Campbell <timetinytim@gmail.com>
Date: Tue, 8 Apr 2025 09:04:05 +0200
Subject: [PATCH] Fix redis secret from values not being used in db-prepare

---
 templates/_db-migrate.tpl              |  8 ++++++++
 templates/secret-redis-preinstall.yaml | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 templates/secret-redis-preinstall.yaml

diff --git a/templates/_db-migrate.tpl b/templates/_db-migrate.tpl
index 12972f3..735e1f6 100644
--- a/templates/_db-migrate.tpl
+++ b/templates/_db-migrate.tpl
@@ -102,7 +102,15 @@ 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) }}
+                  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"
diff --git a/templates/secret-redis-preinstall.yaml b/templates/secret-redis-preinstall.yaml
new file mode 100644
index 0000000..074e035
--- /dev/null
+++ b/templates/secret-redis-preinstall.yaml
@@ -0,0 +1,19 @@
+{{- if not .Values.redis.enabled }}
+{{- if and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) }}
+{{- if .Values.redis.auth.password }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "mastodon.redis.secretName" . }}-pre-install
+  labels:
+    {{- include "mastodon.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-weight: "-5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+type: Opaque
+data:
+  redis-password: "{{ .Values.redis.auth.password | b64enc }}"
+{{- end }}
+{{- end }}
+{{- end }}