epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 22:04:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update cni spec to 0.4.0 for network plugin allowing it (#6053)

Browse Source
This commit is contained in:
Florian Ruynat
2020-05-06 20:13:09 +02:00
committed by GitHub
parent f6be326feb
commit 965fe1db94
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/multus.md
View File

@@ -29,7 +29,7 @@ metadata:
name: macvlan-conf
spec:
config: '{
"cniVersion": "0.3.0",
"cniVersion": "0.4.0",
"type": "macvlan",
"master": "eth0",
"mode": "bridge",

2
roles/network_plugin/macvlan/templates/10-macvlan.conf.j2
View File

@@ -1,5 +1,5 @@
{
"cniVersion": "0.3.0",
"cniVersion": "0.4.0",
"name": "mynet",
"type": "macvlan",
"master": "{{ macvlan_interface }}",

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

@@ -6,5 +6,5 @@ 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 }}"
multus_cni_run_dir: "{{ ('/host', multus_cni_run_dir_host) | join }}"
multus_cni_version: "0.3.1"
multus_cni_version: "0.4.0"
multus_kubeconfig_file_host: "{{ (multus_cni_conf_dir_host, '/multus.d/multus.kubeconfig') | join }}"

4
tests/testcases/040_check-network-adv.yml
View File

@@ -63,7 +63,7 @@
- debug:
var: nca_pod.stdout_lines
failed_when: not nca_pod is success
run_once: true
when: inventory_hostname == groups['kube-master'][0]
- name: Get netchecker agents
uri:
@@ -170,7 +170,7 @@
name: macvlan-conf
spec:
config: '{
"cniVersion": "0.3.0",
"cniVersion": "0.4.0",
"type": "macvlan",
"master": "eth0",
"mode": "bridge",