Browse Source

Update the tag of the flannel image (#9528)

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pull/9624/head
ERIK 1 year ago
committed by GitHub
parent
commit
406fbdb4e7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
  1. 2
      README.md
  2. 8
      roles/download/defaults/main.yml
  3. 6
      roles/network_plugin/flannel/templates/cni-flannel.yml.j2

2
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

8
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"

6
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:

Loading…
Cancel
Save