From 09291bbdd210be67a8d6bcae379906c5770965c0 Mon Sep 17 00:00:00 2001
From: Ader Fu <ader.ydfu@gmail.com>
Date: Wed, 27 Jul 2022 01:51:09 +0800
Subject: [PATCH] Use a variable for roles of remove-node/post-remove (#9096)
Signed-off-by: ydFu <ader.ydfu@gmail.com>
---
roles/remove-node/post-remove/defaults/main.yml | 3 +++
roles/remove-node/post-remove/tasks/main.yml | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 roles/remove-node/post-remove/defaults/main.yml
diff --git a/roles/remove-node/post-remove/defaults/main.yml b/roles/remove-node/post-remove/defaults/main.yml
new file mode 100644
index 000000000..11298b973
--- /dev/null
+++ b/roles/remove-node/post-remove/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+delete_node_retries: 10
+delete_node_delay_seconds: 3
diff --git a/roles/remove-node/post-remove/tasks/main.yml b/roles/remove-node/post-remove/tasks/main.yml
index 31dd462f4..d1d0535c0 100644
--- a/roles/remove-node/post-remove/tasks/main.yml
+++ b/roles/remove-node/post-remove/tasks/main.yml
@@ -1,10 +1,10 @@
---
-- name: Delete node
+- name: remove-node | Delete node
command: "{{ kubectl }} delete node {{ kube_override_hostname|default(inventory_hostname) }}"
delegate_to: "{{ groups['kube_control_plane']|first }}"
when: inventory_hostname in groups['k8s_cluster']
- retries: 10
+ retries: "{{ delete_node_retries }}"
# Sometimes the api-server can have a short window of indisponibility when we delete a master node
- delay: 3
+ delay: "{{ delete_node_delay_seconds }}"
register: result
until: result is not failed
--
GitLab