Backport of fixes to release-2.8 for 2.8.1? (#3897)

* Fix assertion for alone etcd nodes (#3847)

* Fix error with ipvs on cluster reset task (#3848)

* Reset: Check for kube-ipvs0 presence before remove it (#3816)
This commit is contained in:
Bort Verwilst
2018-12-18 14:29:58 +01:00
committed by Kubernetes Prow Robot
parent 0a19d1bf01
commit 2d6e31d281
2 changed files with 8 additions and 2 deletions

View File

@@ -110,12 +110,18 @@
- name: Clear IPVS virtual server table
shell: "ipvsadm -C"
when:
- kube_proxy_mode == 'ipvs'
- kube_proxy_mode == 'ipvs' and inventory_hostname in groups['k8s-cluster']
- name: reset | check kube-ipvs0 network device
stat:
path: /sys/class/net/kube-ipvs0
register: kube_ipvs0
- name: reset | Remove kube-ipvs0
command: "ip link del kube-ipvs0"
when:
- kube_proxy_mode == 'ipvs'
- kube_ipvs0.stat.exists
- name: reset | delete some files and directories
file: