fix test

Author: leon-ape

controllers/apps/cluster/transformer_cluster_component.go

@@ -909,7 +909,7 @@ func (h *clusterShardingHandler) update(transCtx *clusterTransformContext, dag *
 		return err
 	}
 
-	err3, errorSkip := h.handleShardAddNRemove(transCtx, name, runningCompsMap, protoCompsMap, toCreate, toDelete, toUpdate)
+	errorSkip, err3 := h.handleShardAddNRemove(transCtx, name, runningCompsMap, protoCompsMap, toCreate, toDelete, toUpdate)
 
 	// TODO: update strategy
 	h.deleteComps(transCtx, dag, runningCompsMap, toDelete.Difference(errorSkip))
@@ -1145,6 +1145,9 @@ func (h *clusterShardingHandler) handlePostProvision(transCtx *clusterTransformC
 					shardingStatus.PostProvision.CompletionTime = status.CompletionTime
 				}
 			}
+			if transCtx.Cluster.Status.Shardings == nil {
+				transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{}
+			}
 			transCtx.Cluster.Status.Shardings[shardingName] = shardingStatus
 		}
 
@@ -1247,17 +1250,12 @@ func (h *clusterShardingHandler) handlePreTerminate(transCtx *clusterTransformCo
 					shardingStatus2.PreTerminate.CompletionTime = status.CompletionTime
 				}
 			}
+			if transCtx.Cluster.Status.Shardings == nil {
+				transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{}
+			}
 			transCtx.Cluster.Status.Shardings[shardingName] = shardingStatus2
 		}
 
-		init = func() error {
-			upsert(appsv1.LifecycleActionStatus{
-				Phase:     appsv1.LifecycleActionPending,
-				StartTime: &metav1.Time{Time: time.Now()},
-			})
-			return ictrlutil.NewDelayedRequeueError(time.Second, "requeue to schedule the sharding pre-terminate action")
-		}
-
 		skipAsNotDefined = func() error {
 			now := &metav1.Time{Time: time.Now()}
 			upsert(appsv1.LifecycleActionStatus{
@@ -1281,18 +1279,21 @@ func (h *clusterShardingHandler) handlePreTerminate(transCtx *clusterTransformCo
 		}
 
 		succeed = func() error {
+			now := &metav1.Time{Time: time.Now()}
 			upsert(appsv1.LifecycleActionStatus{
 				Phase:          appsv1.LifecycleActionSucceeded,
 				Message:        "",
-				CompletionTime: &metav1.Time{Time: time.Now()},
+				StartTime:      now,
+				CompletionTime: now,
 			})
 			return nil
 		}
 
 		fail = func(err error) error {
 			upsert(appsv1.LifecycleActionStatus{
-				Phase:   appsv1.LifecycleActionFailed,
-				Message: err.Error(),
+				Phase:     appsv1.LifecycleActionFailed,
+				Message:   err.Error(),
+				StartTime: &metav1.Time{Time: time.Now()},
 			})
 			return err // TODO: delay the requeue?
 		}
@@ -1327,10 +1328,6 @@ func (h *clusterShardingHandler) handlePreTerminate(transCtx *clusterTransformCo
 		}
 	}
 
-	if !initialized {
-		return init()
-	}
-
 	if err := h.shardingAction(transCtx, shardingName, shardingPreTerminateAction,
 		shardingDef.Spec.LifecycleActions.PreTerminate, nil, runningComps, nil); err != nil {
 		return fail(err)
@@ -1340,7 +1337,7 @@ func (h *clusterShardingHandler) handlePreTerminate(transCtx *clusterTransformCo
 
 func (h *clusterShardingHandler) handleShardAddNRemove(transCtx *clusterTransformContext, shardingName string,
 	runningCompsMap map[string]*appsv1.Component, protoCompsMap map[string]*appsv1.Component,
-	toCreate, toDelete, toUpdate sets.Set[string]) (error, sets.Set[string]) {
+	toCreate, toDelete, toUpdate sets.Set[string]) (sets.Set[string], error) {
 	var (
 		errorSkip = sets.Set[string]{}
 
@@ -1394,9 +1391,9 @@ func (h *clusterShardingHandler) handleShardAddNRemove(transCtx *clusterTransfor
 	err2 := _delete()
 
 	if err1 != nil {
-		return err1, errorSkip
+		return errorSkip, err1
 	}
-	return err2, errorSkip
+	return errorSkip, err2
 }
 
 func (h *clusterShardingHandler) handleShardAdd(transCtx *clusterTransformContext,
@@ -1408,12 +1405,9 @@ func (h *clusterShardingHandler) handleShardAdd(transCtx *clusterTransformContex
 			return runningComp.Annotations[shardingAddShardKey] != ""
 		}
 
-		fail = func(err error) error {
-			if protoComp.Annotations == nil {
-				protoComp.Annotations = make(map[string]string)
-			}
-			protoComp.Annotations[shardingAddShardKey] = runningComp.Annotations[shardingAddShardKey]
-			return err
+		succeed = func() error {
+			delete(runningComp.Annotations, shardingAddShardKey)
+			return nil
 		}
 	)
 
@@ -1425,10 +1419,10 @@ func (h *clusterShardingHandler) handleShardAdd(transCtx *clusterTransformContex
 		args := map[string]string{shardingAddShardNameVar: runningComp.Name}
 		if err := h.shardingAction(transCtx, shardingName, shardingAddShardAction,
 			shardingDef.Spec.LifecycleActions.ShardAdd, args, runningComps, runningComp); err != nil {
-			return fail(err)
+			return err
 		}
 	}
-	return nil
+	return succeed()
 }
 
 func (h *clusterShardingHandler) handleShardRemove(transCtx *clusterTransformContext,

controllers/apps/cluster/transformer_cluster_component_status_test.go

@@ -409,7 +409,7 @@ var _ = Describe("cluster component status transformer", func() {
 
 		It("sharding spec deleted", func() {
 			// have seen the sharding1 and sharding2 objects in the cluster
-			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterComponentStatus{
+			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{
 				"sharding1": {
 					Phase: appsv1.RunningComponentPhase,
 				},
@@ -467,7 +467,7 @@ var _ = Describe("cluster component status transformer", func() {
 
 		It("sharding object deleted", func() {
 			// have seen the sharding1 and sharding2 objects in the cluster
-			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterComponentStatus{
+			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{
 				"sharding1": {
 					Phase: appsv1.RunningComponentPhase,
 				},
@@ -509,7 +509,7 @@ var _ = Describe("cluster component status transformer", func() {
 
 		It("sharding deleted", func() {
 			// have seen the sharding1 and sharding2 objects in the cluster
-			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterComponentStatus{
+			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{
 				"sharding1": {
 					Phase: appsv1.RunningComponentPhase,
 				},
@@ -642,7 +642,7 @@ var _ = Describe("cluster component status transformer", func() {
 		})
 
 		It("phase changed", func() {
-			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterComponentStatus{
+			transCtx.Cluster.Status.Shardings = map[string]appsv1.ClusterShardingStatus{
 				"sharding1": {
 					Phase: appsv1.CreatingComponentPhase,
 				},