C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats 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 name: macvlan-conf
spec: spec:
config: '{ config: '{
"cniVersion": "0.3.0", "cniVersion": "0.4.0",
"type": "macvlan", "type": "macvlan",
"master": "eth0", "master": "eth0",
"mode": "bridge", "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", "name": "mynet",
"type": "macvlan", "type": "macvlan",
"master": "{{ macvlan_interface }}", "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_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 }}"
multus_cni_run_dir: "{{ ('/host', multus_cni_run_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 }}" 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: - debug:
var: nca_pod.stdout_lines var: nca_pod.stdout_lines
failed_when: not nca_pod is success failed_when: not nca_pod is success
run_once: true when: inventory_hostname == groups['kube-master'][0]
- name: Get netchecker agents - name: Get netchecker agents
uri: uri:
@ -170,7 +170,7 @@
name: macvlan-conf name: macvlan-conf
spec: spec:
config: '{ config: '{
"cniVersion": "0.3.0", "cniVersion": "0.4.0",
"type": "macvlan", "type": "macvlan",
"master": "eth0", "master": "eth0",
"mode": "bridge", "mode": "bridge",