From 19b7d36baf9ba5bf85383001223cfb0071387d81 Mon Sep 17 00:00:00 2001
From: Katakam Rakesh Naga Sai
 <125246792+Katakam-Rakesh@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:47:01 +0530
Subject: [PATCH 1/3] Update step_kubelet_restart.yml

Signed-off-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com>
---
 .../upgrade_k8s/tasks/step_kubelet_restart.yml     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/upgrade/roles/upgrade_k8s/tasks/step_kubelet_restart.yml b/upgrade/roles/upgrade_k8s/tasks/step_kubelet_restart.yml
index 8cbea6d96a..55a1475410 100644
--- a/upgrade/roles/upgrade_k8s/tasks/step_kubelet_restart.yml
+++ b/upgrade/roles/upgrade_k8s/tasks/step_kubelet_restart.yml
@@ -26,21 +26,17 @@
     daemon_reload: true
   delegate_to: "{{ current_node_name }}"
 
-# Part 4: Restart crio service
-- name: Restart crio on {{ current_node_name }}
-  ansible.builtin.systemd:
-    name: crio
-    state: restarted
-  delegate_to: "{{ current_node_name }}"
-
-# Part 5: Restart kubelet service
+# Part 4: Restart kubelet service
+# Note: CRI-O was already restarted during the crio_install step.
+# Restarting it again here is redundant and causes unnecessary pod disruption.
+# Only kubelet needs to be restarted to apply the config.yaml and feature gate changes.
 - name: Restart kubelet on {{ current_node_name }}
   ansible.builtin.systemd:
     name: kubelet
     state: restarted
   delegate_to: "{{ current_node_name }}"
 
-# Part 6: Wait for node to become Ready with correct version
+# Part 5: Wait for node to become Ready with correct version
 - name: Wait for node to become Ready
   ansible.builtin.command: >-
     kubectl get node {{ node_ip }}

From 59db4861548e4c43fa724be8b21b3a77c740ed05 Mon Sep 17 00:00:00 2001
From: Katakam Rakesh Naga Sai
 <125246792+Katakam-Rakesh@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:51:35 +0530
Subject: [PATCH 2/3] Update stop_cluster.yml

Signed-off-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com>
---
 rollback/roles/rollback_k8s/tasks/stop_cluster.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rollback/roles/rollback_k8s/tasks/stop_cluster.yml b/rollback/roles/rollback_k8s/tasks/stop_cluster.yml
index 2e3a75445b..7042848f51 100644
--- a/rollback/roles/rollback_k8s/tasks/stop_cluster.yml
+++ b/rollback/roles/rollback_k8s/tasks/stop_cluster.yml
@@ -18,6 +18,14 @@
 #   2. Non-leader CPs
 #   3. VIP leader last (keeps API accessible as long as possible)
 
+# ── Set default cp_shutdown_order if stop_cluster already completed ─────
+# This ensures cp_shutdown_order variable is always defined, even when
+# stop_cluster stage is skipped because it's already completed.
+- name: Set default cp_shutdown_order when stop_cluster already completed
+  ansible.builtin.set_fact:
+    cp_shutdown_order: "{{ all_cp_nodes }}"
+  when: (rollback_status.stages.stop_cluster.status | default('pending')) == 'completed'
+
 - name: Skip stop_cluster if already completed
   ansible.builtin.debug:
     msg: "stop_cluster already completed — skipping."

From 6ccff0e0e276e53e549d089287e368539b14d2e0 Mon Sep 17 00:00:00 2001
From: Katakam Rakesh Naga Sai
 <125246792+Katakam-Rakesh@users.noreply.github.com>
Date: Wed, 1 Jul 2026 17:52:58 +0530
Subject: [PATCH 3/3] Update fix_vip_split_brain.yml

Signed-off-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com>
---
 rollback/roles/rollback_k8s/tasks/fix_vip_split_brain.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rollback/roles/rollback_k8s/tasks/fix_vip_split_brain.yml b/rollback/roles/rollback_k8s/tasks/fix_vip_split_brain.yml
index 3ba836ffb4..52dafd0031 100644
--- a/rollback/roles/rollback_k8s/tasks/fix_vip_split_brain.yml
+++ b/rollback/roles/rollback_k8s/tasks/fix_vip_split_brain.yml
@@ -18,6 +18,14 @@
 # the split-brain and cleans up stale VIP addresses so only the
 # rightful lease holder owns the VIP.
 
+# ── Set default _stale_vip_nodes if fix_vip already completed ─────
+# This ensures _stale_vip_nodes variable is always defined, even when
+# fix_vip stage is skipped because it's already completed.
+- name: Set default _stale_vip_nodes when fix_vip already completed
+  ansible.builtin.set_fact:
+    _stale_vip_nodes: []
+  when: (rollback_status.stages.fix_vip.status | default('pending')) == 'completed'
+
 - name: Skip fix_vip if already completed
   ansible.builtin.debug:
     msg: "fix_vip already completed — skipping."