do not scale in updated pods first

KusionStack · Jun 11, 2024 · a59eebf · a59eebf
1 parent c7d63f4
commit a59eebf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/pkg/controllers/collaset/synccontrol/scale.go b/pkg/controllers/collaset/synccontrol/scale.go
@@ -67,11 +67,6 @@ func (s ActivePodsForDeletion) Less(i, j int) bool {
 		return r.ToDelete
 	}
 
-	// pods which are updated should be scaled in before not updated
-	if l.IsUpdated != r.IsUpdated {
-		return r.IsUpdated
-	}
-
 	// pods which are during scaleInOps should be deleted before those not during
 	lDuringScaleIn := podopslifecycle.IsDuringOps(collasetutils.ScaleInOpsLifecycleAdapter, l)
 	rDuringScaleIn := podopslifecycle.IsDuringOps(collasetutils.ScaleInOpsLifecycleAdapter, r)

diff --git a/pkg/controllers/collaset/synccontrol/sync_control.go b/pkg/controllers/collaset/synccontrol/sync_control.go
@@ -174,7 +174,6 @@ func (r *RealSyncControl) SyncPods(
 			ID:            id,
 			ContextDetail: ownedIDs[id],
 			ToDelete:      toDelete,
-			IsUpdated:     collasetutils.IsPodUpdatedRevision(pod, resources.UpdatedRevision.Name),
 		})
 
 		if id >= 0 {

diff --git a/pkg/controllers/collaset/utils/pod.go b/pkg/controllers/collaset/utils/pod.go
@@ -41,8 +41,7 @@ type PodWrapper struct {
 	ContextDetail *appsv1alpha1.ContextDetail
 
 	// TODO ToExclude
-	ToDelete  bool
-	IsUpdated bool
+	ToDelete bool
 }
 
 func CollectPodInstanceID(pods []*PodWrapper) map[int]struct{} {