From 8b90c2c7c926a9f6c62b5a3886be1d23b88cdf0a Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Mon, 22 Dec 2025 09:57:29 -0800
Subject: [PATCH] Ensure agents are upgraded correctly

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/integration.yml | 13 +++++++++++++
 roles/k3s_upgrade/tasks/main.yml  |  1 +
 tests/basic.yml                   |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index f368f45..45181b3 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -65,6 +65,19 @@ jobs:
       - name: Verify K3s is running on Agent
         run: docker exec agent-node systemctl status k3s-agent | grep running
 
+      - name: Modify the k3s_version in inventory for upgrade
+        run: |
+          sed -i 's/k3s_version: v1.33.4+k3s1/k3s_version: v1.34.1+k3s1/' tests/basic.yml
+
+      - name: Run Upgrade Playbook
+        run: ansible-playbook playbooks/upgrade.yml -i tests/basic.yml
+
+      - name: Verify K3s upgraded on Server
+        run: docker exec server-node k3s --version | grep v1.34.
+
+      - name: Verify K3s upgraded on Agent
+        run: docker exec agent-node k3s --version | grep v1.34.
+        
       - name: Remove K3s from Server and Agent
         run: ansible-playbook playbooks/reset.yml -i tests/basic.yml
 
diff --git a/roles/k3s_upgrade/tasks/main.yml b/roles/k3s_upgrade/tasks/main.yml
index 958a0a6..c968d5f 100644
--- a/roles/k3s_upgrade/tasks/main.yml
+++ b/roles/k3s_upgrade/tasks/main.yml
@@ -39,6 +39,7 @@
              | combine({
                "INSTALL_K3S_SKIP_START": "true",
                "INSTALL_K3S_VERSION": k3s_version,
+               "INSTALL_K3S_EXEC": ( "agent" if agent_group in group_names else "server" )
              })
              | combine(airgap_dir is defined and {"INSTALL_K3S_SKIP_DOWNLOAD": "true"} or {}) }}
       changed_when: true
diff --git a/tests/basic.yml b/tests/basic.yml
index 7e9dfc9..f95fcd0 100644
--- a/tests/basic.yml
+++ b/tests/basic.yml
@@ -11,7 +11,7 @@ k3s_cluster:
     ansible_connection: docker
     ansible_user: root
     ansible_become: true
-    k3s_version: v1.33.1+k3s1
+    k3s_version: v1.33.4+k3s1
     token: "secret12345"
     api_endpoint: "server-node"
     extra_server_args: "--snapshotter=native"