From 406fbdb4e7615f86c1e029a73409e2b802fb3e82 Mon Sep 17 00:00:00 2001 From: ERIK Date: Wed, 28 Dec 2022 16:55:27 +0800 Subject: [PATCH] Update the tag of the flannel image (#9528) Signed-off-by: bo.jiang Signed-off-by: bo.jiang --- README.md | 2 +- roles/download/defaults/main.yml | 8 ++++---- roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9d8691e59..0c1cd5d53 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ Note: Upstart/SysV init based OS types are not supported. - [calico](https://github.com/projectcalico/calico) v3.24.5 - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [cilium](https://github.com/cilium/cilium) v1.12.1 - - [flannel](https://github.com/flannel-io/flannel) v0.19.2 + - [flannel](https://github.com/flannel-io/flannel) v0.20.1 - [kube-ovn](https://github.com/alauda/kube-ovn) v1.10.7 - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.5.1 - [multus](https://github.com/intel/multus-cni) v3.8 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 3075abedc..46023bae3 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -110,8 +110,8 @@ calico_apiserver_version: "{{ calico_version }}" typha_enabled: false calico_apiserver_enabled: false -flannel_version: "v0.19.2" -flannel_cni_version: "v1.1.0" +flannel_version: "v0.20.1" +flannel_cni_version: "v1.2.0" cni_version: "v1.1.1" weave_version: 2.8.1 pod_infra_version: "3.7" @@ -994,9 +994,9 @@ kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy" etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd" etcd_image_tag: "{{ etcd_version }}" flannel_image_repo: "{{ docker_image_repo }}/flannelcni/flannel" -flannel_image_tag: "{{ flannel_version }}-{{ image_arch }}" +flannel_image_tag: "{{ flannel_version }}" flannel_init_image_repo: "{{ docker_image_repo }}/flannelcni/flannel-cni-plugin" -flannel_init_image_tag: "{{ flannel_cni_version }}-{{ image_arch }}" +flannel_init_image_tag: "{{ flannel_cni_version }}" calico_node_image_repo: "{{ quay_image_repo }}/calico/node" calico_node_image_tag: "{{ calico_version }}" calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni" diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 index 607d22567..9c36d01ba 100644 --- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 +++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 @@ -72,7 +72,7 @@ spec: serviceAccountName: flannel containers: - name: kube-flannel - image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }} + image: {{ flannel_image_repo }}:{{ flannel_image_tag }} imagePullPolicy: {{ k8s_image_pull_policy }} resources: limits: @@ -119,7 +119,7 @@ spec: - {{ arch }} initContainers: - name: install-cni-plugin - image: {{ flannel_init_image_repo }}:{{ flannel_init_image_tag | regex_replace(image_arch,'') }}{{ arch }} + image: {{ flannel_init_image_repo }}:{{ flannel_init_image_tag }} command: - cp args: @@ -130,7 +130,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }} + image: {{ flannel_image_repo }}:{{ flannel_image_tag }} command: - cp args: