From 2d6e31d281800af2e25c6442f610794056b095ca Mon Sep 17 00:00:00 2001
From: Bort Verwilst <bart@intux.be>
Date: Tue, 18 Dec 2018 14:29:58 +0100
Subject: [PATCH] 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)
---
 .../kubernetes/preinstall/tasks/0020-verify-settings.yml  | 2 +-
 roles/reset/tasks/main.yml                                | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
index 881f850df..40d8ff88e 100644
--- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -109,7 +109,7 @@
 - name: Stop if RBAC and anonymous-auth are not enabled when insecure port is disabled
   assert:
     that: rbac_enabled and kube_api_anonymous_auth
-  when: kube_apiserver_insecure_port == 0
+  when: kube_apiserver_insecure_port == 0 and inventory_hostname in groups['kube-master']
   ignore_errors: "{{ ignore_assert_errors }}"
 
 - name: Stop if kernel version is too low
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index ca54c51c4..e3a586a7a 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -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: