From 06e1f8180102649d14f4ebac045bd696548eb043 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Tue, 23 Oct 2018 20:08:04 +0800 Subject: [PATCH] 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 --- README.md | 2 +- roles/download/defaults/main.yml | 6 +++--- .../templates/ds-ingress-nginx-controller.yml.j2 | 4 ++-- .../ingress_nginx/templates/svc-default-backend.yml.j2 | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 12c5261e3..e20b3bc14 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Supported Components - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11 - [cert-manager](https://github.com/jetstack/cert-manager) v0.5.0 - [coredns](https://github.com/coredns/coredns) v1.2.2 - - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.19.0 + - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.20.0 Note: The list of validated [docker versions](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.12.md) was updated to 1.11.1, 1.12.1, 1.13.1, 17.03, 17.06, 17.09, 18.06. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin). diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 6d81c9109..e83cee1ef 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -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 }}" diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 index 6de89c15a..4f075804f 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 @@ -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 %} diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 index 8d4ad5991..9c95e8701 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2 @@ -13,3 +13,4 @@ spec: targetPort: 8080 selector: app.kubernetes.io/name: default-backend + app.kubernetes.io/part-of: ingress-nginx