Browse Source
Update cni spec to 0.4.0 for network plugin allowing it (#6053)
pull/6101/head
Florian Ruynat
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
5 deletions
-
docs/multus.md
-
roles/network_plugin/macvlan/templates/10-macvlan.conf.j2
-
roles/network_plugin/multus/defaults/main.yml
-
tests/testcases/040_check-network-adv.yml
|
|
|
@ -29,7 +29,7 @@ metadata: |
|
|
|
name: macvlan-conf |
|
|
|
spec: |
|
|
|
config: '{ |
|
|
|
"cniVersion": "0.3.0", |
|
|
|
"cniVersion": "0.4.0", |
|
|
|
"type": "macvlan", |
|
|
|
"master": "eth0", |
|
|
|
"mode": "bridge", |
|
|
|
|
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
{ |
|
|
|
"cniVersion": "0.3.0", |
|
|
|
"cniVersion": "0.4.0", |
|
|
|
"name": "mynet", |
|
|
|
"type": "macvlan", |
|
|
|
"master": "{{ macvlan_interface }}", |
|
|
|
|
|
|
|
@ -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 }}" |
|
|
|
@ -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", |
|
|
|
|
