Synchronize upstreamed folder to 31dbce9

upstreamed/redis/Chart.yaml

@@ -1,5 +1,5 @@
 name: redis
-version: 3.2.5
+version: 3.3.0
 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:

upstreamed/redis/README.md

@@ -71,7 +71,9 @@ The following table lists the configurable parameters of the Redis chart and the
 | `metrics.image.pullSecrets`                | Specify docker-registry secret names as an array                                                               | `nil`                                                |
 | `metrics.podLabels`                        | Additional labels for Metrics exporter pod                                                                     | {}                                                   |
 | `metrics.podAnnotations`                   | Additional annotations for Metrics exporter pod                                                                | {}                                                   |
-| `metrics.targetServiceAnnotations`         | Annotations for the services to monitor  (redis master and redis slave service)                                | {}                                                   |
+| `master.service.type`                      | Kubernetes Service type (redis metrics)                                                                        | `LoadBalancer`                                       |
+| `metrics.service.annotations`              | Annotations for the services to monitor  (redis master and redis slave service)                                | {}                                                   |
+| `metrics.service.loadBalancerIP`           | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                 | `nil`                                                |
 | `metrics.resources`                        | Exporter resource requests/limit                                                                               | Memory: `256Mi`, CPU: `100m`                         |
 | `persistence.existingClaim`                | Provide an existing PersistentVolumeClaim                                                                      | `nil`                                                |
 | `master.persistence.enabled`               | Use a PVC to persist data (master node)                                                                        | `true`                                               |

upstreamed/redis/templates/metrics-svc.yaml

@@ -9,7 +9,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-{{ toYaml .Values.metrics.annotations | indent 4 }}
+{{ toYaml .Values.metrics.service.annotations | indent 4 }}
 spec:
   type: {{ .Values.metrics.service.type }}
   {{ if eq .Values.metrics.service.type "LoadBalancer" -}} {{ if .Values.metrics.service.loadBalancerIP -}}

upstreamed/redis/templates/redis-master-svc.yaml

@@ -11,9 +11,6 @@ metadata:
 {{- if .Values.master.service.annotations }}
 {{ toYaml .Values.master.service.annotations | indent 4 }}
 {{- end }}
-{{- if .Values.metrics.enabled }}
-{{ toYaml .Values.metrics.targetServiceAnnotations | indent 4 }}
-{{- end }}
 spec:
   type: {{ .Values.master.service.type }}
   {{ if eq .Values.master.service.type "LoadBalancer" -}} {{ if .Values.master.service.loadBalancerIP -}}
@@ -24,11 +21,6 @@ spec:
   - name: redis
     port: 6379
     targetPort: redis
-  {{- if .Values.metrics.enabled }}
-  - name: metrics
-    port: 9121
-    targetPort: metrics
-  {{- end }}
   selector:
     app: {{ template "redis.name" . }}
     release: "{{ .Release.Name }}"

upstreamed/redis/templates/redis-slave-svc.yaml

@@ -12,9 +12,6 @@ metadata:
 {{- if .Values.master.service.annotations }}
 {{ toYaml .Values.master.service.annotations | indent 4 }}
 {{- end }}
-{{- if .Values.metrics.enabled }}
-{{ toYaml .Values.metrics.targetServiceAnnotations | indent 4 }}
-{{- end }}
 spec:
   type: {{ .Values.slave.service.type }}
   {{ if eq .Values.slave.service.type "LoadBalancer" -}} {{ if .Values.slave.service.loadBalancerIP -}}
@@ -25,11 +22,6 @@ spec:
   - name: redis
     port: 6379
     targetPort: redis
-  {{- if .Values.metrics.enabled }}
-  - name: metrics
-    port: 9121
-    targetPort: metrics
-  {{- end }}
   selector:
     app: {{ template "redis.name" . }}
     release: "{{ .Release.Name }}"

upstreamed/redis/values-production.yaml

@@ -23,9 +23,12 @@ metrics:
   enabled: true
   # resources: {}
   # podAnnotations: {}
-  # targetServiceAnnotations:
+  service:
+    type: ClusterIP
+    annotations: {}
   #   prometheus.io/scrape: "true"
   #   prometheus.io/port: "9121"
+    loadBalancerIP:
   image:
     registry: docker.io
     repository: oliver006/redis_exporter

upstreamed/redis/values.yaml

@@ -27,9 +27,12 @@ metrics:
   enabled: false
   # resources: {}
   # podAnnotations: {}
-  # targetServiceAnnotations:
+  service:
+    type: ClusterIP
+    annotations: {}
   #   prometheus.io/scrape: "true"
   #   prometheus.io/port: "9121"
+    loadBalancerIP:
   image:
     registry: docker.io
     repository: oliver006/redis_exporter
@@ -49,9 +52,6 @@ metrics:
   ## Metrics exporter pod Annotation and Labels
   # podLabels: {}
 
-  service:
-    type: ClusterIP
-
 networkPolicy:
   ## Enable creation of NetworkPolicy resources.
   ##