Redis: adding annotation and service type to redis setup (#2586)

* Adding service type and service annotations to redis

* redis: bumping the redis version

*    [stable/redis]
   Adding service.annotations and service.loadBalancerIP to readme. I see mix naming conventions that is confusing but still I try to do the change in a backward compatible manner

*    [stable/redis] bumping the version to 1.0.3
This commit is contained in:
kavehmzta
2017-11-17 16:57:32 +01:00
committed by Reinhard Nägele
parent 752cfe95bb
commit 9c7b3ce7ed
3 changed files with 37 additions and 24 deletions
+25 -23
View File
@@ -43,29 +43,31 @@ The command removes all the Kubernetes components associated with the chart and
The following tables lists the configurable parameters of the Redis chart and their default values.
| Parameter | Description | Default |
|-------------------------------|--------------------------------------------|------------------------------|
| `image` | Redis image | `bitnami/redis:{VERSION}` |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `serviceType` | Kubernetes Service type | `ClusterIP` |
| `usePassword` | Use password | `true` |
| `redisPassword` | Redis password | Randomly generated |
| `args` | Redis command-line args | [] |
| `persistence.enabled` | Use a PVC to persist data | `true` |
| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` |
| `persistence.storageClass` | Storage class of backing PVC | `generic` |
| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` |
| `persistence.size` | Size of data volume | `8Gi` |
| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `100m` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image` | Exporter image | `oliver006/redis_exporter` |
| `metrics.imageTag` | Exporter image | `v0.11` |
| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` |
| `metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` |
| `nodeSelector` | Node labels for pod assignment | {} |
| `tolerations` | Toleration labels for pod assignment | [] |
| `networkPolicy.enabled` | Enable NetworkPolicy | `false` |
| `networkPolicy.allowExternal` | Don't require client label for connections | `true` |
| Parameter | Description | Default |
|-------------------------------|--------------------------------------------------|------------------------------|
| `image` | Redis image | `bitnami/redis:{VERSION}` |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `serviceType` | Kubernetes Service type | `ClusterIP` |
| `usePassword` | Use password | `true` |
| `redisPassword` | Redis password | Randomly generated |
| `args` | Redis command-line args | [] |
| `persistence.enabled` | Use a PVC to persist data | `true` |
| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` |
| `persistence.storageClass` | Storage class of backing PVC | `generic` |
| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` |
| `persistence.size` | Size of data volume | `8Gi` |
| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `100m` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image` | Exporter image | `oliver006/redis_exporter` |
| `metrics.imageTag` | Exporter image | `v0.11` |
| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` |
| `metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` |
| `nodeSelector` | Node labels for pod assignment | {} |
| `tolerations` | Toleration labels for pod assignment | [] |
| `networkPolicy.enabled` | Enable NetworkPolicy | `false` |
| `networkPolicy.allowExternal` | Don't require client label for connections | `true` |
| `service.annotations` | annotations for redis service | {} |
| `service.loadBalancerIP` | loadBalancerIP if service type is `LoadBalancer` | `` |
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.
+8 -1
View File
@@ -7,12 +7,19 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.metrics.enabled }}
annotations:
{{- range $key, $value := .Values.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.metrics.enabled }}
{{ toYaml .Values.metrics.annotations | indent 4 }}
{{- end }}
spec:
type: {{ .Values.serviceType }}
{{ if eq .Values.serviceType "LoadBalancer" -}} {{ if .Values.service.loadBalancerIP -}}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{ end -}}
{{- end -}}
ports:
- name: redis
port: 6379
+4
View File
@@ -90,3 +90,7 @@ networkPolicy:
## (with the correct destination port).
##
allowExternal: true
service:
annotations: {}
loadBalancerIP: