[prometheus-redis-exporter] Allow REDIS_ADDR environment variable t…

…o be configured through a secret (prometheus-community#3775) * Allow `REDIS_ADDR` env var to be configured through a secret additionally to the configmap Signed-off-by: David Constenla <[email protected]> * Be explicit about the change breaking the values signature And adjust variable names Co-authored-by: zeritti <[email protected]> Signed-off-by: David Constenla <[email protected]> * Update the comment so it represents the current configuration Signed-off-by: David Constenla <[email protected]> --------- Signed-off-by: David Constenla <[email protected]> Signed-off-by: David Constenla <[email protected]> Co-authored-by: zeritti <[email protected]>
giffgaff · Mar 20, 2024 · e7a4bf1 · e7a4bf1
1 parent 5a07dae
commit e7a4bf1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/charts/prometheus-redis-exporter/Chart.yaml b/charts/prometheus-redis-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.54.0
 description: Prometheus exporter for Redis metrics
 name: prometheus-redis-exporter
-version: 5.6.0
+version: 6.0.0
 home: https://github.com/oliver006/redis_exporter
 sources:
   - https://github.com/oliver006/redis_exporter

diff --git a/charts/prometheus-redis-exporter/templates/deployment.yaml b/charts/prometheus-redis-exporter/templates/deployment.yaml
@@ -55,9 +55,13 @@ spec:
             - name: REDIS_ADDR
             {{- if .Values.redisAddressConfig.enabled }}
               valueFrom:
+              {{- if .Values.redisAddressConfig.isSecret }}
+                secretKeyRef:
+              {{- else }}
                 configMapKeyRef:
-                  name: {{ .Values.redisAddressConfig.configmap.name }}
-                  key: {{ .Values.redisAddressConfig.configmap.key }}
+              {{- end }}
+                  name: {{ .Values.redisAddressConfig.source.name }}
+                  key: {{ .Values.redisAddressConfig.source.key }}
             {{- else }}
               value: {{ .Values.redisAddress }}
             {{- end }}

diff --git a/charts/prometheus-redis-exporter/values.yaml b/charts/prometheus-redis-exporter/values.yaml
@@ -61,10 +61,12 @@ labels: {}
 #  prometheus.io/scrape: "true"
 
 redisAddressConfig:
-  # Use config from configmap
+  # configure `REDIS_ADDR` from a configmap
   enabled: false
-  # Use existing configmap (ignores redisAddress)
-  configmap:
+  # if `true` the `REDIS_ADDR` is sourced on a secret instead of a configmap
+  isSecret: false
+  # Use an existing configmap or secret will ignore redisAddress
+  source:
     name: ""
     key: ""