From 1a600097ab3bf35daba6542380013b2daead9cef Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Wed, 4 Dec 2019 08:35:06 +0000
Subject: [PATCH] Synchronize upstreamed folder to 330420f5b

---
 upstreamed/redis/Chart.yaml             | 2 +-
 upstreamed/redis/templates/_helpers.tpl | 4 ++--
 upstreamed/redis/values-production.yaml | 6 +++---
 upstreamed/redis/values.yaml            | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml
index 9968f2538..1d27f3943 100644
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis
-version: 10.2.0
+version: 10.2.1
 appVersion: 5.0.7
 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/upstreamed/redis/templates/_helpers.tpl b/upstreamed/redis/templates/_helpers.tpl
index 8c0d71755..8c1df0da0 100644
--- a/upstreamed/redis/templates/_helpers.tpl
+++ b/upstreamed/redis/templates/_helpers.tpl
@@ -193,9 +193,9 @@ Get the password key to be retrieved from Redis secret.
 Return Redis password
 */}}
 {{- define "redis.password" -}}
-{{- if .Values.global.redis.password }}
+{{- if not (empty .Values.global.redis.password) }}
     {{- .Values.global.redis.password -}}
-{{- else if .Values.password -}}
+{{- else if not (empty .Values.password) -}}
     {{- .Values.password -}}
 {{- else -}}
     {{- randAlphaNum 10 -}}
diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml
index 5cc7f996e..633c12275 100644
--- a/upstreamed/redis/values-production.yaml
+++ b/upstreamed/redis/values-production.yaml
@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.7-debian-9-r0
+  tag: 5.0.7-debian-9-r12
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.6-debian-9-r6
+    tag: 5.0.7-debian-9-r10
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -467,7 +467,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.3.4-debian-9-r4
+    tag: 1.3.4-debian-9-r15
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml
index 431549109..49d6762f7 100644
--- a/upstreamed/redis/values.yaml
+++ b/upstreamed/redis/values.yaml
@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.7-debian-9-r0
+  tag: 5.0.7-debian-9-r12
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -60,7 +60,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.6-debian-9-r6
+    tag: 5.0.7-debian-9-r10
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -193,7 +193,7 @@ usePassword: true
 ## Defaults to a random 10-character alphanumeric string if not set and usePassword is true
 ## ref: https://github.com/bitnami/bitnami-docker-redis#setting-the-server-password-on-first-run
 ##
-password:
+password: ""
 ## Use existing secret (ignores previous password)
 # existingSecret:
 ## Password key to be retrieved from Redis secret
@@ -467,7 +467,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.3.4-debian-9-r4
+    tag: 1.3.4-debian-9-r15
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.