[prometheus-elasticsearch-exporter] Correct imagepullsecrets for elas…

…ticsearch exporter (#4589) * Fix #4580 Updated imagepullsecrets for elasticsearch exporter Signed-off-by: Jon Krehling <[email protected]> * Update charts/prometheus-elasticsearch-exporter/templates/deployment.yaml Co-authored-by: zeritti <[email protected]> Signed-off-by: JKrehling <[email protected]> * Update charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl Co-authored-by: zeritti <[email protected]> Signed-off-by: JKrehling <[email protected]> * updated values comments for imagePullSecrets Signed-off-by: Jon Krehling <[email protected]> * updated charted version Signed-off-by: Jon Krehling <[email protected]> * Remove trailing spaces Signed-off-by: zeritti <[email protected]> --------- Signed-off-by: Jon Krehling <[email protected]> Signed-off-by: JKrehling <[email protected]> Signed-off-by: zeritti <[email protected]> Co-authored-by: Jon Krehling <[email protected]> Co-authored-by: zeritti <[email protected]>
prometheus-community · Jun 9, 2024 · dc5f3cc · dc5f3cc
1 parent 0ce6914
commit dc5f3cc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 24 deletions.
diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 5.8.0
+version: 5.8.1
 kubeVersion: ">=1.10.0-0"
 appVersion: "v1.7.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl b/charts/prometheus-elasticsearch-exporter/templates/_helpers.tpl
@@ -57,31 +57,28 @@ Usage:
 
 
 {{/*
-Return the proper Docker Image Registry Secret Names evaluating values as templates
-{{ include "elasticsearch-exporter.image.pullSecret.name" ( dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "context" $) }}
-*/}}
-{{- define "elasticsearch-exporter.image.pullSecret.name" -}}
-  {{- $pullSecrets := list }}
-  {{- $context := .context }}
+To help compatibility with other charts which use global.imagePullSecrets.
+Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style).
+global:
+  imagePullSecrets:
+  - name: pullSecret1
+  - name: pullSecret2
 
-  {{- if $context.Values.global }}
-    {{- range $context.Values.global.imagePullSecrets -}}
-      {{/* Is plain array of strings, compatible with all bitnami charts */}}
-      {{- $pullSecrets = append $pullSecrets (include "elasticsearch-exporter.tplvalue.render" (dict "value" . "context" $context)) -}}
-    {{- end -}}
-  {{- end -}}
-  {{- range .images -}}
-    {{- if .pullSecret -}}
-      {{- $pullSecrets = append $pullSecrets (include "elasticsearch-exporter.tplvalue.render" (dict "value" .pullSecret "context" $context)) -}}
-    {{- end -}}
-  {{- end -}}
+or
 
-  {{- if (not (empty $pullSecrets)) }}
-imagePullSecrets:
-    {{- range $pullSecrets | uniq }}
-  - name: {{ . }}
-    {{- end }}
+global:
+  imagePullSecrets:
+  - pullSecret1
+  - pullSecret2
+*/}}
+{{- define "elasticsearch-exporter.imagePullSecrets" -}}
+{{- range .Values.global.imagePullSecrets }}
+  {{- if eq (typeOf .) "map[string]interface {}" }}
+- {{ tpl (toYaml .) $ | trim }}
+  {{- else }}
+- name: {{ tpl . $ }}
   {{- end }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
@@ -46,7 +46,10 @@ spec:
 {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
 {{- end }}
-      {{- include "elasticsearch-exporter.image.pullSecret.name" (dict "images" (list .Values.image) "context" $) | nindent 6 }}
+      {{- if .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+      {{- include "elasticsearch-exporter.imagePullSecrets" . | indent 8 }}
+      {{- end }}
       restartPolicy: {{ .Values.restartPolicy }}
       {{- with .Values.podSecurityContext }}
       securityContext:

diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml
@@ -2,6 +2,23 @@
 ## This allows to set the same values for the imagePullSecrets, obviating the need
 ## to set the same values for each chart (and image) separately
 global:
+## Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style).
+##  imagePullSecrets:
+##  - name: pullSecret1
+##  - name: pullSecret2
+##
+## or
+##
+##  imagePullSecrets:
+##  - pullSecret1
+##  - pullSecret2
+##
+## or a templated value
+##
+##    imagePullSecrets:
+##    - "{{ .Values.templateValue }}"
+##  templateValue: test
+
   imagePullSecrets: []
   imageRegistry: ""