From 0c0d3bb38db6c0189a8b191bc1c7b45d0734dead Mon Sep 17 00:00:00 2001 From: fragpit Date: Fri, 26 Jan 2024 23:09:58 +0300 Subject: [PATCH] kubectl commands on node must use short name (#220) Co-authored-by: Igor Tretyak --- tasks/ensure_drain_and_remove_nodes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/ensure_drain_and_remove_nodes.yml b/tasks/ensure_drain_and_remove_nodes.yml index 9aa8213..586ca09 100644 --- a/tasks/ensure_drain_and_remove_nodes.yml +++ b/tasks/ensure_drain_and_remove_nodes.yml @@ -26,7 +26,7 @@ - name: Ensure uninstalled nodes are drained # noqa no-changed-when ansible.builtin.command: cmd: >- - {{ k3s_install_dir }}/kubectl drain {{ item }} + {{ k3s_install_dir }}/kubectl drain {{ hostvars[item].ansible_hostname }} --ignore-daemonsets --{{ k3s_drain_command[ansible_version.string is version_compare('1.22', '>=')] }} --force @@ -42,7 +42,7 @@ - name: Ensure uninstalled nodes are removed # noqa no-changed-when ansible.builtin.command: - cmd: "{{ k3s_install_dir }}/kubectl delete node {{ item }}" + cmd: "{{ k3s_install_dir }}/kubectl delete node {{ hostvars[item].ansible_hostname }}" delegate_to: "{{ k3s_control_delegate }}" run_once: true when: