From 193fd9fba5a8234fcdd7a5001e28fac00214ec74 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <juan.ariza@broadcom.com>
Date: Mon, 26 May 2025 11:37:27 +0200
Subject: [PATCH] [bitnami/redis] bugfix: issue on ACL when no existing users
 secret is passed (#33876)

---
 bitnami/redis/Chart.yaml               | 2 +-
 bitnami/redis/templates/configmap.yaml | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index c2e84b82f6..c72d508abf 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: redis
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/redis
-version: 21.1.6
+version: 21.1.7
diff --git a/bitnami/redis/templates/configmap.yaml b/bitnami/redis/templates/configmap.yaml
index d3c7d98e23..05354a67c3 100644
--- a/bitnami/redis/templates/configmap.yaml
+++ b/bitnami/redis/templates/configmap.yaml
@@ -59,8 +59,12 @@ data:
     {{- $userSecret := .Values.auth.acl.userSecret -}}
     {{- range .Values.auth.acl.users }}
     {{- $userPassword := .password | default "" }}
-    {{- $secretPassword := (include "common.secrets.get" (dict "secret" $userSecret "key" .username "context" $))}}
-    user {{ .username }} {{ default "on" .enabled }} {{ if $secretPassword }}#{{ sha256sum $secretPassword }}{{ else if $userPassword }}#{{ sha256sum $userPassword }}{{ else }}nopass{{ end }} {{ default "~*" .keys }} {{ default "&*" .channels }} {{ default "+@all" .commands }}
+    {{- if $userSecret }}
+    {{- $secretPassword := include "common.secrets.get" (dict "secret" $userSecret "key" .username "context" $) }}
+    user {{ .username }} {{ default "on" .enabled }} {{ if $secretPassword }}#{{ sha256sum $secretPassword }}{{ else }}nopass{{ end }} {{ default "~*" .keys }} {{ default "&*" .channels }} {{ default "+@all" .commands }}
+    {{- else }}
+    user {{ .username }} {{ default "on" .enabled }} {{ if $userPassword }}#{{ sha256sum $userPassword }}{{ else }}nopass{{ end }} {{ default "~*" .keys }} {{ default "&*" .channels }} {{ default "+@all" .commands }}
+    {{- end }}
     {{- end }}
     {{- end }}
     {{- end }}