github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update NGINX Controller image registry to .gcr.io (#23213)

Browse Source 
Signed-off-by: Amir Alavi <amiralavi7@gmail.com>

Update app version to match docker image tag

Signed-off-by: Amir Alavi <amiralavi7@gmail.com>

Fix controller image for daemonset

Signed-off-by: Amir Alavi <amiralavi7@gmail.com>
This commit is contained in:
Amir
2020-07-17 17:08:50 -07:00
committed by GitHub
parent f5859f8c29
commit 69df60c776
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/nginx-ingress/Chart.yaml
+2 -2
View File
@@ -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
stable/nginx-ingress/README.md
+2 -1
View File
@@ -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`
stable/nginx-ingress/templates/controller-daemonset.yaml
+1 -1
View File
@@ -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 }}
stable/nginx-ingress/templates/controller-deployment.yaml
+1 -1
View File
@@ -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 }}
stable/nginx-ingress/values.yaml
+8 -2
View File
@@ -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