andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rke2-ingress-nginx: Remove incorrectly included `with` bracket for global images (#594) 

* rke2-ingress-nginx: Remove incorrectly included `with` bracket for global images

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/598/head
Derek Nola 2025-01-14 09:17:28 -08:00 committed by GitHub
parent 40cac70490
commit a854f25ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/rke2-ingress-nginx/generated-changes/patch/templates/admission-webhooks/job-patch/job-createSecret.yaml.patch
View File

@ -1,11 +1,13 @@
--- charts-original/templates/admission-webhooks/job-patch/job-createSecret.yaml --- charts-original/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ charts/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ charts/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -43,7 +43,7 @@ @@ -42,9 +42,7 @@
{{- end }}
containers: containers:
- name: create - name: create
{{- with (merge .Values.controller.admissionWebhooks.patch.image .Values.global.image) }} - {{- with (merge .Values.controller.admissionWebhooks.patch.image .Values.global.image) }}
- image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }} - image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }}
- {{- end }}
+ image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.admissionWebhooks.patch.image }}" + image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.admissionWebhooks.patch.image }}"
{{- end }}
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }}
args: args:
- create

8
packages/rke2-ingress-nginx/generated-changes/patch/templates/admission-webhooks/job-patch/job-patchWebhook.yaml.patch
View File

@ -1,11 +1,13 @@
--- charts-original/templates/admission-webhooks/job-patch/job-patchWebhook.yaml --- charts-original/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ charts/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ charts/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -43,7 +43,7 @@ @@ -42,9 +42,7 @@
{{- end }}
containers: containers:
- name: patch - name: patch
{{- with (merge .Values.controller.admissionWebhooks.patch.image .Values.global.image) }} - {{- with (merge .Values.controller.admissionWebhooks.patch.image .Values.global.image) }}
- image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }} - image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{ end }}:{{ .tag }}{{ if .digest }}@{{ .digest }}{{ end }}
- {{- end }}
+ image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.admissionWebhooks.patch.image }}" + image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.admissionWebhooks.patch.image }}"
{{- end }}
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }}
args: args:
- patch

8
packages/rke2-ingress-nginx/generated-changes/patch/templates/controller-daemonset.yaml.patch
View File

@ -1,11 +1,13 @@
--- charts-original/templates/controller-daemonset.yaml --- charts-original/templates/controller-daemonset.yaml
+++ charts/templates/controller-daemonset.yaml +++ charts/templates/controller-daemonset.yaml
@@ -76,7 +76,7 @@ @@ -75,9 +75,7 @@
{{- end }}
containers: containers:
- name: {{ .Values.controller.containerName }} - name: {{ .Values.controller.containerName }}
{{- with (merge .Values.controller.image .Values.global.image) }} - {{- with (merge .Values.controller.image .Values.global.image) }}
- image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{ end }}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }} - image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{ end }}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}
- {{- end }}
+ image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.image }}" + image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.image }}"
{{- end }}
imagePullPolicy: {{ .Values.controller.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}

8
packages/rke2-ingress-nginx/generated-changes/patch/templates/controller-deployment.yaml.patch
View File

@ -1,11 +1,13 @@
--- charts-original/templates/controller-deployment.yaml --- charts-original/templates/controller-deployment.yaml
+++ charts/templates/controller-deployment.yaml +++ charts/templates/controller-deployment.yaml
@@ -82,7 +82,7 @@ @@ -81,9 +81,7 @@
{{- end }}
containers: containers:
- name: {{ .Values.controller.containerName }} - name: {{ .Values.controller.containerName }}
{{- with (merge .Values.controller.image .Values.global.image) }} - {{- with (merge .Values.controller.image .Values.global.image) }}
- image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{ end }}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }} - image: {{ if .repository }}{{ .repository }}{{ else }}{{ .registry }}/{{ include "ingress-nginx.image" . }}{{ end }}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}
- {{- end }}
+ image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.image }}" + image: "{{ template "system_default_registry" . }}{{ template "repository_or_registry_and_image" .Values.controller.image }}"
{{- end }}
imagePullPolicy: {{ .Values.controller.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}

2
packages/rke2-ingress-nginx/package.yaml
View File

@ -1,4 +1,4 @@
url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.12.0/ingress-nginx-4.12.0.tgz url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.12.0/ingress-nginx-4.12.0.tgz
packageVersion: 01 packageVersion: 02
# This repository does not use releaseCandidateVersions, so you can leave this as 00. # This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00 releaseCandidateVersion: 00