Skip retry operation with containerd when etcd installed on host VM (#…

…9560)
kubernetes-sigs · Jan 10, 2023 · 6f1352e · 6f1352e
1 parent bf8c64a
commit 6f1352e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/reset.yml b/reset.yml
@@ -29,6 +29,9 @@
         msg: "Reset confirmation failed"
       when: reset_confirmation != "yes"
 
+    - name: Gather information about installed services
+      service_facts:
+
   environment: "{{ proxy_disable_env }}"
   roles:
     - { role: kubespray-defaults}

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
@@ -65,6 +65,7 @@
   when:
     - crictl.stat.exists
     - container_manager in ["crio", "containerd"]
+    - ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
   ignore_errors: true  # noqa ignore-errors
 
 - name: reset | force remove all cri containers
@@ -80,6 +81,7 @@
     - crictl.stat.exists
     - container_manager in ["crio", "containerd"]
     - deploy_container_engine
+    - ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
   ignore_errors: true  # noqa ignore-errors
 
 - name: reset | stop and disable crio service
@@ -109,6 +111,7 @@
   when:
     - crictl.stat.exists
     - container_manager == "containerd"
+    - ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
   ignore_errors: true  # noqa ignore-errors
 
 - block:
@@ -122,6 +125,7 @@
       when:
         - crictl.stat.exists
         - container_manager == "containerd"
+        - ansible_facts.services['containerd.service'] is defined or ansible_facts.services['cri-o.service'] is defined
 
   rescue:
     - name: reset | force remove all cri pods (rescue)