[stable/redis-ha] Added nodeSelector and tolerations (#2715)

* Updated redis image in readme

* Added nodeSelector and tolerations to redis-ha

* Bumped version to 1.0.1

stable/redis-ha/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 1.0.0
+version: 1.0.1
 description: Highly available Redis cluster with multiple sentinels and standbys.
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
 maintainers:

stable/redis-ha/README.md

@@ -47,7 +47,7 @@ The following tables lists the configurable parameters of the Redis chart and th
 
 | Parameter                        | Description                                           | Default                                                   |
 | -------------------------------- | ----------------------------------------------------- | --------------------------------------------------------- |
-| `redis_image`                    | Redis image                                           | `gcr.io/google_containers/redis:v1`                       |
+| `redis_image`                    | Redis image                                           | `quay.io/smile/redis:4.0.2`                               |
 | `persistentVolume.enabled`       | Use a PVC to persist data                             | `false`                                                   |
 | `persistentVolume.storageClass`  | Storage class of backing PVC                          | `generic`                                                 |
 | `persistentVolume.accessMode`    | Use volume as ReadOnly or ReadWrite                   | `ReadWriteOnce`                                           |
@@ -62,6 +62,8 @@ The following tables lists the configurable parameters of the Redis chart and th
 | `replicas.master`                | Number of master pods                                 | 1                                                         |
 | `replicas.slave`                 | Number of slave pods                                  | 1                                                         |
 | `replicas.sentinel`              | Number of sentinel pods                               | 3                                                         |
+| `nodeSelector`                   | Node labels for pod assignment                        | {}                                                        |
+| `tolerations`                    | Toleration labels for pod assignment                  | []                                                        |
 
 
 
@@ -69,7 +71,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 
 ```bash
 $ helm install \
-  --set redis_image=gcr.io/google_containers/redis:v1 \
+  --set redis_image=quay.io/smile/redis:4.0.2 \
     stable/redis-ha
 ```
 

stable/redis-ha/templates/redis-master-statefulset.yaml

@@ -21,6 +21,14 @@ spec:
 {{ include "labels.standard" . | indent 8 }}
     spec:
       terminationGracePeriodSeconds: 10
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
       containers:
         - name: master
           image: {{ .Values.redis_image }}

stable/redis-ha/templates/redis-sentinel-deployment.yaml

@@ -12,6 +12,14 @@ spec:
         role: sentinel
 {{ include "labels.standard" . | indent 8 }}
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
       containers:
       - name: sentinel
         image: {{ .Values.redis_image }}

stable/redis-ha/templates/redis-slave-statefulset.yaml

@@ -16,6 +16,14 @@ spec:
 {{ include "labels.standard" . | indent 8 }}
     spec:
       terminationGracePeriodSeconds: 10
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
       containers:
         - name: redis
           image: "{{ .Values.redis_image }}"

stable/redis-ha/values.yaml

@@ -20,6 +20,13 @@ resources:
       cpu: 100m
     limits:
       memory: 200Mi
+
+## Node labels and tolerations for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+nodeSelector: {}
+tolerations: []
+
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
 ##