From ea9cfbd08e942913dbca4ea106919e24c49242fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?=
 <crhernandez@bitnami.com>
Date: Fri, 22 Nov 2019 18:03:29 +0100
Subject: [PATCH] [stable/redis] Unify values and values-production (#19086)

* Add changes implemented in #18179 also in production

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Unify values and values-production

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Bump chart version

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
---
 stable/redis/Chart.yaml             |  2 +-
 stable/redis/values-production.yaml | 23 ++++++++++++-----------
 stable/redis/values.yaml            |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml
index 4c50463f8a..3e12141d44 100644
--- a/stable/redis/Chart.yaml
+++ b/stable/redis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis
-version: 10.0.0
+version: 10.0.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/stable/redis/values-production.yaml b/stable/redis/values-production.yaml
index 94f342c2a2..9a0ab8ebaa 100644
--- a/stable/redis/values-production.yaml
+++ b/stable/redis/values-production.yaml
@@ -2,11 +2,12 @@
 ## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
-# global:
+global:
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
 #   storageClass: myStorageClass
+  redis: {}
 
 ## Bitnami Redis image version
 ## ref: https://hub.docker.com/r/bitnami/redis/tags/
@@ -480,16 +481,6 @@ metrics:
   ##   check-keys: myKey,myOtherKey
   # extraArgs: {}
 
-  ## Metrics exporter pod priorityClassName
-  # priorityClassName: {}
-  service:
-    type: ClusterIP
-    ## Use serviceLoadBalancerIP to request a specific static IP,
-    ## otherwise leave blank
-    # loadBalancerIP:
-    annotations: {}
-    labels: {}
-
   ## Metrics exporter pod Annotation and Labels
   podAnnotations:
     prometheus.io/scrape: "true"
@@ -509,6 +500,16 @@ metrics:
     selector:
       prometheus: kube-prometheus
 
+  ## Metrics exporter pod priorityClassName
+  # priorityClassName: {}
+  service:
+    type: ClusterIP
+    ## Use serviceLoadBalancerIP to request a specific static IP,
+    ## otherwise leave blank
+    # loadBalancerIP:
+    annotations: {}
+    labels: {}
+
 ##
 ## Init containers parameters:
 ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
diff --git a/stable/redis/values.yaml b/stable/redis/values.yaml
index 6a2f5c50f5..3dc81ccaff 100644
--- a/stable/redis/values.yaml
+++ b/stable/redis/values.yaml
@@ -470,6 +470,7 @@ metrics:
     ##
     # pullSecrets:
     #   - myRegistryKeySecretName
+
   ## Metrics exporter resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##