feat(pgbouncerExporter): add imagePullSecrets support with global deduplication, refs #18

Author: masterkain

charts/pgbouncer/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: pgbouncer
 description: A Helm chart for deploying PgBouncer, a PostgreSQL connection pooler, on Kubernetes
 type: application
-version: 2.6.1
+version: 2.7.0
 appVersion: 1.24.1
 kubeVersion: ">= 1.22.0-0"
 icon: https://icoretech.github.io/helm/charts/pgbouncer/logo.png

charts/pgbouncer/README.md

@@ -66,6 +66,7 @@ The following table lists the configurable parameters of the PgBouncer chart and
 | pgbouncerExporter.image.registry | string | `""` | Exporter image registry |
 | pgbouncerExporter.image.repository | string | `"prometheuscommunity/pgbouncer-exporter"` | Exporter image repository |
 | pgbouncerExporter.image.tag | string | `"v0.10.2"` | Exporter image tag |
+| pgbouncerExporter.imagePullSecrets | list | `[]` | Array of imagePullSecrets to use for pulling the pgbouncer-exporter image. |
 | pgbouncerExporter.log.format | string | `"logfmt"` | Exporter log format (logfmt or json) |
 | pgbouncerExporter.log.level | string | `"info"` | Exporter log level (debug, info, warn, error) |
 | pgbouncerExporter.podMonitor | bool | `false` | Whether to create a PodMonitor for scraping metrics (Prometheus Operator). |

charts/pgbouncer/templates/deployment.yaml

@@ -54,9 +54,30 @@ spec:
       {{ if .Values.runtimeClassName -}}
       runtimeClassName: {{ .Values.runtimeClassName }}
       {{ end -}}
-      {{ if len .Values.imagePullSecrets -}}
-      imagePullSecrets: {{ toYaml .Values.imagePullSecrets | trimSuffix "\n" | nindent 6 }}
-      {{ end -}}
+
+      {{- /* Combine global and exporter-specific imagePullSecrets */}}
+      {{- $allPullSecrets := .Values.imagePullSecrets | default list -}}
+      {{- if and .Values.pgbouncerExporter.enabled .Values.pgbouncerExporter.imagePullSecrets -}}
+        {{- $exporterPullSecrets := .Values.pgbouncerExporter.imagePullSecrets | default list -}}
+        {{- $allPullSecrets = concat $allPullSecrets $exporterPullSecrets -}}
+      {{- end -}}
+
+      {{- /* De-duplicate secrets by name */}}
+      {{- $uniquePullSecrets := list -}}
+      {{- $seenSecretNames := dict -}}
+      {{- range $allPullSecrets -}}
+        {{- if .name -}} {{/* Ensure item is a map with a 'name' key to avoid errors with malformed entries */}}
+          {{- if not (hasKey $seenSecretNames .name) -}}
+            {{- $uniquePullSecrets = append $uniquePullSecrets . -}}
+            {{- $_ := set $seenSecretNames .name true -}}
+          {{- end -}}
+        {{- end -}}
+      {{- end -}}
+
+      {{- if $uniquePullSecrets }}
+      imagePullSecrets: {{- toYaml $uniquePullSecrets | nindent 8 }}
+      {{- end }}
+
       {{ if .Values.extraInitContainers -}}
       initContainers: {{ toYaml .Values.extraInitContainers | trimSuffix "\n" | nindent 6 }}
       {{ end -}}
@@ -156,4 +177,4 @@ spec:
       {{- if .Values.extraVolumes -}}
       {{ toYaml .Values.extraVolumes | trimSuffix "\n" | nindent 6 }}
       {{ end -}}
-{{- end }}
+{{- end }}

charts/pgbouncer/values.yaml

@@ -221,6 +221,8 @@ extraVolumes: []
 pgbouncerExporter:
   # -- Enable or disable the PgBouncer exporter sidecar container.
   enabled: false
+  # -- Array of imagePullSecrets to use for pulling the pgbouncer-exporter image.
+  imagePullSecrets: []
   # -- Whether to create a PodMonitor for scraping metrics (Prometheus Operator).
   podMonitor: false
   # -- The container port for the exporter.