From e361def9cdd04014af3a178cc02eff3cbcec7931 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 12 May 2025 22:19:50 +0200
Subject: [PATCH 1/2] Rename remove-node/pre-remove (no hypens for role in
 collection)

---
 playbooks/remove_node.yml                                   | 2 +-
 .../validate-container-engine/tasks/main.yml                | 6 +++---
 .../pre-remove => remove_node/pre_remove}/defaults/main.yml | 0
 .../pre-remove => remove_node/pre_remove}/tasks/main.yml    | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename roles/{remove-node/pre-remove => remove_node/pre_remove}/defaults/main.yml (100%)
 rename roles/{remove-node/pre-remove => remove_node/pre_remove}/tasks/main.yml (100%)

diff --git a/playbooks/remove_node.yml b/playbooks/remove_node.yml
index f4a3a1613..7cd53a8a5 100644
--- a/playbooks/remove_node.yml
+++ b/playbooks/remove_node.yml
@@ -43,7 +43,7 @@
       when: reset_nodes | default(True) | bool
   roles:
     - { role: kubespray_defaults, when: reset_nodes | default(True) | bool }
-    - { role: remove-node/pre-remove, tags: pre-remove }
+    - { role: remove_node/pre_remove, tags: pre-remove }
     - role: remove-node/remove-etcd-node
       when: "'etcd' in group_names"
     - { role: reset, tags: reset, when: reset_nodes | default(True) | bool }
diff --git a/roles/container-engine/validate-container-engine/tasks/main.yml b/roles/container-engine/validate-container-engine/tasks/main.yml
index ffb541c24..c1e9d45f8 100644
--- a/roles/container-engine/validate-container-engine/tasks/main.yml
+++ b/roles/container-engine/validate-container-engine/tasks/main.yml
@@ -84,7 +84,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
@@ -111,7 +111,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
@@ -137,7 +137,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
diff --git a/roles/remove-node/pre-remove/defaults/main.yml b/roles/remove_node/pre_remove/defaults/main.yml
similarity index 100%
rename from roles/remove-node/pre-remove/defaults/main.yml
rename to roles/remove_node/pre_remove/defaults/main.yml
diff --git a/roles/remove-node/pre-remove/tasks/main.yml b/roles/remove_node/pre_remove/tasks/main.yml
similarity index 100%
rename from roles/remove-node/pre-remove/tasks/main.yml
rename to roles/remove_node/pre_remove/tasks/main.yml

From 2a1ae14275610da40a09b85fd7d33890cdc403ef Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 12 May 2025 22:22:20 +0200
Subject: [PATCH 2/2] Compat layer remove-node/pre-remove

---
 roles/remove-node/pre-remove/tasks/main.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 roles/remove-node/pre-remove/tasks/main.yml

diff --git a/roles/remove-node/pre-remove/tasks/main.yml b/roles/remove-node/pre-remove/tasks/main.yml
new file mode 100644
index 000000000..94d0ab205
--- /dev/null
+++ b/roles/remove-node/pre-remove/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Warn for usage of deprecated role
+  fail:
+    msg: remove-node/pre-remove is deprecated, switch to remove_node/pre_remove
+  ignore_errors: true # noqa ignore-errors
+  run_once: true
+
+- name: Compat for direct role import
+  import_role:
+    name: remove_node/pre_remove