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

pull ingress controller image from default registry (#22) 

* pull ingress controller image from default registry
pull/24/head
Menna Elmasry 2020-09-25 20:55:19 +02:00 committed by GitHub
parent df44ee5783
commit 4b1c166ad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/rke2-ingress-nginx/rke2-ingress-nginx-1.36.300.tgz
View File

Binary file not shown.

21
packages/rke2-ingress-nginx/rke2-ingress-nginx.patch
View File

@ -22,6 +22,18 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/tem
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }}
args: args:
- create - create
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/templates/admission-webhooks/job-patch/job-patchWebhook.yaml packages/rke2-ingress-nginx/charts/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
--- packages/rke2-ingress-nginx/charts-original/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ packages/rke2-ingress-nginx/charts/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -36,7 +36,7 @@
{{- end }}
containers:
- name: patch
- image: {{ .Values.controller.admissionWebhooks.patch.image.repository }}:{{ .Values.controller.admissionWebhooks.patch.image.tag }}
+ image: {{ template "system_default_registry" . }}{{ .Values.controller.admissionWebhooks.patch.image.repository }}:{{ .Values.controller.admissionWebhooks.patch.image.tag }}
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.pullPolicy }}
args:
- patch
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/templates/controller-daemonset.yaml packages/rke2-ingress-nginx/charts/templates/controller-daemonset.yaml diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/templates/controller-daemonset.yaml packages/rke2-ingress-nginx/charts/templates/controller-daemonset.yaml
--- packages/rke2-ingress-nginx/charts-original/templates/controller-daemonset.yaml --- packages/rke2-ingress-nginx/charts-original/templates/controller-daemonset.yaml
+++ packages/rke2-ingress-nginx/charts/templates/controller-daemonset.yaml +++ packages/rke2-ingress-nginx/charts/templates/controller-daemonset.yaml
@ -37,6 +49,15 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/tem
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/templates/controller-deployment.yaml packages/rke2-ingress-nginx/charts/templates/controller-deployment.yaml diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-ingress-nginx/charts-original/templates/controller-deployment.yaml packages/rke2-ingress-nginx/charts/templates/controller-deployment.yaml
--- packages/rke2-ingress-nginx/charts-original/templates/controller-deployment.yaml --- packages/rke2-ingress-nginx/charts-original/templates/controller-deployment.yaml
+++ packages/rke2-ingress-nginx/charts/templates/controller-deployment.yaml +++ packages/rke2-ingress-nginx/charts/templates/controller-deployment.yaml
@@ -64,7 +64,7 @@
{{- end }}
containers:
- name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }}
- image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
+ image: {{ template "system_default_registry" . }}{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
{{- if .Values.controller.lifecycle }}
lifecycle:
@@ -81,16 +81,16 @@ @@ -81,16 +81,16 @@
- --default-backend-service={{ .Values.controller.defaultBackendService }} - --default-backend-service={{ .Values.controller.defaultBackendService }}
{{- end }} {{- end }}