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:
parent
ccc3f89060
commit
06e1f81801
4 changed files with 7 additions and 6 deletions
|
@ -122,7 +122,7 @@ Supported Components
|
||||||
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
|
- [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
|
- [cert-manager](https://github.com/jetstack/cert-manager) v0.5.0
|
||||||
- [coredns](https://github.com/coredns/coredns) v1.2.2
|
- [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).
|
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).
|
||||||
|
|
||||||
|
|
|
@ -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_repo: "quay.io/external_storage/cephfs-provisioner"
|
||||||
cephfs_provisioner_image_tag: "v2.1.0-k8s1.11"
|
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_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
|
||||||
ingress_nginx_controller_image_tag: "0.19.0"
|
ingress_nginx_controller_image_tag: "0.20.0"
|
||||||
ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
|
ingress_nginx_default_backend_image_repo: "k8s.gcr.io/defaultbackend-amd64"
|
||||||
ingress_nginx_default_backend_image_tag: "1.4"
|
ingress_nginx_default_backend_image_tag: "1.5"
|
||||||
cert_manager_version: "v0.5.0"
|
cert_manager_version: "v0.5.0"
|
||||||
cert_manager_controller_image_repo: "quay.io/jetstack/cert-manager-controller"
|
cert_manager_controller_image_repo: "quay.io/jetstack/cert-manager-controller"
|
||||||
cert_manager_controller_image_tag: "{{ cert_manager_version }}"
|
cert_manager_controller_image_tag: "{{ cert_manager_version }}"
|
||||||
|
|
|
@ -18,8 +18,8 @@ spec:
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
annotations:
|
annotations:
|
||||||
prometheus.io/port: '10254'
|
prometheus.io/port: "10254"
|
||||||
prometheus.io/scrape: 'true'
|
prometheus.io/scrape: "true"
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: ingress-nginx
|
serviceAccountName: ingress-nginx
|
||||||
{% if ingress_nginx_host_network %}
|
{% if ingress_nginx_host_network %}
|
||||||
|
|
|
@ -13,3 +13,4 @@ spec:
|
||||||
targetPort: 8080
|
targetPort: 8080
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: default-backend
|
app.kubernetes.io/name: default-backend
|
||||||
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
|
Loading…
Reference in a new issue