From bb8b0ebf132ba55ea587ce7eca2afbc705940d1e Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 17 May 2018 10:36:16 +0000 Subject: [PATCH] Synchronize upstreamed folder to 31dbce9 --- upstreamed/redis/Chart.yaml | 2 +- upstreamed/redis/README.md | 4 +++- upstreamed/redis/templates/metrics-svc.yaml | 2 +- upstreamed/redis/templates/redis-master-svc.yaml | 8 -------- upstreamed/redis/templates/redis-slave-svc.yaml | 8 -------- upstreamed/redis/values-production.yaml | 5 ++++- upstreamed/redis/values.yaml | 8 ++++---- 7 files changed, 13 insertions(+), 24 deletions(-) diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index 9c468b3ba..368f32c6e 100644 --- a/upstreamed/redis/Chart.yaml +++ b/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: diff --git a/upstreamed/redis/README.md b/upstreamed/redis/README.md index 9c8a782a7..98c7b1a5a 100644 --- a/upstreamed/redis/README.md +++ b/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` | diff --git a/upstreamed/redis/templates/metrics-svc.yaml b/upstreamed/redis/templates/metrics-svc.yaml index b5e2e930f..269f1fc60 100644 --- a/upstreamed/redis/templates/metrics-svc.yaml +++ b/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 -}} diff --git a/upstreamed/redis/templates/redis-master-svc.yaml b/upstreamed/redis/templates/redis-master-svc.yaml index 0a3c7b16e..bd569b9ae 100644 --- a/upstreamed/redis/templates/redis-master-svc.yaml +++ b/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 }}" diff --git a/upstreamed/redis/templates/redis-slave-svc.yaml b/upstreamed/redis/templates/redis-slave-svc.yaml index 7c52b5814..4a7121a30 100644 --- a/upstreamed/redis/templates/redis-slave-svc.yaml +++ b/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 }}" diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml index d2ef8f919..67527f5fe 100644 --- a/upstreamed/redis/values-production.yaml +++ b/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 diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml index 602c59a0d..a0e3e379b 100644 --- a/upstreamed/redis/values.yaml +++ b/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. ##