Fix node group deletes

Closes #411
vexxhost · Jul 17, 2024 · fe24283 · fe24283
1 parent c1b6110
commit fe24283
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/magnum_cluster_api/driver.py b/magnum_cluster_api/driver.py
@@ -428,6 +428,17 @@ def update_nodegroups_status(
             md = objects.MachineDeployment.for_node_group_or_none(
                 self.k8s_api, cluster, node_group
             )
+
+            # NOTE(mnaser): If the cluster is in `DELETE_IN_PROGRESS` state, we need to
+            #               wait for the `MachineDeployment` to be deleted before we can
+            #               mark the node group as `DELETE_COMPLETE`.
+            if (
+                node_group.status == fields.ClusterStatus.DELETE_IN_PROGRESS
+                and md is None
+            ):
+                node_group.status = fields.ClusterStatus.DELETE_COMPLETE
+                node_group.save()
+
             md_is_running = (
                 md is not None and md.obj.get("status", {}).get("phase") == "Running"
             )
@@ -480,16 +491,6 @@ def update_nodegroups_status(
                 node_group.status = fields.ClusterStatus.UPDATE_COMPLETE
                 node_group.save()
 
-            # NOTE(mnaser): If the cluster is in `DELETE_IN_PROGRESS` state, we need to
-            #               wait for the `MachineDeployment` to be deleted before we can
-            #               mark the node group as `DELETE_COMPLETE`.
-            if (
-                node_group.status == fields.ClusterStatus.DELETE_IN_PROGRESS
-                and md is None
-            ):
-                node_group.status = fields.ClusterStatus.DELETE_COMPLETE
-                node_group.save()
-
             node_groups.append(node_group)
 
         return node_groups