fix: add skips + breakout for DELETE_COMPLETE

vexxhost · Jul 17, 2024 · 0e904b6 · 0e904b6
1 parent 8a16cf9
commit 0e904b6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/magnum_cluster_api/driver.py b/magnum_cluster_api/driver.py
@@ -422,7 +422,12 @@ def update_nodegroups_status(
 
         node_groups = []
         for node_group in cluster.nodegroups:
-            if node_group.role == "master":
+            # NOTE(mnaser): Nothing to do if the node group is in `DELETE_COMPLETE`
+            #               state and skip work if it's a master node group.
+            if (
+                node_group.role == "master"
+                and node_group.status == fields.ClusterStatus.DELETE_COMPLETE
+            ):
                 continue
 
             md = objects.MachineDeployment.for_node_group_or_none(
@@ -438,6 +443,7 @@ def update_nodegroups_status(
             ):
                 node_group.status = fields.ClusterStatus.DELETE_COMPLETE
                 node_group.save()
+                continue
 
             md_is_running = (
                 md is not None and md.obj.get("status", {}).get("phase") == "Running"
@@ -452,6 +458,7 @@ def update_nodegroups_status(
             ):
                 node_group.status = fields.ClusterStatus.CREATE_COMPLETE
                 node_group.save()
+                continue
 
             # Get list of all of the OpenStackMachine objects for this node group
             machines = objects.OpenStackMachine.objects(
@@ -490,6 +497,7 @@ def update_nodegroups_status(
             ):
                 node_group.status = fields.ClusterStatus.UPDATE_COMPLETE
                 node_group.save()
+                continue
 
             node_groups.append(node_group)