From b04ceba89b9094275cd913e24ec7f43eb0f17cf0 Mon Sep 17 00:00:00 2001
From: Chad Swenson <chadswen@gmail.com>
Date: Fri, 13 Jun 2025 04:54:56 -0500
Subject: [PATCH] Fix calico CNI timeouts in reset role (#12300)

* Fix an issue with CNI timeouts in reset role

* Consolidate secondary service removal tasks
---
 roles/reset/tasks/main.yml | 52 ++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 3c4365a3a..8cea6355e 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -8,8 +8,6 @@
     - kubelet.service
     - cri-dockerd.service
     - cri-dockerd.socket
-    - etcd.service
-    - etcd-events.service
   failed_when: false
   tags:
     - services
@@ -27,8 +25,6 @@
     - crio.service.d/http-proxy.conf
     - k8s-certs-renew.service
     - k8s-certs-renew.timer
-    - etcd.service
-    - etcd-events.service
   register: services_removed
   tags:
     - services
@@ -139,24 +135,36 @@
       ignore_errors: true  # noqa ignore-errors
       changed_when: true
 
-- name: Reset | remove containerd
-  when: container_manager == 'containerd'
-  block:
-    - name: Reset | stop containerd service
-      service:
-        name: containerd
-        state: stopped
-      failed_when: false
-      tags:
-        - services
-
-    - name: Reset | remove containerd service
-      file:
-        path: /etc/systemd/system/containerd.service
-        state: absent
-      register: services_removed
-      tags:
-        - services
+- name: Reset | stop containerd and etcd services
+  service:
+    name: "{{ item }}"
+    state: stopped
+    enabled: false
+  with_items:
+    - containerd.service
+    - etcd.service
+    - etcd-events.service
+  failed_when: false
+  tags:
+    - services
+
+- name: Reset | remove containerd and etcd services
+  file:
+    path: "/etc/systemd/system/{{ item }}"
+    state: absent
+  with_items:
+    - containerd.service
+    - etcd.service
+    - etcd-events.service
+  register: services_removed_secondary
+  tags:
+    - services
+    - containerd
+
+- name: Reset | systemctl daemon-reload  # noqa no-handler
+  systemd_service:
+    daemon_reload: true
+  when: services_removed_secondary.changed
 
 - name: Reset | gather mounted kubelet dirs
   shell: set -o pipefail && mount | grep /var/lib/kubelet/ | awk '{print $3}' | tac