fix check containerd availability command p3

Netcracker · Nov 27, 2024 · 63da01b · 63da01b
1 parent 99ed35e
commit 63da01b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/kubemarine/cri/containerd.py b/kubemarine/cri/containerd.py
@@ -263,7 +263,7 @@ def get_config_path(inventory: dict) -> Optional[str]:
     return config_path
 
 
-def configure_containerd(group: NodeGroup) -> RunnersGroupResult:
+def configure_containerd(group: NodeGroup, wait_restart=False) -> RunnersGroupResult:
     cluster = group.cluster
     log = cluster.log
 
@@ -303,9 +303,9 @@ def configure_containerd(group: NodeGroup) -> RunnersGroupResult:
             node.sudo(
                 f"chmod 600 {os_specific_associations['config_location']} && "
                 f"sudo systemctl restart {os_specific_associations['service_name']} && "
-                f"systemctl status {os_specific_associations['service_name']} && "
-                f"timeout 10 sh -c 'until sudo crictl version 2>&1; do sleep 1; done' "
-                , callback=collector)
+                f"systemctl status {os_specific_associations['service_name']}", callback=collector)
+            if wait_restart:
+                node.sudo( f"timeout 60 sh -c 'until sudo crictl version 2>&1; do sleep 1; done' ", callback=collector)
     return collector.result
 
 

diff --git a/kubemarine/kubernetes/__init__.py b/kubemarine/kubernetes/__init__.py
@@ -852,7 +852,7 @@ def upgrade_cri_if_required(group: NodeGroup) -> None:
 
     # upgrade of sandbox_image is currently not supported for migrate_kubemarine
     if cluster.context["upgrade"]["required"].get('containerdConfig', False):
-        containerd.configure_containerd(group)
+        containerd.configure_containerd(group, wait_restart=True)
     else:
         log.debug("'containerd' configuration upgrade is not required")