From 4b3b44ddbf18032c9d9c9561fbf4d9ede078d2c7 Mon Sep 17 00:00:00 2001
From: jessebot <jessebot@linux.com>
Date: Sun, 19 Jan 2025 11:07:52 +0100
Subject: [PATCH] clean up valkey secret to allow only sourcing one or two
 secret keys at a time

---
 charts/pixelfed/templates/deployment.yaml    | 31 +++++++++++++++-----
 charts/pixelfed/templates/secret_valkey.yaml |  8 ++++-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/charts/pixelfed/templates/deployment.yaml b/charts/pixelfed/templates/deployment.yaml
index 4b05ac9..1c99ad4 100644
--- a/charts/pixelfed/templates/deployment.yaml
+++ b/charts/pixelfed/templates/deployment.yaml
@@ -48,27 +48,42 @@ spec:
             - configMapRef:
                 name: {{ include "pixelfed.fullname" . }}-env
           env:
-            # redis
+            # valkey AKA redis
+            {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecretKeys.host }}
             - name: REDIS_HOST
-              {{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
               valueFrom:
                 secretKeyRef:
+                  {{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.host }}
                   name: {{ .Values.externalValkey.existingSecret }}
                   key: {{ .Values.externalValkey.existingSecretKeys.host }}
-              {{- end }}
+                  {{- else }}
+                  name: {{ include "pixelfed.fullname" . }}-valkey
+                  key: host
+                  {{- end }}
+            {{- end }}
+
             {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
             - name: REDIS_PORT
               valueFrom:
                 secretKeyRef:
+                  {{- if and .Values.externalValkey.existingSecret .Values.externalValkey.existingSecretKeys.port }}
                   name: {{ .Values.externalValkey.existingSecret }}
                   key: {{ .Values.externalValkey.existingSecretKeys.port }}
+                  {{- else }}
+                  name: {{ include "pixelfed.fullname" . }}-valkey
+                  key: port
+                  {{- end }}
             {{- end }}
+
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  {{- if .Values.externalValkey.existingSecret }}
+                  {{- if and .Values.externalValkey.enabled .Values.externalValkey.existingSecret }}
                   name: {{ .Values.externalValkey.existingSecret }}
                   key: {{ .Values.externalValkey.existingSecretKeys.password }}
+                  {{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) }}
+                  name: {{ include "pixelfed.fullname" . }}-valkey
+                  key: password
                   {{- else if .Values.valkey.auth.existingSecret }}
                   name: {{ .Values.valkey.auth.existingSecret }}
                   key: password
@@ -85,7 +100,7 @@ spec:
                   name: {{ .Values.pixelfed.mail.existingSecret }}
                   key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
                   {{- else }}
-                  name: pixelfed-mail
+                  name: {{ include "pixelfed.fullname" . }}-mail
                   key: host
                   {{- end }}
             - name: MAIL_PORT
@@ -95,7 +110,7 @@ spec:
                   name: {{ .Values.pixelfed.mail.existingSecret }}
                   key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
                   {{- else }}
-                  name: pixelfed-mail
+                  name: {{ include "pixelfed.fullname" . }}-mail
                   key: port
                   {{- end }}
             - name: MAIL_USERNAME
@@ -105,7 +120,7 @@ spec:
                   name: {{ .Values.pixelfed.mail.existingSecret }}
                   key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
                   {{- else }}
-                  name: pixelfed-mail
+                  name: {{ include "pixelfed.fullname" . }}-mail
                   key: username
                   {{- end }}
             - name: MAIL_PASSWORD
@@ -115,7 +130,7 @@ spec:
                   name: {{ .Values.pixelfed.mail.existingSecret }}
                   key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
                   {{- else }}
-                  name: pixelfed-mail
+                  name: {{ include "pixelfed.fullname" . }}-mail
                   key: password
                   {{- end }}
 
diff --git a/charts/pixelfed/templates/secret_valkey.yaml b/charts/pixelfed/templates/secret_valkey.yaml
index bbfab16..9c96ab7 100644
--- a/charts/pixelfed/templates/secret_valkey.yaml
+++ b/charts/pixelfed/templates/secret_valkey.yaml
@@ -1,11 +1,17 @@
-{{- if and .Values.externalValkey.enabled ( not .Values.externalValkey.existingSecret ) }}
+{{- if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (or .Values.externalValkey.existingSecretKeys.password .Values.externalValkey.existingSecretKeys.port .Values.externalValkey.existingSecretKeys.host ) }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "pixelfed.fullname" . }}-valkey
 data:
+  {{- if not .Values.externalValkey.existingSecretKeys.host }}
   host: {{ .Values.externalValkey.host | b64enc }}
+  {{- end }}
+  {{- if not .Values.externalValkey.existingSecretKeys.port }}
   port: {{ .Values.externalValkey.port | quote | b64enc  }}
+  {{- end }}
+  {{- if not .Values.externalValkey.existingSecretKeys.password }}
   password: {{ .Values.externalValkey.password | b64enc  }}
+  {{- end }}
 {{- end }}