replace opj deny newPod

pkg/controllers/operationjob/operationjob_controller_test.go

@@ -45,6 +45,7 @@ import (
 	appsv1alpha1 "kusionstack.io/kube-api/apps/v1alpha1"
 
 	"kusionstack.io/kuperator/pkg/controllers/collaset"
+	"kusionstack.io/kuperator/pkg/controllers/operationjob/replace"
 	"kusionstack.io/kuperator/pkg/controllers/poddeletion"
 	"kusionstack.io/kuperator/pkg/utils/inject"
 )
@@ -285,6 +286,68 @@ var _ = Describe("operationjob controller", func() {
 
 	})
 
+	It("[replace] new pod", func() {
+		testcase := "test-replace-new-pod"
+		Expect(createNamespace(c, testcase)).Should(BeNil())
+		cs := createCollaSetWithReplicas("foo", testcase, 1)
+		podNames := getPodNamesFromCollaSet(cs)
+
+		oj := &appsv1alpha1.OperationJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: testcase,
+				Name:      "foo",
+			},
+			Spec: appsv1alpha1.OperationJobSpec{
+				Action: appsv1alpha1.OpsActionReplace,
+				Targets: []appsv1alpha1.PodOpsTarget{
+					{
+						Name: podNames[0],
+					},
+				},
+			},
+		}
+
+		Expect(c.Create(ctx, oj)).Should(BeNil())
+
+		// wait for new pod created
+		podList := &corev1.PodList{}
+		Eventually(func() bool {
+			Expect(c.List(ctx, podList, client.InNamespace(cs.Namespace))).Should(BeNil())
+			return len(podList.Items) == 2
+		}, time.Second*10, time.Second).Should(BeTrue())
+
+		// replace new pod
+		newPod := corev1.Pod{}
+		Expect(c.List(ctx, podList, client.InNamespace(cs.Namespace))).Should(BeNil())
+		for i := range podList.Items {
+			if _, exist := podList.Items[i].Labels[appsv1alpha1.PodReplacePairOriginName]; exist {
+				newPod = podList.Items[i]
+			}
+		}
+
+		oj2 := &appsv1alpha1.OperationJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: testcase,
+				Name:      "foo1",
+			},
+			Spec: appsv1alpha1.OperationJobSpec{
+				Action: appsv1alpha1.OpsActionReplace,
+				Targets: []appsv1alpha1.PodOpsTarget{
+					{
+						Name: newPod.Name,
+					},
+				},
+			},
+		}
+
+		Expect(c.Create(ctx, oj2)).Should(BeNil())
+		assertJobProgressProcessing(oj2, time.Second*10)
+
+		// the oj which replaces new pod should be blocked
+		_, exist := oj2.Status.TargetDetails[0].ExtraInfo[replace.ExtraInfoNotAllowedToReplaceNewPod]
+		Expect(exist).Should(BeTrue())
+	})
+
 	It("[replace] non-exist pod", func() {
 		testcase := "test-replace-non-exist-pod"
 		Expect(createNamespace(c, testcase)).Should(BeNil())

pkg/controllers/operationjob/replace/replace.go

@@ -40,6 +40,10 @@ const (
 	OperationJobReplacePodFinalizer = "finalizer.operationjob.kusionstack.io/replace-protected"
 )
 
+const (
+	ExtraInfoNotAllowedToReplaceNewPod = "NotAllowedToReplaceNewPod"
+)
+
 var _ ActionHandler = &PodReplaceHandler{}
 
 type PodReplaceHandler struct {
@@ -61,10 +65,18 @@ func (p *PodReplaceHandler) Setup(controller controller.Controller, reconcileMix
 func (p *PodReplaceHandler) OperateTargets(ctx context.Context, candidates []*OpsCandidate, operationJob *appsv1alpha1.OperationJob) error {
 	_, err := controllerutils.SlowStartBatch(len(candidates), controllerutils.SlowStartInitialBatchSize, false, func(i int, _ error) error {
 		candidate := candidates[i]
-		if candidate.Pod == nil {
+		if candidate.Pod == nil || candidate.Pod.Labels == nil {
 			return nil
 		}
 
+		// parse replace information from new pod
+		if originPodName, replaceOriginPodExists := candidate.Pod.Labels[appsv1alpha1.PodReplacePairOriginName]; replaceOriginPodExists {
+			candidate.OpsStatus.ExtraInfo[ExtraInfoNotAllowedToReplaceNewPod] = fmt.Sprintf("Not allowed to replace pod when it is a new pod for origin pod [%s]", originPodName)
+			return nil
+		} else {
+			delete(candidate.OpsStatus.ExtraInfo, ExtraInfoNotAllowedToReplaceNewPod)
+		}
+
 		// parse replace information from origin pod
 		_, replaceIndicated := candidate.Pod.Labels[appsv1alpha1.PodReplaceIndicationLabelKey]
 		_, replaceByReplaceUpdate := candidate.Pod.Labels[appsv1alpha1.PodReplaceByReplaceUpdateLabelKey]