diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml index b64e668d96aa..a522aca29070 100644 --- a/stable/redis/Chart.yaml +++ b/stable/redis/Chart.yaml @@ -1,5 +1,5 @@ name: redis -version: 1.0.2 +version: 1.0.3 appVersion: 4.0.2 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 4db4fe27a944..a386c1d9ac93 100644 --- a/stable/redis/README.md +++ b/stable/redis/README.md @@ -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. diff --git a/stable/redis/templates/svc.yaml b/stable/redis/templates/svc.yaml index 70c3777a1731..011de4d7d874 100644 --- a/stable/redis/templates/svc.yaml +++ b/stable/redis/templates/svc.yaml @@ -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 diff --git a/stable/redis/values.yaml b/stable/redis/values.yaml index 53eaad6d0993..ac53e7bf0bb1 100644 --- a/stable/redis/values.yaml +++ b/stable/redis/values.yaml @@ -90,3 +90,7 @@ networkPolicy: ## (with the correct destination port). ## allowExternal: true + +service: + annotations: {} + loadBalancerIP: