Skip to content

chore: Adding '.Values.global.imagePullSecrets' #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: Adding '.Values.global.imagePullSecrets' #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions deployment/network-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
5 changes: 5 additions & 0 deletions deployment/network-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Member

@rollandf rollandf Jul 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The format seems different between charts. May be problematic.
Some uses:

imagePullSecrets:
- name: my-secret

Other uses:

imagePullSecrets:
-  my-secret

imagePullSecrets: []

# @ignore
test:
pf: ens2f0
5 changes: 5 additions & 0 deletions hack/templates/values/values.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading