Fix calico v3.4.0 scale and upgrade (#4531)

* reset calico after install

* remove extra line

roles/network_plugin/calico/handlers/main.yml

@@ -1,15 +1,14 @@
 ---
-- name: restart calico-node
+- name: reset_calico_cni
   command: /bin/true
   notify:
-    - Calico | reload systemd
+    - delete 10-calico.conflist
-    - Calico | reload calico-node
+    - delete calico-node containers
 
-- name: Calico | reload systemd
+- name: delete 10-calico.conflist
-  shell: systemctl daemon-reload
+  file:
+    path: /etc/calico/10-calico.conflist
+    state: absent
 
-- name: Calico | reload calico-node
+- name: delete calico-node containers
-  service:
+  shell: "docker ps -af name=k8s_POD_calico-node* -q | xargs --no-run-if-empty docker rm -f"
-    name: calico-node
-    state: restarted
-    sleep: 10

roles/network_plugin/calico/tasks/install.yml

@@ -4,6 +4,8 @@
     src: "cni-calico.conflist.j2"
     dest: "/etc/cni/net.d/{% if calico_version is version('v3.3.0', '>=') %}calico.conflist.template{% else %}10-calico.conflist{% endif %}"
     owner: kube
+  register: calico_conflist
+  notify: reset_calico_cni
 
 - name: Calico | Create calico certs directory
   file: