From da0814ea3a8d4d8fa8f121509182eeb5d36a23da Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Tue, 8 May 2018 10:36:16 +0000
Subject: [PATCH] Synchronize upstreamed folder to 494a6bc

---
 upstreamed/redis/Chart.yaml                            |  2 +-
 upstreamed/redis/README.md                             |  1 +
 upstreamed/redis/templates/redis-slave-deployment.yaml | 10 +++++++---
 upstreamed/redis/values-production.yaml                |  2 ++
 upstreamed/redis/values.yaml                           |  2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml
index 94d95c1de..ddd626d78 100644
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 3.1.0
+version: 3.2.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 d2964069a..a61609739 100644
--- a/upstreamed/redis/README.md
+++ b/upstreamed/redis/README.md
@@ -132,6 +132,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `slave.securityContext.fsGroup`            | Group ID for the container (redis slave pod)                                                                   | `master.securityContext.fsGroup`                     |
 | `slave.securityContext.runAsUser`          | User ID for the container (redis slave pod)                                                                    | `master.securityContext.runAsUser`                   |
 | `slave.resources`                          | Redis slave CPU/Memory resource requests/limits                                                                | `master.resources`                                   |
+| `slave.affinity`                          | Enable node/pod affinity for slaves                                                                | {}                                   |
 
 The above parameters map to the env variables defined in [bitnami/redis](http://github.com/bitnami/bitnami-docker-redis). For more information please refer to the [bitnami/redis](http://github.com/bitnami/bitnami-docker-redis) image documentation.
 
diff --git a/upstreamed/redis/templates/redis-slave-deployment.yaml b/upstreamed/redis/templates/redis-slave-deployment.yaml
index 4396c8cea..488196daf 100644
--- a/upstreamed/redis/templates/redis-slave-deployment.yaml
+++ b/upstreamed/redis/templates/redis-slave-deployment.yaml
@@ -33,7 +33,7 @@ spec:
         {{- end}}
       {{- end}}
       {{- /* Include master securityContext if slave securityContext not defined */ -}}
-      {{ include "redis.slave.securityContext" . | indent 6 }}  
+      {{ include "redis.slave.securityContext" . | indent 6 }}
       {{- if (.Values.slave.nodeSelector | default .Values.master.nodeSelector) }}
       nodeSelector:
 {{ toYaml (.Values.slave.nodeSelector | default .Values.master.nodeSelector) | indent 8 }}
@@ -42,6 +42,10 @@ spec:
       tolerations:
 {{ toYaml (.Values.slave.tolerations | default .Values.master.tolerations) | indent 8 }}
       {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
       containers:
       - name: {{ template "redis.fullname" . }}
         image: {{ template "redis.image" . }}
@@ -92,9 +96,9 @@ spec:
         - name: redis
           containerPort: {{ .Values.slave.port | default .Values.master.port }}
         {{- /* Include master livenessProbe if slave livenessProbe not defined */ -}}
-        {{ include "redis.slave.livenessProbe" . | indent 8 }}  
+        {{ include "redis.slave.livenessProbe" . | indent 8 }}
         {{- /* Include master readinessProbe if slave readinessProbe not defined */ -}}
-        {{ include "redis.slave.readinessProbe" . | indent 8 }}  
+        {{ include "redis.slave.readinessProbe" . | indent 8 }}
         resources:
 {{ toYaml (.Values.slave.resources | default .Values.master.resources) | indent 10 }}
 {{- end }}
diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml
index bdb2c0ca7..d2ef8f919 100644
--- a/upstreamed/redis/values-production.yaml
+++ b/upstreamed/redis/values-production.yaml
@@ -206,6 +206,8 @@ slave:
   ## Comma-separated list of Redis commands to disable
   # disableCommands: ""
 
+  affinity: {}
+
   ## Redis slave Liveness Probe
   # livenessProbe:
   #   enabled: true
diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml
index 45c75a639..a8f677606 100644
--- a/upstreamed/redis/values.yaml
+++ b/upstreamed/redis/values.yaml
@@ -217,6 +217,8 @@ slave:
   ## Comma-separated list of Redis commands to disable
   # disableCommands: ""
 
+  affinity: {}
+
   ## Redis slave Liveness Probe
   # livenessProbe:
   #   enabled: true