C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* reset calico after install

* remove extra line
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

19
roles/network_plugin/calico/handlers/main.yml
View file

@ -1,15 +1,14 @@
--- ---
- name: restart calico-node - name: reset_calico_cni
command: /bin/true command: /bin/true
notify: 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

2
roles/network_plugin/calico/tasks/install.yml
View file

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