C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the tag of the flannel image

Browse source 
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
This commit is contained in:
bo.jiang 2022-11-29 22:30:45 +08:00
parent 67c4f2d95e
commit 522f84d396
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -149,7 +149,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [calico](https://github.com/projectcalico/calico) v3.23.3 - [calico](https://github.com/projectcalico/calico) v3.23.3
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- [cilium](https://github.com/cilium/cilium) v1.12.1 - [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-ovn](https://github.com/alauda/kube-ovn) v1.10.7
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.5.1 - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.5.1
- [multus](https://github.com/intel/multus-cni) v3.8 - [multus](https://github.com/intel/multus-cni) v3.8

8
roles/download/defaults/main.yml
View file

@ -110,8 +110,8 @@ calico_apiserver_version: "{{ calico_version }}"
typha_enabled: false typha_enabled: false
calico_apiserver_enabled: false calico_apiserver_enabled: false
flannel_version: "v0.19.2" flannel_version: "v0.20.1"
flannel_cni_version: "v1.1.0" flannel_cni_version: "v1.2.0"
cni_version: "v1.1.1" cni_version: "v1.1.1"
weave_version: 2.8.1 weave_version: 2.8.1
pod_infra_version: "3.7" pod_infra_version: "3.7"
@ -945,9 +945,9 @@ kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy"
etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd" etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
etcd_image_tag: "{{ etcd_version }}" etcd_image_tag: "{{ etcd_version }}"
flannel_image_repo: "{{ docker_image_repo }}/flannelcni/flannel" 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_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_repo: "{{ quay_image_repo }}/calico/node"
calico_node_image_tag: "{{ calico_version }}" calico_node_image_tag: "{{ calico_version }}"
calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni" calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni"

6
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View file

@ -67,7 +67,7 @@ spec:
serviceAccountName: flannel serviceAccountName: flannel
containers: containers:
- name: kube-flannel - 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 }} imagePullPolicy: {{ k8s_image_pull_policy }}
resources: resources:
limits: limits:
@ -114,7 +114,7 @@ spec:
- {{ arch }} - {{ arch }}
initContainers: initContainers:
- name: install-cni-plugin - 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: command:
- cp - cp
args: args:
@ -125,7 +125,7 @@ spec:
- name: cni-plugin - name: cni-plugin
mountPath: /opt/cni/bin mountPath: /opt/cni/bin
- name: install-cni - name: install-cni
image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }} image: {{ flannel_image_repo }}:{{ flannel_image_tag }}
command: command:
- cp - cp
args: args: