chore: Adding '.Values.global.imagePullSecrets' to be propagated into network-operator sub-charts

Signed-off-by: Ido Heyvi <[email protected]>

Author: heyvister1

deployment/network-operator/templates/_helpers.tpl

@@ -67,20 +67,24 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
-imagePullSecrets helpers
+imagePullSecrets helper - supports global.imagePullSecrets, operator.imagePullSecrets and root imagePullSecrets fallback
 */}}
-{{- define "network-operator.operator.imagePullSecrets" }}
-{{- $imagePullSecrets := list }}
-{{- if .Values.operator.imagePullSecrets }}
-{{- range .Values.operator.imagePullSecrets }}
-{{- $imagePullSecrets  = append $imagePullSecrets  (dict "name" . ) }}
-{{- end }}
-{{- else }}
-{{- if .Values.imagePullSecrets }}
-{{- range .Values.imagePullSecrets }}
-{{- $imagePullSecrets  = append $imagePullSecrets  (dict "name" . ) }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- define "network-operator.operator.imagePullSecrets" -}}
+{{- $imagePullSecrets := list -}}
+{{- if .Values.operator.imagePullSecrets -}}
+  {{- range .Values.operator.imagePullSecrets -}}
+    {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) -}}
+  {{- end -}}
+{{- else if .Values.imagePullSecrets -}}
+  {{- range .Values.imagePullSecrets -}}
+    {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) -}}
+  {{- end -}}
+{{- else if .Values.global.imagePullSecrets -}}
+  {{- range .Values.global.imagePullSecrets -}}
+    {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) -}}
+  {{- end -}}
+{{- end -}}
+{{- if $imagePullSecrets -}}
 {{- $imagePullSecrets | toJson }}
-{{- end }}
+{{- end -}}
+{{- end -}}

deployment/network-operator/values.yaml

@@ -320,8 +320,13 @@ operator:
 
 # -- An optional list of references to secrets to use for pulling any of the
 # Network Operator images.
+# Kept for backward compatibility.
 imagePullSecrets: []
 
+# -- Global values to be propagated into Network-Operator sub-charts
+global:
+  imagePullSecrets: []
+
 # @ignore
 test:
   pf: ens2f0

hack/templates/values/values.template

@@ -320,8 +320,13 @@ operator:
 
 # -- An optional list of references to secrets to use for pulling any of the
 # Network Operator images.
+# Kept for backward compatibility.
 imagePullSecrets: []
 
+# -- Global values to be propagated into Network-Operator sub-charts
+global:
+  imagePullSecrets: []
+
 # @ignore
 test:
   pf: ens2f0