Merge pull request karmada-io#3470 from RainbowMango/pr_revert_3283

Revert PR3283
yanfeng1992 · Apr 26, 2023 · b167a4f · b167a4f
2 parents 0f84dd7 + 7f484fd
commit b167a4f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 26 deletions.
diff --git a/pkg/controllers/gracefuleviction/evictiontask.go b/pkg/controllers/gracefuleviction/evictiontask.go
@@ -48,13 +48,6 @@ func assessEvictionTasks(bindingSpec workv1alpha2.ResourceBindingSpec,
 }
 
 func assessSingleTask(task workv1alpha2.GracefulEvictionTask, opt assessmentOption) *workv1alpha2.GracefulEvictionTask {
-	// avoid the same cluster appearing in both spec.clusters and spec.gracefulEvictionTasks
-	for _, targetCluster := range opt.scheduleResult {
-		if task.FromCluster == targetCluster.Name {
-			return nil
-		}
-	}
-
 	if task.SuppressDeletion != nil {
 		if *task.SuppressDeletion {
 			return &task

diff --git a/pkg/controllers/gracefuleviction/evictiontask_test.go b/pkg/controllers/gracefuleviction/evictiontask_test.go
@@ -210,25 +210,6 @@ func Test_assessSingleTask(t *testing.T) {
 			},
 			want: nil,
 		},
-		{
-			name: "cluster appears both in targetClusters and gracefulEvictionTasks",
-			args: args{
-				task: workv1alpha2.GracefulEvictionTask{
-					FromCluster:       "member1",
-					CreationTimestamp: metav1.Time{Time: timeNow.Add(time.Minute * -1)},
-				},
-				opt: assessmentOption{
-					timeout: timeout,
-					scheduleResult: []workv1alpha2.TargetCluster{
-						{Name: "member1"},
-					},
-					observedStatus: []workv1alpha2.AggregatedStatusItem{
-						{ClusterName: "member1", Health: workv1alpha2.ResourceHealthy},
-					},
-				},
-			},
-			want: nil,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {