diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml index 1b9e2ee531..2185d3759a 100644 --- a/stable/redis/Chart.yaml +++ b/stable/redis/Chart.yaml @@ -1,5 +1,5 @@ name: redis -version: 3.3.2 +version: 3.3.3 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/stable/redis/README.md b/stable/redis/README.md index c3c49d85a5..e8a5ecc242 100644 --- a/stable/redis/README.md +++ b/stable/redis/README.md @@ -90,6 +90,7 @@ The following table lists the configurable parameters of the Redis chart and the | `master.extraFlags` | Redis master additional command line flags | [] | | `master.nodeSelector` | Redis master Node labels for pod assignment | {"beta.kubernetes.io/arch": "amd64"} | | `master.tolerations` | Toleration labels for Redis master pod assignment | [] | +| `master.schedulerName` | Name of an alternate scheduler | `nil` | | `master.service.type` | Kubernetes Service type (redis master) | `ClusterIP` | | `master.service.annotations` | annotations for redis master service | {} | | `master.service.loadBalancerIP` | loadBalancerIP if redis master service type is `LoadBalancer` | `nil` | @@ -130,6 +131,7 @@ The following table lists the configurable parameters of the Redis chart and the | `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. (redis slave pod) | `master.readinessProbe.failureThreshold` | | `slave.podLabels` | Additional labels for Redis slave pod | `master.podLabels` | | `slave.podAnnotations` | Additional annotations for Redis slave pod | `master.podAnnotations` | +| `slave.schedulerName` | Name of an alternate scheduler | `nil` | | `slave.securityContext.enabled` | Enable security context (redis slave pod) | `master.securityContext.enabled` | | `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` | diff --git a/stable/redis/templates/redis-master-statefulset.yaml b/stable/redis/templates/redis-master-statefulset.yaml index 79e9dcea78..bf05ca79f6 100644 --- a/stable/redis/templates/redis-master-statefulset.yaml +++ b/stable/redis/templates/redis-master-statefulset.yaml @@ -13,7 +13,7 @@ spec: release: "{{ .Release.Name }}" role: master app: {{ template "redis.name" . }} - serviceName: "redis-master" + serviceName: "redis-master" template: metadata: labels: @@ -46,6 +46,9 @@ spec: {{- if .Values.master.tolerations }} tolerations: {{ toYaml .Values.master.tolerations | indent 8 }} + {{- end }} + {{- if .Values.master.schedulerName }} + schedulerName: "{{ .Values.master.schedulerName }}" {{- end }} containers: - name: {{ template "redis.fullname" . }} diff --git a/stable/redis/templates/redis-slave-deployment.yaml b/stable/redis/templates/redis-slave-deployment.yaml index 488196dafc..6e69013ee2 100644 --- a/stable/redis/templates/redis-slave-deployment.yaml +++ b/stable/redis/templates/redis-slave-deployment.yaml @@ -42,6 +42,9 @@ spec: tolerations: {{ toYaml (.Values.slave.tolerations | default .Values.master.tolerations) | indent 8 }} {{- end }} + {{- if .Values.slave.schedulerName }} + schedulerName: "{{ .Values.slave.schedulerName }}" + {{- end }} {{- with .Values.affinity }} affinity: {{ toYaml . | indent 8 }} diff --git a/stable/redis/values.yaml b/stable/redis/values.yaml index a0e3e379b1..8cd5e84511 100644 --- a/stable/redis/values.yaml +++ b/stable/redis/values.yaml @@ -120,6 +120,11 @@ master: # requests: # memory: 256Mi # cpu: 100m + ## Use an alternate scheduler, e.g. "stork". + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + # schedulerName: + ## Redis Master Liveness Probe livenessProbe: @@ -250,6 +255,11 @@ slave: # nodeSelector: {"beta.kubernetes.io/arch": "amd64"} # tolerations: [] + ## Use an alternate scheduler, e.g. "stork". + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + # schedulerName: + ## Redis slave pod Annotation and Labels # podLabels: {} ## annotations for redis pods