Skip to content

Commit

Permalink
Update nginx ingress to 0.35.0 (kubernetes-sigs#6599)
Browse files Browse the repository at this point in the history
  • Loading branch information
floryut authored and LuckySB committed Jan 12, 2021
1 parent 19425a1 commit a50c890
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11
- [cert-manager](https://github.com/jetstack/cert-manager) v0.15.2
- [coredns](https://github.com/coredns/coredns) v1.6.7
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.34.1
- [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.35.0

Note: The list of validated [docker versions](https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker) is 1.13.1, 17.03, 17.06, 17.09, 18.06, 18.09 and 19.03. The recommended docker version is 19.03. 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).

Expand Down
7 changes: 3 additions & 4 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ kube_version: v1.18.8
kubeadm_version: "{{ kube_version }}"
etcd_version: v3.4.3

# gcr and kubernetes image repo define (gcr location might be 'asia', 'eu' or 'us')
gcr_location_default: "eu"
# gcr and kubernetes image repo define
gcr_image_repo: "gcr.io"
kube_image_repo: "k8s.gcr.io"

Expand Down Expand Up @@ -581,8 +580,8 @@ rbd_provisioner_image_repo: "{{ quay_image_repo }}/external_storage/rbd-provisio
rbd_provisioner_image_tag: "v2.1.1-k8s1.11"
local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner"
local_path_provisioner_image_tag: "v0.0.14"
ingress_nginx_controller_image_repo: "{{ gcr_location_default }}.{{ gcr_image_repo }}/k8s-artifacts-prod/ingress-nginx/controller"
ingress_nginx_controller_image_tag: "v0.34.1"
ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller"
ingress_nginx_controller_image_tag: "v0.35.0"
ingress_ambassador_image_repo: "{{ quay_image_repo }}/datawire/ambassador-operator"
ingress_ambassador_image_tag: "v1.2.8"
alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller"
Expand Down

0 comments on commit a50c890

Please sign in to comment.