From 1561d7ccef0f758b02b71bddf3797d30ffb7cfea Mon Sep 17 00:00:00 2001
From: Marcos Bjoerkelund <marcosbc@users.noreply.github.com>
Date: Wed, 4 Nov 2020 11:34:09 +0100
Subject: [PATCH] [bitnami/redis] Fix sentinel when password contains '%'
 (#4200)

* [bitnami/redis] Fix sentinel when password contains '%'

* update chart version
---
 bitnami/redis/Chart.yaml                       | 2 +-
 bitnami/redis/templates/configmap-scripts.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index 9efb51862..66a7389a7 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis
-version: 11.3.1
+version: 11.3.2
 appVersion: 6.0.9
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:
diff --git a/bitnami/redis/templates/configmap-scripts.yaml b/bitnami/redis/templates/configmap-scripts.yaml
index f2441ec8d..face4e95c 100644
--- a/bitnami/redis/templates/configmap-scripts.yaml
+++ b/bitnami/redis/templates/configmap-scripts.yaml
@@ -178,13 +178,13 @@ data:
     if [[ ! -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then
       cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf
       {{- if .Values.usePassword }}
-      printf "\nsentinel auth-pass {{ .Values.sentinel.masterSet }} $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
+      printf "\nsentinel auth-pass %s %s" "{{ .Values.sentinel.masterSet }}" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
       {{- if .Values.sentinel.usePassword }}
-      printf "\nrequirepass $REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
+      printf "\nrequirepass %s" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
       {{- end }}
       {{- end }}
       {{- if .Values.sentinel.staticID }}
-      printf "\nsentinel myid $(echo $HOSTNAME | openssl sha1 | awk '{ print $2 }')" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
+      printf "\nsentinel myid %s" "$(echo $HOSTNAME | openssl sha1 | awk '{ print $2 }')" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf
       {{- end }}
     fi