From 26a0b0f1e8162571a90a0749c82157655e8aa728 Mon Sep 17 00:00:00 2001
From: bilalcaliskan <bilalcaliskan@protonmail.com>
Date: Mon, 2 May 2022 21:29:14 +0300
Subject: [PATCH] chore(flannel): change flannel repository and upgrade image
version (#8740)
* chore: change flannel repository and upgrade image version
* docs: upgrade flanneld version
---
README.md | 2 +-
roles/download/defaults/main.yml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index b6da3073e..9daa33e13 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 55075ece2..0a7d5b3eb 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"
--
GitLab