External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-16 00:17:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update multus version & crio conf (#6444)

Browse Source
This commit is contained in:
Florian Ruynat
2020-07-27 08:36:16 +02:00
committed by GitHub
parent d8a197ca51
commit c9f63e5016
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/download/defaults/main.yml
View File

@@ -82,7 +82,7 @@ contiv_version: 1.2.1
cilium_version: "v1.8.1"
kube_ovn_version: "v1.2.1"
kube_router_version: "v1.0.0"
multus_version: "v3.4.2"
multus_version: "v3.6"
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"

2
roles/network_plugin/multus/defaults/main.yml
View File

@@ -1,7 +1,7 @@
---
multus_conf_file: "auto"
multus_cni_conf_dir_host: "/etc/cni/net.d"
multus_cni_bin_dir_host: "{{ '/usr/libexec/cni' if container_manager == 'crio' else '/opt/cni/bin' }}"
multus_cni_bin_dir_host: "/opt/cni/bin"
multus_cni_run_dir_host: "/run"
multus_cni_conf_dir: "{{ ('/host', multus_cni_conf_dir_host) | join }}"
multus_cni_bin_dir: "{{ ('/host', multus_cni_bin_dir_host) | join }}"