Merge 28cc719b7b into fc0d58ff48

roles/network_plugin/cilium/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/network_plugin/flannel/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/network_plugin/kube-router/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/network_plugin/macvlan/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/network_plugin/multus/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/network_plugin/weave/meta/main.yml

@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: network_plugin/cni
+    when: not from_reset | default(true)

roles/reset/tasks/main.yml

@@ -384,6 +384,8 @@
   include_role:
     name: "network_plugin/{{ kube_network_plugin }}"
     tasks_from: reset
+  vars:
+    from_reset: true
   when:
     - kube_network_plugin in ['flannel', 'cilium', 'kube-router', 'calico']
   tags: