From b39c3b91269a8482207863234acc298f623deae6 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 20 Jun 2020 05:20:46 +0200
Subject: kubernetes: add node pruning role

---
 common/kubernetes-cluster-cleanup.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'common/kubernetes-cluster-cleanup.yml')

diff --git a/common/kubernetes-cluster-cleanup.yml b/common/kubernetes-cluster-cleanup.yml
index 7c10d17c..5647e3d6 100644
--- a/common/kubernetes-cluster-cleanup.yml
+++ b/common/kubernetes-cluster-cleanup.yml
@@ -13,28 +13,19 @@
     add_host:
       name: "{{ item }}"
       inventory_dir: "{{ hostvars[item].inventory_dir }}"
-      group: _kubernetes_nodes_remove_
+      group: _kubernetes_nodes_prune_
     changed_when: False
 
   - name: drain superflous nodes
-    loop: "{{ groups['_kubernetes_nodes_remove_'] | default([]) }}"
+    loop: "{{ groups['_kubernetes_nodes_prune_'] | default([]) }}"
     command: "kubectl drain {{ item }} --delete-local-data --force --ignore-daemonsets"
 
-
-- name: remove nodes from api server
-  hosts: _kubernetes_primary_master_
-  tasks:
-  - name: remove superflous nodes
-    loop: "{{ groups['_kubernetes_nodes_remove_'] | default([]) }}"
-    command: "kubectl delete node {{ item }}"
-
-- name: cleanup kubeguard connections
+- name: prune superflous nodes from cluster
   hosts: _kubernetes_nodes_
   roles:
-  - role: kubernetes/net/kubeguard/cleanup
-    when: hostvars[groups['_kubernetes_primary_master_'][0]].kubernetes_network_plugin == 'kubeguard'
+  - role: kubernetes/kubeadm/prune
 
-- name: try to clean superflous nodes
-  hosts: _kubernetes_nodes_remove_
+- name: wipe superflous nodes
+  hosts: _kubernetes_nodes_prune_
   roles:
   - role: kubernetes/kubeadm/reset
-- 
cgit v1.2.3