C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -129,7 +129,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [flanneld](https://github.com/coreos/flannel) v0.12.0 - [flanneld](https://github.com/coreos/flannel) v0.12.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1 - [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.0 - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.0
- [multus](https://github.com/intel/multus-cni) v3.4.2 - [multus](https://github.com/intel/multus-cni) v3.6.0
- [weave](https://github.com/weaveworks/weave) v2.6.5 - [weave](https://github.com/weaveworks/weave) v2.6.5
- Application - Application
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11 - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11

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

@ -82,7 +82,7 @@ contiv_version: 1.2.1
cilium_version: "v1.8.1" cilium_version: "v1.8.1"
kube_ovn_version: "v1.2.1" kube_ovn_version: "v1.2.1"
kube_router_version: "v1.0.0" 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) # 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') }}" 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_conf_file: "auto"
multus_cni_conf_dir_host: "/etc/cni/net.d" 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_run_dir_host: "/run"
multus_cni_conf_dir: "{{ ('/host', multus_cni_conf_dir_host) | join }}" multus_cni_conf_dir: "{{ ('/host', multus_cni_conf_dir_host) | join }}"
multus_cni_bin_dir: "{{ ('/host', multus_cni_bin_dir_host) | join }}" multus_cni_bin_dir: "{{ ('/host', multus_cni_bin_dir_host) | join }}"