From 1cf980e5b8a97a67f2920495c6c3952c2a2f2aca Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Sat, 5 May 2018 10:36:16 +0000
Subject: [PATCH] Synchronize upstreamed folder to 5230e0b

---
 upstreamed/redis/Chart.yaml                              | 2 +-
 upstreamed/redis/README.md                               | 1 +
 upstreamed/redis/templates/redis-master-statefulset.yaml | 7 +++++++
 upstreamed/redis/values.yaml                             | 7 +++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml
index f662ae19f..94d95c1de 100644
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 3.0.6
+version: 3.1.0
 appVersion: 4.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/upstreamed/redis/README.md b/upstreamed/redis/README.md
index 68828ecba..d2964069a 100644
--- a/upstreamed/redis/README.md
+++ b/upstreamed/redis/README.md
@@ -73,6 +73,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `metrics.podAnnotations`                   | Additional annotations for Metrics exporter pod                                                                | {}                                                   |
 | `metrics.targetServiceAnnotations`         | Annotations for the services to monitor  (redis master and redis slave service)                                | {}                                                   |
 | `metrics.resources`                        | Exporter resource requests/limit                                                                               | Memory: `256Mi`, CPU: `100m`                         |
+| `persistence.existingClaim`                | Provide an existing PersistentVolumeClaim                                                                      | `nil`                                                |
 | `master.persistence.enabled`               | Use a PVC to persist data (master node)                                                                        | `true`                                               |
 | `master.persistence.path`                  | Path to mount the volume at, to use other images                                                               | `/bitnami`                                           |
 | `master.persistence.subPath`               | Subdirectory of the volume to mount at                                                                         | `""`                                                 |
diff --git a/upstreamed/redis/templates/redis-master-statefulset.yaml b/upstreamed/redis/templates/redis-master-statefulset.yaml
index 063737261..79e9dcea7 100644
--- a/upstreamed/redis/templates/redis-master-statefulset.yaml
+++ b/upstreamed/redis/templates/redis-master-statefulset.yaml
@@ -118,6 +118,12 @@ spec:
       - name: "redis-data"
         emptyDir: {}
   {{- else }}
+    {{- if .Values.persistence.existingClaim }}
+      volumes:
+      - name: "redis-data"
+        persistentVolumeClaim:
+          claimName: {{ .Values.persistence.existingClaim }}
+    {{- else }}
   volumeClaimTemplates:
     - metadata:
         name: redis-data
@@ -142,4 +148,5 @@ spec:
         storageClassName: {{ .Values.master.persistence.storageClass | quote }}
       {{- end }}
       {{- end }}
+    {{- end }}
   {{- end }}
diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml
index 8dcdcbe75..45c75a639 100644
--- a/upstreamed/redis/values.yaml
+++ b/upstreamed/redis/values.yaml
@@ -70,6 +70,13 @@ password:
 ## Use existing secret (ignores previous password)
 # existingSecret:
 
+## Persist data to a persitent volume
+persistence: {}
+  ## A manually managed Persistent Volume and Claim
+  ## Requires persistence.enabled: true
+  ## If defined, PVC must be created manually before volume will be bound
+  # existingClaim:
+
 ##
 ## Redis Master parameters
 ##