From 69df60c776c1fd604db3e2d1b2c5a080ec1a0119 Mon Sep 17 00:00:00 2001 From: Amir Date: Fri, 17 Jul 2020 20:08:50 -0400 Subject: [PATCH] Update NGINX Controller image registry to .gcr.io (#23213) Signed-off-by: Amir Alavi Update app version to match docker image tag Signed-off-by: Amir Alavi Fix controller image for daemonset Signed-off-by: Amir Alavi --- stable/nginx-ingress/Chart.yaml | 4 ++-- stable/nginx-ingress/README.md | 3 ++- .../nginx-ingress/templates/controller-daemonset.yaml | 2 +- .../nginx-ingress/templates/controller-deployment.yaml | 2 +- stable/nginx-ingress/values.yaml | 10 ++++++++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 0061c8c6b4..e752547f11 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: nginx-ingress -version: 1.40.3 -appVersion: 0.32.0 +version: 1.41.0 +appVersion: v0.34.0 home: https://github.com/kubernetes/ingress-nginx description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index afefc880ad..0b3e2f4cb3 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -47,7 +47,8 @@ The following table lists the configurable parameters of the nginx-ingress chart Parameter | Description | Default --- | --- | --- `controller.name` | name of the controller component | `controller` -`controller.image.repository` | controller container image repository | `quay.io/kubernetes-ingress-controller/nginx-ingress-controller` +`controller.image.registry` | controller container image registry | `us.gcr.io` +`controller.image.repository` | controller container image repository | `k8s-artifacts-prod/ingress-nginx/controller` `controller.image.tag` | controller container image tag | `0.32.0` `controller.image.digest` | controller container image digest | `""` `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index c6249b2e7e..7918d2d1f4 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -61,7 +61,7 @@ spec: containers: - name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }} {{- with .Values.controller.image }} - image: "{{.repository}}{{- if (.digest) -}} @{{.digest}} {{- else -}} :{{ .tag }} {{- end -}}" + image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{.digest}}{{- else -}}:{{ .tag }} {{- end -}}" {{- end }} imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}" {{- if .Values.controller.lifecycle }} diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 51e2b070c1..76aa68e129 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -69,7 +69,7 @@ spec: containers: - name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }} {{- with .Values.controller.image }} - image: "{{.repository}}{{- if (.digest) -}} @{{.digest}} {{- else -}} :{{ .tag }} {{- end -}}" + image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{.digest}}{{- else -}}:{{ .tag }} {{- end -}}" {{- end }} imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}" {{- if .Values.controller.lifecycle }} diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml index bcf3cc8274..c274f4774c 100644 --- a/stable/nginx-ingress/values.yaml +++ b/stable/nginx-ingress/values.yaml @@ -4,8 +4,14 @@ controller: name: controller image: - repository: quay.io/kubernetes-ingress-controller/nginx-ingress-controller - tag: "0.32.0" + # registry value can be any of the following: + # us.gcr.io + # eu.gcr.io + # asia.gcr.io + registry: us.gcr.io + repository: k8s-artifacts-prod/ingress-nginx/controller + tag: "v0.34.0" + # digest: sha256:0e072dddd1f7f8fc8909a2ca6f65e76c5f0d2fcfb8be47935ae3457e8bbceb20 pullPolicy: IfNotPresent # www-data -> uid 101 runAsUser: 101