Skip to content

fix(chart): use fully qualified container image names #4288 #4289

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
volker-raschek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(chart): use fully qualified container image names #4288 #4289

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
2 changes: 1 addition & 1 deletion cmd/build/helmify/static/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Output post install webhook probe container entry
*/}}
{{- define "gatekeeper.postInstallWebhookProbeContainer" -}}
- name: webhook-probe-post
image: "{{ .Values.postInstall.probeWebhook.image.repository }}:{{ .Values.postInstall.probeWebhook.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.probeWebhook.image.registry .Values.postInstall.probeWebhook.image.repository .Values.postInstall.probeWebhook.image.tag }}
imagePullPolicy: {{ .Values.postInstall.probeWebhook.image.pullPolicy }}
command:
- "curl"
Expand Down
4 changes: 2 additions & 2 deletions cmd/build/helmify/static/templates/namespace-post-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
{{- end }}
containers:
- name: kubectl-label
image: "{{ .Values.postInstall.labelNamespace.image.repository }}:{{ .Values.postInstall.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.labelNamespace.image.registry .Values.postInstall.labelNamespace.image.repository .Values.postInstall.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postInstall.labelNamespace.image.pullPolicy }}
args:
- label
Expand All @@ -62,7 +62,7 @@ spec:
{{- toYaml .Values.postInstall.securityContext | nindent 12 }}
{{- if .Values.postInstall.labelNamespace.extraNamespaces }}
- name: kubectl-label-extra
image: "{{ .Values.postInstall.labelNamespace.image.repository }}:{{ .Values.postInstall.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.labelNamespace.image.registry .Values.postInstall.labelNamespace.image.repository .Values.postInstall.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postInstall.labelNamespace.image.pullPolicy }}
args:
- label
Expand Down
4 changes: 2 additions & 2 deletions cmd/build/helmify/static/templates/namespace-post-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
{{- end }}
containers:
- name: kubectl-label
image: "{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postUpgrade.labelNamespace.image.registry .Values.postUpgrade.labelNamespace.image.repository .Values.postUpgrade.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postUpgrade.labelNamespace.image.pullPolicy }}
args:
- label
Expand All @@ -54,7 +54,7 @@ spec:
{{- toYaml .Values.postUpgrade.securityContext | nindent 12 }}
{{- if .Values.postUpgrade.labelNamespace.extraNamespaces }}
- name: kubectl-label-extra
image: "{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postUpgrade.labelNamespace.image.registry .Values.postUpgrade.labelNamespace.image.repository .Values.postUpgrade.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postUpgrade.labelNamespace.image.pullPolicy }}
args:
- label
Expand Down
8 changes: 4 additions & 4 deletions cmd/build/helmify/static/templates/upgrade-crds-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ spec:
- name: crds-upgrade
{{- if .Values.preInstall.crdRepository.image.repository }}
{{- if not .Values.preInstall.crdRepository.image.tag }}
image: '{{ .Values.preInstall.crdRepository.image.repository }}'
image: {{ printf "%s/%s" .Values.preInstall.crdRepository.image.registry .Values.preInstall.crdRepository.image.repository }}
{{- else }}
image: '{{ .Values.preInstall.crdRepository.image.repository }}:{{ .Values.preInstall.crdRepository.image.tag }}'
image: {{ printf "%s/%s:%s" .Values.preInstall.crdRepository.image.registry .Values.preInstall.crdRepository.image.repository .Values.preInstall.crdRepository.image.tag }}
{{- end }}
{{- else }}
{{- if not .Values.image.release }}
image: '{{ .Values.image.crdRepository }}'
image: {{ printf "%s/%s" .Values.image.crdRegistry .Values.image.crdRepository }}
{{- else }}
image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}'
image: {{ printf "%s/%s:%s" .Values.image.crdRegistry .Values.image.crdRepository .Values.image.release }}
{{- end }}
{{- end }}
imagePullPolicy: '{{ .Values.image.pullPolicy }}'
Expand Down
2 changes: 1 addition & 1 deletion cmd/build/helmify/static/templates/webhook-configs-pre-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
{{- end }}
containers:
- name: kubectl-delete
image: "{{ .Values.preUninstall.deleteWebhookConfigurations.image.repository }}:{{ .Values.preUninstall.deleteWebhookConfigurations.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.preUninstall.deleteWebhookConfigurations.image.registry .Values.preUninstall.deleteWebhookConfigurations.image.repository .Values.preUninstall.deleteWebhookConfigurations.image.tag }}
imagePullPolicy: {{ .Values.preUninstall.deleteWebhookConfigurations.image.pullPolicy }}
args:
- delete
Expand Down
7 changes: 7 additions & 0 deletions cmd/build/helmify/static/values.yaml
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@JaydipGabani JaydipGabani Dec 9, 2025

Choose a reason for hiding this comment

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

can you add variable information to

gatekeeper/cmd/build/helmify/static/README.md

Line 69 in 7300266

## Parameters
at appropriate location?

Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,17 @@ commonAnnotations: {}
extraVolumeMounts: []
extraVolumes: []
image:
registry: docker.io
Copy link
Copy Markdown
Contributor

@JaydipGabani JaydipGabani Dec 9, 2025

Choose a reason for hiding this comment

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

where is this variable being used?

repository: openpolicyagent/gatekeeper
crdRegistry: docker.io
crdRepository: openpolicyagent/gatekeeper-crds
release: v3.22.0-beta.0
pullPolicy: IfNotPresent
pullSecrets: []
preInstall:
crdRepository:
image:
registry: null
Comment thread
volker-raschek marked this conversation as resolved.
repository: null
tag: v3.22.0-beta.0
postUpgrade:
Expand All @@ -104,6 +107,7 @@ postUpgrade:
create: true
enabled: false
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -141,6 +145,7 @@ postInstall:
enabled: true
extraRules: []
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand All @@ -160,6 +165,7 @@ postInstall:
probeWebhook:
enabled: true
image:
registry: docker.io
repository: curlimages/curl
tag: 8.12.0
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -188,6 +194,7 @@ preUninstall:
extraRules: []
enabled: false
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/charts/gatekeeper/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Output post install webhook probe container entry
*/}}
{{- define "gatekeeper.postInstallWebhookProbeContainer" -}}
- name: webhook-probe-post
image: "{{ .Values.postInstall.probeWebhook.image.repository }}:{{ .Values.postInstall.probeWebhook.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.probeWebhook.image.registry .Values.postInstall.probeWebhook.image.repository .Values.postInstall.probeWebhook.image.tag }}
imagePullPolicy: {{ .Values.postInstall.probeWebhook.image.pullPolicy }}
command:
- "curl"
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/gatekeeper/templates/namespace-post-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
{{- end }}
containers:
- name: kubectl-label
image: "{{ .Values.postInstall.labelNamespace.image.repository }}:{{ .Values.postInstall.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.labelNamespace.image.registry .Values.postInstall.labelNamespace.image.repository .Values.postInstall.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postInstall.labelNamespace.image.pullPolicy }}
args:
- label
Expand All @@ -62,7 +62,7 @@ spec:
{{- toYaml .Values.postInstall.securityContext | nindent 12 }}
{{- if .Values.postInstall.labelNamespace.extraNamespaces }}
- name: kubectl-label-extra
image: "{{ .Values.postInstall.labelNamespace.image.repository }}:{{ .Values.postInstall.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postInstall.labelNamespace.image.registry .Values.postInstall.labelNamespace.image.repository .Values.postInstall.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postInstall.labelNamespace.image.pullPolicy }}
args:
- label
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/gatekeeper/templates/namespace-post-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
{{- end }}
containers:
- name: kubectl-label
image: "{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postUpgrade.labelNamespace.image.registry .Values.postUpgrade.labelNamespace.image.repository .Values.postUpgrade.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postUpgrade.labelNamespace.image.pullPolicy }}
args:
- label
Expand All @@ -54,7 +54,7 @@ spec:
{{- toYaml .Values.postUpgrade.securityContext | nindent 12 }}
{{- if .Values.postUpgrade.labelNamespace.extraNamespaces }}
- name: kubectl-label-extra
image: "{{ .Values.postUpgrade.labelNamespace.image.repository }}:{{ .Values.postUpgrade.labelNamespace.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.postUpgrade.labelNamespace.image.registry .Values.postUpgrade.labelNamespace.image.repository .Values.postUpgrade.labelNamespace.image.tag }}
imagePullPolicy: {{ .Values.postUpgrade.labelNamespace.image.pullPolicy }}
args:
- label
Expand Down
8 changes: 4 additions & 4 deletions manifest_staging/charts/gatekeeper/templates/upgrade-crds-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ spec:
- name: crds-upgrade
{{- if .Values.preInstall.crdRepository.image.repository }}
{{- if not .Values.preInstall.crdRepository.image.tag }}
image: '{{ .Values.preInstall.crdRepository.image.repository }}'
image: {{ printf "%s/%s" .Values.preInstall.crdRepository.image.registry .Values.preInstall.crdRepository.image.repository }}
{{- else }}
image: '{{ .Values.preInstall.crdRepository.image.repository }}:{{ .Values.preInstall.crdRepository.image.tag }}'
image: {{ printf "%s/%s:%s" .Values.preInstall.crdRepository.image.registry .Values.preInstall.crdRepository.image.repository .Values.preInstall.crdRepository.image.tag }}
{{- end }}
{{- else }}
{{- if not .Values.image.release }}
image: '{{ .Values.image.crdRepository }}'
image: {{ printf "%s/%s" .Values.image.crdRegistry .Values.image.crdRepository }}
{{- else }}
image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}'
image: {{ printf "%s/%s:%s" .Values.image.crdRegistry .Values.image.crdRepository .Values.image.release }}
{{- end }}
{{- end }}
imagePullPolicy: '{{ .Values.image.pullPolicy }}'
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/charts/gatekeeper/templates/webhook-configs-pre-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
{{- end }}
containers:
- name: kubectl-delete
image: "{{ .Values.preUninstall.deleteWebhookConfigurations.image.repository }}:{{ .Values.preUninstall.deleteWebhookConfigurations.image.tag }}"
image: {{ printf "%s/%s:%s" .Values.preUninstall.deleteWebhookConfigurations.image.registry .Values.preUninstall.deleteWebhookConfigurations.image.repository .Values.preUninstall.deleteWebhookConfigurations.image.tag }}
imagePullPolicy: {{ .Values.preUninstall.deleteWebhookConfigurations.image.pullPolicy }}
args:
- delete
Expand Down
7 changes: 7 additions & 0 deletions manifest_staging/charts/gatekeeper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,17 @@ commonAnnotations: {}
extraVolumeMounts: []
extraVolumes: []
image:
registry: docker.io
repository: openpolicyagent/gatekeeper
crdRegistry: docker.io
crdRepository: openpolicyagent/gatekeeper-crds
release: v3.22.0-beta.0
pullPolicy: IfNotPresent
pullSecrets: []
preInstall:
crdRepository:
image:
registry: null
Copy link

Copilot AI Dec 9, 2025

Choose a reason for hiding this comment

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

Setting registry: null is problematic. If a user sets preInstall.crdRepository.image.repository to a custom value but leaves registry as null, the template at lines 100 and 102 in upgrade-crds-hook.yaml will render the string "null" literally, producing invalid image names like null/custom-repo. Consider using an empty string "" or a default value like docker.io instead.

Suggested change
registry: null
registry: docker.io

Copilot uses AI. Check for mistakes.
repository: null
tag: v3.22.0-beta.0
postUpgrade:
Expand All @@ -104,6 +107,7 @@ postUpgrade:
create: true
enabled: false
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -141,6 +145,7 @@ postInstall:
enabled: true
extraRules: []
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand All @@ -160,6 +165,7 @@ postInstall:
probeWebhook:
enabled: true
image:
registry: docker.io
repository: curlimages/curl
tag: 8.12.0
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -188,6 +194,7 @@ preUninstall:
extraRules: []
enabled: false
image:
registry: docker.io
repository: openpolicyagent/gatekeeper-crds
tag: v3.22.0-beta.0
pullPolicy: IfNotPresent
Expand Down