ingress-nginx: Upgrade to 0.20.0 (#3565)

Upstream Changes:

-   ingress-nginx 0.20.0 (https://github.com/kubernetes/ingress-nginx/releases/tag/nginx-0.20.0)

Our Changes:

-   Sync templates with upstream changes
This commit is contained in:
Wong Hoi Sing Edison
2018-10-23 20:08:04 +08:00
committed by k8s-ci-robot
parent ccc3f89060
commit 06e1f81801
4 changed files with 7 additions and 6 deletions

View File

@@ -202,9 +202,9 @@ local_volume_provisioner_image_tag: "v2.1.0"
cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner"
cephfs_provisioner_image_tag: "v2.1.0-k8s1.11"
ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
ingress_nginx_controller_image_tag: "0.19.0"
ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
ingress_nginx_default_backend_image_tag: "1.4"
ingress_nginx_controller_image_tag: "0.20.0"
ingress_nginx_default_backend_image_repo: "k8s.gcr.io/defaultbackend-amd64"
ingress_nginx_default_backend_image_tag: "1.5"
cert_manager_version: "v0.5.0"
cert_manager_controller_image_repo: "quay.io/jetstack/cert-manager-controller"
cert_manager_controller_image_tag: "{{ cert_manager_version }}"

View File

@@ -18,8 +18,8 @@ spec:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
annotations:
prometheus.io/port: '10254'
prometheus.io/scrape: 'true'
prometheus.io/port: "10254"
prometheus.io/scrape: "true"
spec:
serviceAccountName: ingress-nginx
{% if ingress_nginx_host_network %}

View File

@@ -13,3 +13,4 @@ spec:
targetPort: 8080
selector:
app.kubernetes.io/name: default-backend
app.kubernetes.io/part-of: ingress-nginx