From b7bba20c8a94e440fc256bd80c863f1072143bcd Mon Sep 17 00:00:00 2001
From: Naseem <naseemkullah@gmail.com>
Date: Mon, 8 Jul 2019 17:05:37 -0400
Subject: [PATCH] Update image (#15217)

Signed-off-by: Naseem <naseemkullah@gmail.com>
---
 stable/prometheus-redis-exporter/Chart.yaml            |  4 ++--
 stable/prometheus-redis-exporter/README.md             | 10 ++++++++--
 .../templates/deployment.yaml                          |  2 +-
 stable/prometheus-redis-exporter/values.yaml           |  5 ++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/stable/prometheus-redis-exporter/Chart.yaml b/stable/prometheus-redis-exporter/Chart.yaml
index 5be4ac55f5..b9c1050995 100644
--- a/stable/prometheus-redis-exporter/Chart.yaml
+++ b/stable/prometheus-redis-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: 0.28.0
+appVersion: 1.0.3
 description: Prometheus exporter for Redis metrics
 name: prometheus-redis-exporter
-version: 2.0.2
+version: 3.0.0
 home: https://github.com/oliver006/redis_exporter
 sources:
   - https://github.com/oliver006/redis_exporter
diff --git a/stable/prometheus-redis-exporter/README.md b/stable/prometheus-redis-exporter/README.md
index 556f37e6ef..43fbe438e4 100644
--- a/stable/prometheus-redis-exporter/README.md
+++ b/stable/prometheus-redis-exporter/README.md
@@ -44,7 +44,7 @@ The following table lists the configurable parameters and their default values.
 | ---------------------- | --------------------------------------------------- | ------------------------- |
 | `replicaCount`         | desired number of prometheus-redis-exporter pods    | `1`                       |
 | `image.repository`     | prometheus-redis-exporter image repository          | `oliver006/redis_exporter`|
-| `image.tag`            | prometheus-redis-exporter image tag                 | `v0.28.0`                 |
+| `image.tag`            | prometheus-redis-exporter image tag                 | `v1.0.3`                 |
 | `image.pullPolicy`     | image pull policy                                   | `IfNotPresent`            |
 | `image.pullSecrets`    | image pull secrets                                  | {}                        |
 | `extraArgs`            | extra arguments for the binary; possible values [here](https://github.com/oliver006/redis_exporter#flags)| {}
@@ -54,7 +54,7 @@ The following table lists the configurable parameters and their default values.
 | `service.port`         | service external port                               | `9121`                    |
 | `service.annotations`  | Custom annotations for service                      | `{}`                      |
 | `service.labels`       | Additional custom labels for the service            | `{}`                      |
-| `redisAddress`         | A list of addresses of one or more redis nodes      | `redis://myredis:6379`    |
+| `redisAddress`         | Address of the Redis instance to scrape      | `redis://myredis:6379`    |
 | `annotations`          | pod annotations for easier discovery                | {}                        |
 | `rbac.create`           | Specifies whether RBAC resources should be created.| `true` |
 | `rbac.pspEnabled`       | Specifies whether a PodSecurityPolicy should be created.| `true` |
@@ -116,3 +116,9 @@ data:
     return result
 ```
 If you want to use this script for collecting metrics, you could do this by just set `script.configmap` to the name of the configmap (e.g. `prometheus-redis-exporter-script`) and `script.keyname` to the configmap-key holding the script (eg. `script`). The required variables inside the container will be set automatically.
+
+## Upgrading
+
+### To 3.0.0
+
+ The default tag for the exporter image is now `v1.x.x`. This major release includes changes to the names of various metrics and no longer directly supports the configuration (and scraping) of multiple redis instances; that is now the Prometheus server's responsibility. You'll want to use [this dashboard](https://github.com/oliver006/redis_exporter/blob/master/contrib/grafana_prometheus_redis_dashboard.json) now. Please see the [redis_exporter github page](https://github.com/oliver006/redis_exporter#upgrading-from-0x-to-1x) for more details.
diff --git a/stable/prometheus-redis-exporter/templates/deployment.yaml b/stable/prometheus-redis-exporter/templates/deployment.yaml
index 84b0c0ae91..c810cdc4c8 100644
--- a/stable/prometheus-redis-exporter/templates/deployment.yaml
+++ b/stable/prometheus-redis-exporter/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
               containerPort: 9121
           env:
             - name: REDIS_ADDR
-              value: {{ join "," .Values.redisAddress }}
+              value: {{ .Values.redisAddress }}
 {{- if .Values.script }}
             - name: REDIS_EXPORTER_SCRIPT
               value: /script/script.lua
diff --git a/stable/prometheus-redis-exporter/values.yaml b/stable/prometheus-redis-exporter/values.yaml
index 50bc214c2d..0886ae5df2 100644
--- a/stable/prometheus-redis-exporter/values.yaml
+++ b/stable/prometheus-redis-exporter/values.yaml
@@ -13,7 +13,7 @@ serviceAccount:
 replicaCount: 1
 image:
   repository: oliver006/redis_exporter
-  tag: v0.28.0
+  tag: v1.0.3
   pullPolicy: IfNotPresent
 extraArgs: {}
 # Additional Environment variables
@@ -32,8 +32,7 @@ service:
     # prometheus.io/port: "9121"
     # prometheus.io/scrape: "true"
 resources: {}
-redisAddress:
-  - redis://myredis:6379
+redisAddress: redis://myredis:6379
 annotations: {}
 #  prometheus.io/path: /metrics
 #  prometheus.io/port: "9121"