From 965fe1db94b482fc33a34b0599a212908de30a09 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Wed, 6 May 2020 20:13:09 +0200
Subject: [PATCH] Update cni spec to 0.4.0 for network plugin allowing it
 (#6053)

---
 docs/multus.md                                            | 2 +-
 roles/network_plugin/macvlan/templates/10-macvlan.conf.j2 | 2 +-
 roles/network_plugin/multus/defaults/main.yml             | 2 +-
 tests/testcases/040_check-network-adv.yml                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/multus.md b/docs/multus.md
index 9ccdedbac..fd3623d83 100644
--- a/docs/multus.md
+++ b/docs/multus.md
@@ -29,7 +29,7 @@ metadata:
   name: macvlan-conf
 spec:
   config: '{
-      "cniVersion": "0.3.0",
+      "cniVersion": "0.4.0",
       "type": "macvlan",
       "master": "eth0",
       "mode": "bridge",
diff --git a/roles/network_plugin/macvlan/templates/10-macvlan.conf.j2 b/roles/network_plugin/macvlan/templates/10-macvlan.conf.j2
index 6a3874783..10598a20a 100644
--- a/roles/network_plugin/macvlan/templates/10-macvlan.conf.j2
+++ b/roles/network_plugin/macvlan/templates/10-macvlan.conf.j2
@@ -1,5 +1,5 @@
 {
-  "cniVersion": "0.3.0",
+  "cniVersion": "0.4.0",
   "name": "mynet",
   "type": "macvlan",
   "master": "{{ macvlan_interface }}",
diff --git a/roles/network_plugin/multus/defaults/main.yml b/roles/network_plugin/multus/defaults/main.yml
index 6c32cfa57..768efbf8d 100644
--- a/roles/network_plugin/multus/defaults/main.yml
+++ b/roles/network_plugin/multus/defaults/main.yml
@@ -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 }}"
diff --git a/tests/testcases/040_check-network-adv.yml b/tests/testcases/040_check-network-adv.yml
index 07e5a1bab..91bfdac7f 100644
--- a/tests/testcases/040_check-network-adv.yml
+++ b/tests/testcases/040_check-network-adv.yml
@@ -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",