fix(stop_pods): harden logic

CHANGELOG.md

@@ -1,5 +1,9 @@
 # wiremind-kubernetes
 
+## v6.3.5 (2021-10-06)
+### Fixes
+- stop_pods: harden logic.
+
 ## v6.3.4 (2021-10-06)
 ### Fixes
 - Add python 3.10 CI.

VERSION

@@ -1 +1 @@
-6.3.4
+6.3.5

src/wiremind_kubernetes/kubernetes_helper.py

@@ -169,7 +169,7 @@ def is_deployment_stopped(self, deployment_name: str, statefulset: bool = False)
 
         if current_scale > 0:
             kind = statefulset and "StatefulSet" or "Deployment"
-            logger.info("%s %s still has %s living replicas", deployment_name, kind, current_scale)
+            logger.info("%s %s has %s living replicas", deployment_name, kind, current_scale)
             return False
         return True
 
@@ -317,17 +317,12 @@ def _stop_deployments(self, deployment_dict: Dict[str, int]):
         """
         Scale down a dict (deployment_name, expected_scale) of Deployments.
         """
-        for deployment_name in deployment_dict:
-            self.scale_down_deployment(deployment_name)
-        stopped = False
         for _ in range(self.SCALE_DOWN_MAX_WAIT_TIME):
             for deployment_name in deployment_dict:
-                stopped = self._are_deployments_stopped(deployment_dict)
-                if stopped:
-                    break
-                time.sleep(1)
-            if stopped:
+                self.scale_down_deployment(deployment_name)
+            if self._are_deployments_stopped(deployment_dict):
                 break
+            time.sleep(1)
         else:
             raise Exception("Timed out waiting for pods to be deleted: aborting.")