diff --git a/README.md b/README.md index b6da3073eb03f00c4d4fef2ea57b8e2ebfdeaed8..9daa33e135aefe80de6953b74e653162ba85a077 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Note: Upstart/SysV init based OS types are not supported. - [calico](https://github.com/projectcalico/calico) v3.21.4 - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [cilium](https://github.com/cilium/cilium) v1.11.1 - - [flanneld](https://github.com/flannel-io/flannel) v0.15.1 + - [flanneld](https://github.com/flannel-io/flannel) v0.17.0 - [kube-ovn](https://github.com/alauda/kube-ovn) v1.8.1 - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.4.0 - [multus](https://github.com/intel/multus-cni) v3.8 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 55075ece21b93c2cc8470efd27374f9d3c6548cd..0a7d5b3ebee4eb9e386922bfe6d429d701401041 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -105,8 +105,8 @@ calico_apiserver_version: "{{ calico_version }}" typha_enabled: false calico_apiserver_enabled: false -flannel_version: "v0.15.1" -flannel_cni_version: "v1.0.0" +flannel_version: "v0.17.0" +flannel_cni_version: "v1.0.1" cni_version: "v1.0.1" weave_version: 2.8.1 pod_infra_version: "3.3" @@ -855,10 +855,10 @@ containerd_archive_checksum: "{{ containerd_archive_checksums[image_arch][contai kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy" etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd" etcd_image_tag: "{{ etcd_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" -flannel_image_repo: "{{ quay_image_repo }}/coreos/flannel" +flannel_image_repo: "{{ docker_image_repo }}/flannelcni/flannel" flannel_image_tag: "{{ flannel_version }}-{{ image_arch }}" flannel_init_image_repo: "{{ docker_image_repo }}/flannelcni/flannel-cni-plugin" -flannel_init_image_tag: "{{ flannel_cni_version }}" +flannel_init_image_tag: "{{ flannel_cni_version }}-{{ image_arch }}" calico_node_image_repo: "{{ quay_image_repo }}/calico/node" calico_node_image_tag: "{{ calico_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni"