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

* reset calico after install

* remove extra line
release-2.9
Xavi 2019-04-21 17:07:45 +02:00 committed by Kubernetes Prow Robot
parent a4e65c7ceb
commit fc1edbe79d
2 changed files with 11 additions and 10 deletions

View File

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

View File

@ -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: