From 7a66be82549fe7f1b11c1790e33e8bc4b6403f9f Mon Sep 17 00:00:00 2001
From: Emin AKTAS <eminaktas34@gmail.com>
Date: Tue, 20 Jun 2023 02:52:24 +0300
Subject: [PATCH] bump flannel version to v0.22.0 and flannel-cni-plugin
version to v1.1.2 (#10205)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This also changes flannel repository from flannelcni to flannel
Signed-off-by: Emin Aktaş <eminaktas34@gmail.com>
---
README.md | 2 +-
roles/download/defaults/main.yml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index c39f3b25e..cd14afe6a 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [cni-plugins](https://github.com/containernetworking/plugins) v1.2.0
- [calico](https://github.com/projectcalico/calico) v3.25.1
- [cilium](https://github.com/cilium/cilium) v1.13.3
- - [flannel](https://github.com/flannel-io/flannel) v0.21.4
+ - [flannel](https://github.com/flannel-io/flannel) v0.22.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.11.5
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.5.1
- [multus](https://github.com/k8snetworkplumbingwg/multus-cni) v3.8
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 063a98ddf..05be29ef3 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -113,8 +113,8 @@ calico_apiserver_version: "{{ calico_version }}"
typha_enabled: false
calico_apiserver_enabled: false
-flannel_version: "v0.21.4"
-flannel_cni_version: "v1.2.0"
+flannel_version: "v0.22.0"
+flannel_cni_version: "v1.1.2"
cni_version: "v1.3.0"
weave_version: 2.8.1
pod_infra_version: "3.9"
@@ -1009,7 +1009,7 @@ etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
etcd_image_tag: "{{ etcd_version }}"
flannel_image_repo: "{{ docker_image_repo }}/flannel/flannel"
flannel_image_tag: "{{ flannel_version }}"
-flannel_init_image_repo: "{{ docker_image_repo }}/flannelcni/flannel-cni-plugin"
+flannel_init_image_repo: "{{ docker_image_repo }}/flannel/flannel-cni-plugin"
flannel_init_image_tag: "{{ flannel_cni_version }}"
calico_node_image_repo: "{{ quay_image_repo }}/calico/node"
calico_node_image_tag: "{{ calico_version }}"
--
GitLab