summaryrefslogtreecommitdiff
path: root/common/kubernetes-cleanup.yml
diff options
context:
space:
mode:
Diffstat (limited to 'common/kubernetes-cleanup.yml')
-rw-r--r--common/kubernetes-cleanup.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/common/kubernetes-cleanup.yml b/common/kubernetes-cleanup.yml
index a320e0f8..be55d11e 100644
--- a/common/kubernetes-cleanup.yml
+++ b/common/kubernetes-cleanup.yml
@@ -1,7 +1,4 @@
---
-- import_playbook: kubernetes-cluster-layout.yml
-
-########
- name: check for nodes to be removed
hosts: _kubernetes_primary_master_
tasks:
@@ -15,7 +12,7 @@
loop: "{{ kubectl_node_list.stdout_lines | map('replace', 'node/', '') | list | difference(groups['_kubernetes_nodes_']) }}"
add_host:
name: "{{ item }}"
- inventory_dir: "{{ inventory_dir }}"
+ inventory_dir: "{{ hostvars[item].inventory_dir }}"
group: _kubernetes_nodes_remove_
changed_when: False
@@ -28,7 +25,7 @@
roles:
- role: kubernetes/kubeadm/reset
- role: kubernetes/net/kubeguard
- when: kubernetes_network_plugin == 'kubeguard'
+ when: hostvars[groups['_kubernetes_primary_master_'][0]].kubernetes_network_plugin == 'kubeguard'
vars:
kubeguard_action: remove