Move up node pool status cleanup

humio · Oct 22, 2024 · f4554cd · f4554cd
1 parent ca9dcb0
commit f4554cd
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/controllers/humiocluster_controller.go b/controllers/humiocluster_controller.go
@@ -156,6 +156,15 @@ func (r *HumioClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 			withNodeCount(len(podStatusList)))
 	}(ctx, hc)
 
+	// remove unused node pool status entries
+	if ok, idx := r.hasNoUnusedNodePoolStatus(hc, &humioNodePools); !ok {
+		r.cleanupUnusedNodePoolStatus(hc, idx)
+		if result, err := r.updateStatus(ctx, r.Client.Status(), hc, statusOptions().
+			withNodePoolStatusList(hc.Status.NodePoolStatus)); err != nil {
+			return result, r.logErrorAndReturn(err, "unable to set cluster state")
+		}
+	}
+
 	// ensure pods that does not run the desired version or config gets deleted and update state accordingly
 	for _, pool := range humioNodePools.Items {
 		if r.nodePoolAllowsMaintenanceOperations(hc, pool, humioNodePools.Items) {
@@ -2264,14 +2273,6 @@ func (r *HumioClusterReconciler) cleanupUnusedResources(ctx context.Context, hc
 				withMessage(err.Error()))
 		}
 	}
-
-	if ok, idx := r.hasNoUnusedNodePoolStatus(hc, &humioNodePools); !ok {
-		r.cleanupUnusedNodePoolStatus(hc, idx)
-		if result, err := r.updateStatus(ctx, r.Client.Status(), hc, statusOptions().
-			withNodePoolStatusList(hc.Status.NodePoolStatus)); err != nil {
-			return result, r.logErrorAndReturn(err, "unable to set cluster state")
-		}
-	}
 	return reconcile.Result{}, nil
 }