From a19c3e8b8064a7cad4bc8d35266a663e184715e5 Mon Sep 17 00:00:00 2001
From: michalg91 <63045346+michalg91@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:57:18 +0200
Subject: [PATCH 1/2] fixes lablabs/ansible-role-rke2/#333 get rke2_node_name
 for only hosts in current cluster inventory group

---
 tasks/first_server.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tasks/first_server.yml b/tasks/first_server.yml
index d65efad5..b91bc932 100644
--- a/tasks/first_server.yml
+++ b/tasks/first_server.yml
@@ -168,9 +168,7 @@
 
     - name: Get all node names
       ansible.builtin.set_fact:
-        node_names: "{{ hostvars | dict2items | map(attribute='value.rke2_node_name') }}"
-      run_once: true
-      register: node_names
+        node_names: "{{ groups[rke2_cluster_group_name] | map('extract', hostvars) | map(attribute='rke2_node_name') }}"
 
     - name: Remove old <node>.node-password.rke2 secrets
       ansible.builtin.shell: |

From 7518ec55c09f9672409fca1a8e94757921e577d8 Mon Sep 17 00:00:00 2001
From: Michal Gawrys <63045346+michalg91@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:27:08 +0200
Subject: [PATCH 2/2] fix deleting secrets from old nodes

---
 tasks/first_server.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/first_server.yml b/tasks/first_server.yml
index b91bc932..22358fa1 100644
--- a/tasks/first_server.yml
+++ b/tasks/first_server.yml
@@ -176,7 +176,7 @@
         delete secret {{ item }}.node-password.rke2 -n kube-system 2>&1 || true
       args:
         executable: /bin/bash
-      with_items: "{{ registered_node_names.stdout_lines | difference(node_names) }}"
+      with_items: "{{ registered_node_names.stdout_lines | difference([rke2_node_name]) }}"
       changed_when: false
 
     - name: Remove old nodes