getPodsToDelete(): delete the pods in ScaleInOpsLifecycleAdapter first (

#158)

* filter pods not in OPS when scaleIn

* scale in unit test

* enhance scale in unit test

pkg/controllers/collaset/collaset_controller_test.go

@@ -151,7 +151,7 @@ var _ = Describe("collaset controller", func() {
 
 		// scale in pods with delay seconds
 		Expect(updateCollaSetWithRetry(c, cs.Namespace, cs.Name, func(cls *appsv1alpha1.CollaSet) bool {
-			cls.Spec.Replicas = int32Pointer(0)
+			cls.Spec.Replicas = int32Pointer(1)
 			cls.Spec.ScaleStrategy.OperationDelaySeconds = int32Pointer(1)
 			return true
 		})).Should(BeNil())
@@ -168,6 +168,23 @@ var _ = Describe("collaset controller", func() {
 			})).Should(BeNil())
 		}
 
+		Eventually(func() error {
+			Expect(c.List(context.TODO(), podList, client.InNamespace(cs.Namespace))).Should(BeNil())
+			if len(podList.Items) != 1 {
+				return fmt.Errorf("expected 1 pods, got %d", len(podList.Items))
+			}
+
+			Expect(c.Get(context.TODO(), types.NamespacedName{Namespace: cs.Namespace, Name: cs.Name}, cs)).Should(BeNil())
+			return expectedStatusReplicas(c, cs, 0, 0, 0, 1, 1, 0, 0, 0)
+		}, 5*time.Second, 1*time.Second).Should(BeNil())
+
+		// scale in pods with delay seconds
+		Expect(updateCollaSetWithRetry(c, cs.Namespace, cs.Name, func(cls *appsv1alpha1.CollaSet) bool {
+			cls.Spec.Replicas = int32Pointer(0)
+			cls.Spec.ScaleStrategy.OperationDelaySeconds = int32Pointer(1)
+			return true
+		}))
+
 		Eventually(func() error {
 			Expect(c.List(context.TODO(), podList, client.InNamespace(cs.Namespace))).Should(BeNil())
 			if len(podList.Items) != 0 {

pkg/controllers/collaset/synccontrol/scale.go

@@ -44,11 +44,11 @@ func (s ActivePodsForDeletion) Less(i, j int) bool {
 	rDuringScaleIn := podopslifecycle.IsDuringOps(collasetutils.ScaleInOpsLifecycleAdapter, r)
 
 	if lDuringScaleIn && !rDuringScaleIn {
-		return true
+		return false
 	}
 
 	if !lDuringScaleIn && rDuringScaleIn {
-		return false
+		return true
 	}
 
 	return collasetutils.ComparePod(l.Pod, r.Pod)