Fix imagePullSecrets in all charts

steinhobelgruen · steinhobelgruen · commit 8a5342ac736d · 2025-05-26T21:28:56.000+02:00
Signed-off-by: Thomas Renger &lt;dentaku@wazong.de&gt;
diff --git a/charts/azure-janitor/templates/deployment.yaml b/charts/azure-janitor/templates/deployment.yaml
@@ -87,3 +87,6 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
 {{- end }}
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+{{- end }}
diff --git a/charts/azure-janitor/templates/serviceaccount.yaml b/charts/azure-janitor/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "azure-janitor.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-janitor/values.yaml b/charts/azure-janitor/values.yaml
@@ -104,6 +104,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -173,6 +174,3 @@ prometheus:
     ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
     ##
     labelValueLengthLimit: 0
-
-global:
-  imagePullSecrets: []
diff --git a/charts/azure-keyvault-exporter/templates/deployment.yaml b/charts/azure-keyvault-exporter/templates/deployment.yaml
@@ -89,3 +89,6 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
 {{- end }}
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+{{- end }}
diff --git a/charts/azure-keyvault-exporter/templates/serviceaccount.yaml b/charts/azure-keyvault-exporter/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "azure-keyvault-exporter.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-keyvault-exporter/values.yaml b/charts/azure-keyvault-exporter/values.yaml
@@ -101,6 +101,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -170,6 +171,3 @@ prometheus:
     ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
     ##
     labelValueLengthLimit: 0
-
-global:
-  imagePullSecrets: []
diff --git a/charts/azure-loganalytics-exporter/README.md b/charts/azure-loganalytics-exporter/README.md
@@ -30,7 +30,7 @@ A Helm chart for azure-loganalytics-exporter
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
 | fullnameOverride | string | `""` | String to fully override azure-loganalytics-exporter.fullname template |
-| global.imagePullSecrets | list | `[]` | registry secret names as an array |
+| imagePullSecrets | list | `[]` | registry secret names as an array |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"docker.io"` | image registry |
 | image.repository | string | `"webdevops/azure-loganalytics-exporter"` | image repository |
diff --git a/charts/azure-loganalytics-exporter/templates/deployment.yaml b/charts/azure-loganalytics-exporter/templates/deployment.yaml
@@ -108,3 +108,6 @@ spec:
       {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
diff --git a/charts/azure-loganalytics-exporter/templates/serviceaccount.yaml b/charts/azure-loganalytics-exporter/templates/serviceaccount.yaml
@@ -14,8 +14,4 @@ metadata:
     {{ toYaml . | nindent 4 }}
   {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
-{{- with .Values.global.imagePullSecrets }}
-imagePullSecrets:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-loganalytics-exporter/values.yaml b/charts/azure-loganalytics-exporter/values.yaml
@@ -1,8 +1,4 @@
 ---
-global:
-  # -- registry secret names as an array
-  imagePullSecrets: []
-
 # -- String to partially override azure-loganalytics-exporter.fullname template (will maintain the release name)
 nameOverride: ''
 
@@ -144,6 +140,10 @@ containerSecurityContext:
   capabilities:
     drop: ["ALL"]
 
+# -- registry secret names as an array
+imagePullSecrets: []
+  # - name: pull-secret-name
+
 service:
   type: ClusterIP
   port: 8080
diff --git a/charts/azure-metrics-exporter/templates/deployment.yaml b/charts/azure-metrics-exporter/templates/deployment.yaml
@@ -92,3 +92,6 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
 {{- end }}
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+{{- end }}
diff --git a/charts/azure-metrics-exporter/templates/serviceaccount.yaml b/charts/azure-metrics-exporter/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "azure-metrics-exporter.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-metrics-exporter/values.yaml b/charts/azure-metrics-exporter/values.yaml
@@ -101,6 +101,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -279,6 +280,3 @@ verticalPodAutoscaler:
     # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
     # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
     updateMode: Auto
-
-global:
-  imagePullSecrets: []
diff --git a/charts/azure-resourcegraph-exporter/README.md b/charts/azure-resourcegraph-exporter/README.md
@@ -30,7 +30,7 @@ A Helm chart for azure-resourcegraph-exporter
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
 | fullnameOverride | string | `""` | String to fully override azure-resourcegraph-exporter.fullname template |
-| global.imagePullSecrets | list | `[]` | registry secret names as an array |
+| imagePullSecrets | list | `[]` | registry secret names as an array |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"docker.io"` | image registry |
 | image.repository | string | `"webdevops/azure-resourcegraph-exporter"` | image repository |
diff --git a/charts/azure-resourcegraph-exporter/templates/deployment.yaml b/charts/azure-resourcegraph-exporter/templates/deployment.yaml
@@ -114,3 +114,6 @@ spec:
       {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
diff --git a/charts/azure-resourcegraph-exporter/templates/serviceaccount.yaml b/charts/azure-resourcegraph-exporter/templates/serviceaccount.yaml
@@ -14,8 +14,4 @@ metadata:
     {{ toYaml . | nindent 4 }}
   {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
-{{- with .Values.global.imagePullSecrets }}
-imagePullSecrets:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-resourcegraph-exporter/values.yaml b/charts/azure-resourcegraph-exporter/values.yaml
@@ -1,8 +1,4 @@
 ---
-global:
-  # -- registry secret names as an array
-  imagePullSecrets: []
-
 # -- String to partially override azure-resourcegraph-exporter.fullname template (will maintain the release name)
 nameOverride: ''
 
@@ -148,6 +144,10 @@ containerSecurityContext:
   capabilities:
     drop: ["ALL"]
 
+# -- registry secret names as an array
+imagePullSecrets: []
+  # - name: pull-secret-name
+
 service:
   type: ClusterIP
   port: 8080
diff --git a/charts/azure-resourcemanager-exporter/templates/deployment.yaml b/charts/azure-resourcemanager-exporter/templates/deployment.yaml
@@ -105,6 +105,9 @@ spec:
 {{- end }}
 {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
+{{- end }}
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
 {{- end }}
       volumes:
         - name: config
diff --git a/charts/azure-resourcemanager-exporter/templates/serviceaccount.yaml b/charts/azure-resourcemanager-exporter/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "azure-resourcemanager-exporter.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-resourcemanager-exporter/values.yaml b/charts/azure-resourcemanager-exporter/values.yaml
@@ -104,6 +104,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -204,6 +205,3 @@ verticalPodAutoscaler:
     # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
     # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
     updateMode: Auto
-
-global:
-  imagePullSecrets: []
diff --git a/charts/azure-scheduledevents-manager/templates/daemonset.yaml b/charts/azure-scheduledevents-manager/templates/daemonset.yaml
@@ -99,3 +99,6 @@ spec:
       {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
diff --git a/charts/azure-scheduledevents-manager/templates/serviceaccount.yaml b/charts/azure-scheduledevents-manager/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "azure-scheduledevents-manager.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/azure-scheduledevents-manager/values.yaml b/charts/azure-scheduledevents-manager/values.yaml
@@ -98,6 +98,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 scheduledEvent:
   approve: true
@@ -194,6 +195,3 @@ prometheus:
     ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
     ##
     labelValueLengthLimit: 0
-
-global:
-  imagePullSecrets: []
diff --git a/charts/kube-pool-manager/templates/deployment.yaml b/charts/kube-pool-manager/templates/deployment.yaml
@@ -113,7 +113,9 @@ spec:
       {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
-
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+      {{- end }}
       volumes:
         - name: config
           configMap:
diff --git a/charts/kube-pool-manager/templates/serviceaccount.yaml b/charts/kube-pool-manager/templates/serviceaccount.yaml
@@ -11,7 +11,3 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "kube-pool-manager.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
diff --git a/charts/kube-pool-manager/values.yaml b/charts/kube-pool-manager/values.yaml
@@ -103,6 +103,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -175,6 +176,3 @@ prometheus:
     ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
     ##
     labelValueLengthLimit: 0
-
-global:
-  imagePullSecrets: []
diff --git a/charts/pagerduty-exporter/templates/deployment.yaml b/charts/pagerduty-exporter/templates/deployment.yaml
@@ -89,3 +89,6 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
 {{- end }}
+{{- if .Values.imagePullSecrets }}
+      imagePullSecrets:  {{ toYaml .Values.imagePullSecrets | nindent 8 }}
+{{- end }}
diff --git a/charts/pagerduty-exporter/templates/serviceaccount.yaml b/charts/pagerduty-exporter/templates/serviceaccount.yaml
@@ -12,8 +12,4 @@ metadata:
 {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{ include "pagerduty-exporter.imagePullSecrets" . | trim | indent 2 }}
-{{- end }}
 {{- end }}
diff --git a/charts/pagerduty-exporter/values.yaml b/charts/pagerduty-exporter/values.yaml
@@ -100,6 +100,7 @@ containerSecurityContext:
 
 # -- registry secret names as an array
 imagePullSecrets: []
+  # - name: pull-secret-name
 
 service:
   type: ClusterIP
@@ -169,6 +170,3 @@ prometheus:
     ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
     ##
     labelValueLengthLimit: 0
-
-global:
-  imagePullSecrets: []
