actualized for kubespray version 2.28.0

kubespray/project/roles/remove-node/post-remove/tasks/main.yml

@@ -5,9 +5,9 @@
   when:
     - groups['kube_control_plane'] | length > 0
     # ignore servers that are not nodes
-    - inventory_hostname in groups['k8s_cluster'] and kube_override_hostname | default(inventory_hostname) in nodes.stdout_lines
+    - ('k8s_cluster' in group_names) and kube_override_hostname | default(inventory_hostname) in nodes.stdout_lines
   retries: "{{ delete_node_retries }}"
-  # Sometimes the api-server can have a short window of indisponibility when we delete a master node
+  # Sometimes the api-server can have a short window of indisponibility when we delete a control plane node
   delay: "{{ delete_node_delay_seconds }}"
   register: result
   until: result is not failed

kubespray/project/roles/remove-node/pre-remove/defaults/main.yml

@@ -1,6 +0,0 @@
----
-allow_ungraceful_removal: false
-drain_grace_period: 300
-drain_timeout: 360s
-drain_retries: 3
-drain_retry_delay_seconds: 10

kubespray/project/roles/remove-node/pre-remove/tasks/main.yml

@@ -1,43 +1,10 @@
 ---
-- name: Remove-node | List nodes
-  command: >-
-    {{ kubectl }} get nodes -o go-template={% raw %}'{{ range .items }}{{ .metadata.name }}{{ "\n" }}{{ end }}'{% endraw %}
-  register: nodes
-  when:
-    - groups['kube_control_plane'] | length > 0
-  delegate_to: "{{ groups['kube_control_plane'] | first }}"
-  changed_when: false
+- 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: Remove-node | Drain node except daemonsets resource
-  command: >-
-    {{ kubectl }} drain
-      --force
-      --ignore-daemonsets
-      --grace-period {{ drain_grace_period }}
-      --timeout {{ drain_timeout }}
-      --delete-emptydir-data {{ kube_override_hostname | default(inventory_hostname) }}
-  when:
-    - groups['kube_control_plane'] | length > 0
-    # ignore servers that are not nodes
-    - kube_override_hostname | default(inventory_hostname) in nodes.stdout_lines
-  register: result
-  failed_when: result.rc != 0 and not allow_ungraceful_removal
-  delegate_to: "{{ groups['kube_control_plane'] | first }}"
-  until: result.rc == 0 or allow_ungraceful_removal
-  retries: "{{ drain_retries }}"
-  delay: "{{ drain_retry_delay_seconds }}"
-
-- name: Remove-node | Wait until Volumes will be detached from the node
-  command: >-
-    {{ kubectl }} get volumeattachments -o go-template={% raw %}'{{ range .items }}{{ .spec.nodeName }}{{ "\n" }}{{ end }}'{% endraw %}
-  register: nodes_with_volumes
-  delegate_to: "{{ groups['kube_control_plane'] | first }}"
-  changed_when: false
-  until: not (kube_override_hostname | default(inventory_hostname) in nodes_with_volumes.stdout_lines)
-  retries: 3
-  delay: "{{ drain_grace_period }}"
-  when:
-    - groups['kube_control_plane'] | length > 0
-    - not allow_ungraceful_removal
-    - kube_override_hostname | default(inventory_hostname) in nodes.stdout_lines
+- name: Compat for direct role import
+  import_role:
+    name: remove_node/pre_remove

kubespray/project/roles/remove-node/remove-etcd-node/tasks/main.yml

@@ -2,50 +2,14 @@
 - name: Lookup node IP in kubernetes
   command: >
     {{ kubectl }} get nodes {{ node }}
-    -o jsonpath='{range .status.addresses[?(@.type=="InternalIP")]}{@.address}{"\n"}{end}'
-  register: remove_node_ip
-  when:
-    - groups['kube_control_plane'] | length > 0
-    - inventory_hostname in groups['etcd']
-    - ip is not defined
-    - access_ip is not defined
-  delegate_to: "{{ groups['etcd'] | first }}"
-  failed_when: false
-
-- name: Set node IP
-  set_fact:
-    node_ip: "{{ ip | default(access_ip | default(remove_node_ip.stdout)) | trim }}"
-  when:
-    - inventory_hostname in groups['etcd']
-
-- name: Make sure node_ip is set
-  assert:
-    that: node_ip is defined and node_ip | length > 0
-    msg: "Etcd node ip is not set !"
-  when:
-    - inventory_hostname in groups['etcd']
-
-- name: Lookup etcd member id
-  shell: "set -o pipefail && {{ bin_dir }}/etcdctl member list | grep -w {{ node_ip }} | cut -d, -f1"
-  args:
-    executable: /bin/bash
-  register: etcd_member_id
-  ignore_errors: true  # noqa ignore-errors
+    -o jsonpath-as-json='{.status.addresses[?(@.type=="InternalIP")].address}'
+  register: k8s_node_ips
   changed_when: false
-  check_mode: false
-  tags:
-    - facts
-  environment:
-    ETCDCTL_API: "3"
-    ETCDCTL_CERT: "{{ kube_cert_dir + '/etcd/server.crt' if etcd_deployment_type == 'kubeadm' else etcd_cert_dir + '/admin-' + groups['etcd'] | first + '.pem' }}"
-    ETCDCTL_KEY: "{{ kube_cert_dir + '/etcd/server.key' if etcd_deployment_type == 'kubeadm' else etcd_cert_dir + '/admin-' + groups['etcd'] | first + '-key.pem' }}"
-    ETCDCTL_CACERT: "{{ kube_cert_dir + '/etcd/ca.crt' if etcd_deployment_type == 'kubeadm' else etcd_cert_dir + '/ca.pem' }}"
-    ETCDCTL_ENDPOINTS: "https://127.0.0.1:2379"
-  delegate_to: "{{ groups['etcd'] | first }}"
-  when: inventory_hostname in groups['etcd']
+  when:
+  - groups['kube_control_plane'] | length > 0
+  delegate_to: "{{ groups['kube_control_plane'] | first }}"
 
 - name: Remove etcd member from cluster
-  command: "{{ bin_dir }}/etcdctl member remove {{ etcd_member_id.stdout }}"
   environment:
     ETCDCTL_API: "3"
     ETCDCTL_CERT: "{{ kube_cert_dir + '/etcd/server.crt' if etcd_deployment_type == 'kubeadm' else etcd_cert_dir + '/admin-' + groups['etcd'] | first + '.pem' }}"
@@ -53,6 +17,27 @@
     ETCDCTL_CACERT: "{{ kube_cert_dir + '/etcd/ca.crt' if etcd_deployment_type == 'kubeadm' else etcd_cert_dir + '/ca.pem' }}"
     ETCDCTL_ENDPOINTS: "https://127.0.0.1:2379"
   delegate_to: "{{ groups['etcd'] | first }}"
-  when:
-    - inventory_hostname in groups['etcd']
-    - etcd_member_id.stdout | length > 0
+  block:
+  - name: Lookup members infos
+    command: "{{ bin_dir }}/etcdctl member list"
+    register: etcd_members
+    changed_when: false
+    check_mode: false
+    tags:
+    - facts
+  - name: Remove member from cluster
+    vars:
+      node_ip: >-
+        {%- if not ipv4_stack -%}
+        {{ ip6 if ip6 is defined else (access_ip6 if access_ip6 is defined else (k8s_node_ips.stdout | from_json)[0]) | ansible.utils.ipwrap }}
+        {%- else -%}
+        {{ ip if ip is defined else (access_ip if access_ip is defined else (k8s_node_ips.stdout | from_json)[0]) | ansible.utils.ipwrap }}
+        {%- endif -%}
+    command:
+      argv:
+      - "{{ bin_dir }}/etcdctl"
+      - member
+      - remove
+      - "{{ ((etcd_members.stdout_lines | select('contains', '//' + node_ip + ':'))[0] | split(','))[0] }}"
+    register: etcd_removal_output
+    changed_when: "'Removed member' in etcd_removal_output.stdout"