From 11fbdc4f099dcda74e8d34319aa91aa06ff784dd Mon Sep 17 00:00:00 2001
From: Sebastian Sterk <{ID}+{username}@users.noreply.github.com>
Date: Fri, 1 Mar 2024 08:29:26 +0100
Subject: [PATCH 1/4] feat: support existing secret for Redis password

---
 README.md              | 2 ++
 templates/_helpers.tpl | 7 +++++++
 values.yaml            | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 38cd42c..812419e 100644
--- a/README.md
+++ b/README.md
@@ -280,6 +280,8 @@ scaling:
   redis:
     host:
     password:
+    existingSecret:
+    existingSecretKey:
 
 redis:
   enabled: false
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 2b2cf48..cbe0eb0 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -92,6 +92,13 @@ Selector labels
 - name: "QUEUE_BULL_REDIS_PASSWORD"
   value: "{{ .Values.scaling.redis.password }}"
 {{ end }}
+{{- if and .Values.scaling.redis.existingSecret .Values.scaling.redis.existingSecretKey }}
+- name: "QUEUE_BULL_REDIS_PASSWORD"
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.scaling.redis.existingSecret }}
+      key: {{ .Values.scaling.redis.existingSecretKey }}
+{{ end }}
 {{- if .Values.scaling.webhook.enabled }}
 - name: "N8N_DISABLE_PRODUCTION_MAIN_PROCESS"
   value: "true"
diff --git a/values.yaml b/values.yaml
index 2f6e800..370b49d 100644
--- a/values.yaml
+++ b/values.yaml
@@ -321,6 +321,8 @@ scaling:
   redis:
     host:
     password:
+    existingSecret:
+    existingSecretKey:
 
 
 ## Bitnami Redis configuration

From 8f0e1017c13b1f1d38a2866ff41fdee134908785 Mon Sep 17 00:00:00 2001
From: Sebastian Sterk <7263970+sebastiansterk@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:36:51 +0200
Subject: [PATCH 2/4] chore: rename redis password secret key

---
 values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values.yaml b/values.yaml
index 370b49d..3c11d72 100644
--- a/values.yaml
+++ b/values.yaml
@@ -322,7 +322,7 @@ scaling:
     host:
     password:
     existingSecret:
-    existingSecretKey:
+    existingSecretPasswordKey:
 
 
 ## Bitnami Redis configuration

From 272c4a5302e29b13a417d45eab568d0623ede867 Mon Sep 17 00:00:00 2001
From: Sebastian Sterk <7263970+sebastiansterk@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:38:48 +0200
Subject: [PATCH 3/4] chore: rename existingSecretKey to
 existingSecretPasswordKey

---
 templates/_helpers.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index cbe0eb0..b10ff81 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -92,12 +92,12 @@ Selector labels
 - name: "QUEUE_BULL_REDIS_PASSWORD"
   value: "{{ .Values.scaling.redis.password }}"
 {{ end }}
-{{- if and .Values.scaling.redis.existingSecret .Values.scaling.redis.existingSecretKey }}
+{{- if and .Values.scaling.redis.existingSecret .Values.scaling.redis.existingSecretPasswordKey }}
 - name: "QUEUE_BULL_REDIS_PASSWORD"
   valueFrom:
     secretKeyRef:
       name: {{ .Values.scaling.redis.existingSecret }}
-      key: {{ .Values.scaling.redis.existingSecretKey }}
+      key: {{ .Values.scaling.redis.existingSecretPasswordKey }}
 {{ end }}
 {{- if .Values.scaling.webhook.enabled }}
 - name: "N8N_DISABLE_PRODUCTION_MAIN_PROCESS"

From b472415442047c080fcdd05bea9d19a62052150d Mon Sep 17 00:00:00 2001
From: Sebastian Sterk <7263970+sebastiansterk@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:42:40 +0200
Subject: [PATCH 4/4] chore: rename existingSecretKey to
 existingSecretPasswordKey

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 812419e..0c3c124 100644
--- a/README.md
+++ b/README.md
@@ -281,7 +281,7 @@ scaling:
     host:
     password:
     existingSecret:
-    existingSecretKey:
+    existingSecretPasswordKey:
 
 redis:
   enabled: false