epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-10 04:08:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update flannel use install-cni-plugin to fit upstream (#8714)

Browse Source 
* Update flannel use install-cni-plugin to fit upstream

* Replace flannel cni repo

* Remove download flannel binary
This commit is contained in:
zhengtianbao
2022-04-19 00:44:41 +08:00
committed by GitHub
parent 3261d26181
commit 937e64d296
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View File

@@ -108,6 +108,17 @@ spec:
values:
- {{ arch }}
initContainers:
- name: install-cni-plugin
image: {{ flannel_init_image_repo }}:{{ flannel_init_image_tag }}
command:
- cp
args:
- -f
- /flannel
- /opt/cni/bin/flannel
volumeMounts:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }}
command:
@@ -135,7 +146,7 @@ spec:
- name: flannel-cfg
configMap:
name: kube-flannel-cfg
- name: host-cni-bin
- name: cni-plugin
hostPath:
path: /opt/cni/bin
updateStrategy: