[BugFix] Keep the cluster status phase same with component (#380)

Signed-off-by: yandongxiao <[email protected]>
StarRocks · Dec 21, 2023 · 1211461 · 1211461
1 parent 330c4a7
commit 1211461
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/apis/starrocks/v1/starrockscluster_types.go b/pkg/apis/starrocks/v1/starrockscluster_types.go
@@ -208,18 +208,15 @@ const (
 	// ClusterFailed represents starrocks cluster failed.
 	ClusterFailed Phase = "failed"
 
-	// ClusterPending represents the starrocks cluster is creating
-	ClusterPending Phase = "pending"
-
-	// ClusterDeleting waiting all resource deleted
-	ClusterDeleting Phase = "deleting"
+	// ClusterReconciling represents some component is reconciling
+	ClusterReconciling Phase = "reconciling"
 )
 
 const (
-	// ComponentReconciling the starrocks have component in starting.
+	// ComponentReconciling the starrocks component is reconciling
 	ComponentReconciling ComponentPhase = "reconciling"
 
-	// ComponentFailed have at least one service failed.
+	// ComponentFailed the pod of component is failed
 	ComponentFailed ComponentPhase = "failed"
 
 	// ComponentRunning all components runs available.

diff --git a/pkg/controllers/starrockscluster_controller.go b/pkg/controllers/starrockscluster_controller.go
@@ -86,7 +86,6 @@ func (r *StarRocksClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	// reconcile src deleted
 	if !src.DeletionTimestamp.IsZero() {
 		logger.Info("deletion timestamp is not zero, clear StarRocksCluster related resources")
-		src.Status.Phase = srapi.ClusterDeleting
 		return ctrl.Result{}, nil
 	}
 
@@ -216,7 +215,7 @@ func GetPhaseFromComponent(componentStatus *srapi.StarRocksComponentStatus) srap
 		return ""
 	}
 	if componentStatus.Phase == srapi.ComponentReconciling {
-		return srapi.ClusterPending
+		return srapi.ClusterReconciling
 	}
 	if componentStatus.Phase == srapi.ComponentFailed {
 		return srapi.ClusterFailed