[stable/redis] Process template directives in affinity parameters (#10312)

* [stable/redis] Process template directives in affinity parameters

Signed-off-by: Dinko Osrecki <dinko.osrecki@gmail.com>

* [stable/redis] Update README

Signed-off-by: Dinko Osrecki <dinko.osrecki@gmail.com>
This commit is contained in:
Dinko Osrecki
2019-01-02 04:32:15 -08:00
committed by Kubernetes Prow Robot
parent ef0300e8fd
commit 6e556e592d
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: redis
version: 5.1.3
version: 5.1.4
appVersion: 4.0.12
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:
+2 -2
View File
@@ -141,7 +141,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.affinity ` | Affinity settings for Redis master pod assignment | [] |
| `master.affinity` | Affinity settings for Redis master pod assignment | {} |
| `master.schedulerName` | Name of an alternate scheduler | `nil` |
| `master.service.type` | Kubernetes Service type (redis master) | `ClusterIP` |
| `master.service.port` | Kubernetes Service port (redis master) | `6379` |
@@ -195,7 +195,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 | {} |
| `slave.affinity` | Affinity settings for Redis slave pod assignment | {} |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
@@ -46,7 +46,7 @@ spec:
serviceAccountName: "{{ template "redis.serviceAccountName" . }}"
{{- with .Values.master.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{ tpl (toYaml .) $ | indent 8 }}
{{- end }}
{{- if .Values.master.nodeSelector }}
nodeSelector:
@@ -61,7 +61,7 @@ spec:
{{- end }}
{{- with .Values.slave.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{ tpl (toYaml .) $ | indent 8 }}
{{- end }}
containers:
- name: {{ template "redis.fullname" . }}