fix the pod-recreation issue in partition style

Signed-off-by: yunbo <[email protected]>
openkruise · Dec 18, 2024 · 61203ae · 61203ae
1 parent 6885920
commit 61203ae
Show file tree

Hide file tree

Showing 45 changed files with 245 additions and 114 deletions.
diff --git a/.github/workflows/e2e-advanced-deployment-1.19.yaml b/.github/workflows/e2e-advanced-deployment-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-advanced-deployment-1.23.yaml b/.github/workflows/e2e-advanced-deployment-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-cloneset-1.19.yaml b/.github/workflows/e2e-cloneset-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-cloneset-1.23.yaml b/.github/workflows/e2e-cloneset-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-daemonset-1.19.yaml b/.github/workflows/e2e-daemonset-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-daemonset-1.23.yaml b/.github/workflows/e2e-daemonset-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-deployment-1.19.yaml b/.github/workflows/e2e-deployment-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-deployment-1.23.yaml b/.github/workflows/e2e-deployment-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-others-1.19.yaml b/.github/workflows/e2e-others-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-others-1.23.yaml b/.github/workflows/e2e-others-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-statefulset-1.19.yaml b/.github/workflows/e2e-statefulset-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-statefulset-1.23.yaml b/.github/workflows/e2e-statefulset-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-v1beta1-bluegreen-1.19.yaml b/.github/workflows/e2e-v1beta1-bluegreen-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-v1beta1-bluegreen-1.23.yaml b/.github/workflows/e2e-v1beta1-bluegreen-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-v1beta1-jump-1.19.yaml b/.github/workflows/e2e-v1beta1-jump-1.19.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/.github/workflows/e2e-v1beta1-jump-1.23.yaml b/.github/workflows/e2e-v1beta1-jump-1.23.yaml
@@ -44,7 +44,7 @@ jobs:
           make helm
           helm repo add openkruise https://openkruise.github.io/charts/
           helm repo update
-          helm install kruise openkruise/kruise
+          helm install kruise openkruise/kruise --version 1.7.0
           for ((i=1;i<10;i++));
           do
             set +e

diff --git a/api/v1alpha1/conversion.go b/api/v1alpha1/conversion.go
@@ -154,7 +154,7 @@ func ConversionToV1beta1TrafficRoutingRef(src TrafficRoutingRef) (dst v1beta1.Tr
 
 func ConversionToV1beta1TrafficRoutingStrategy(src TrafficRoutingStrategy) (dst v1beta1.TrafficRoutingStrategy) {
 	if src.Weight != nil {
-		dst.Traffic = utilpointer.StringPtr(fmt.Sprintf("%d", *src.Weight) + "%")
+		dst.Traffic = utilpointer.String(fmt.Sprintf("%d", *src.Weight) + "%")
 	}
 	dst.RequestHeaderModifier = src.RequestHeaderModifier
 	for _, match := range src.Matches {

diff --git a/api/v1beta1/rollout_types.go b/api/v1beta1/rollout_types.go
@@ -462,9 +462,9 @@ func (r *RolloutStatus) GetSubStatus() *CommonStatus {
 		return nil
 	}
 	if r.CanaryStatus != nil {
-		return &(r.CanaryStatus.CommonStatus)
+		return &r.CanaryStatus.CommonStatus
 	}
-	return &(r.BlueGreenStatus.CommonStatus)
+	return &r.BlueGreenStatus.CommonStatus
 }
 
 func (r *RolloutStatus) IsSubStatusEmpty() bool {

diff --git a/pkg/controller/batchrelease/batchrelease_controller_test.go b/pkg/controller/batchrelease/batchrelease_controller_test.go
@@ -100,7 +100,7 @@ var (
 			},
 		},
 		Spec: apps.DeploymentSpec{
-			Replicas: pointer.Int32Ptr(100),
+			Replicas: pointer.Int32(100),
 			Strategy: apps.DeploymentStrategy{
 				Type: apps.RollingUpdateDeploymentStrategyType,
 				RollingUpdate: &apps.RollingUpdateDeployment{
@@ -146,7 +146,7 @@ var (
 				Name:       "sample",
 			},
 			ReleasePlan: v1beta1.ReleasePlan{
-				BatchPartition: pointer.Int32Ptr(0),
+				BatchPartition: pointer.Int32(0),
 				RollingStyle:   v1beta1.PartitionRollingStyle,
 				Batches: []v1beta1.ReleaseBatch{
 					{
@@ -178,7 +178,7 @@ var (
 			},
 		},
 		Spec: kruiseappsv1alpha1.CloneSetSpec{
-			Replicas: pointer.Int32Ptr(100),
+			Replicas: pointer.Int32(100),
 			UpdateStrategy: kruiseappsv1alpha1.CloneSetUpdateStrategy{
 				Partition:      &intstr.IntOrString{Type: intstr.Int, IntVal: int32(1)},
 				MaxSurge:       &intstr.IntOrString{Type: intstr.Int, IntVal: int32(2)},
@@ -394,7 +394,7 @@ func TestReconcile_CloneSet(t *testing.T) {
 			},
 			GetCloneSet: func() []client.Object {
 				stable := getStableWithReady(stableClone, "v2").(*kruiseappsv1alpha1.CloneSet)
-				stable.Spec.Replicas = pointer.Int32Ptr(200)
+				stable.Spec.Replicas = pointer.Int32(200)
 				canary := getCanaryWithStage(stable, "v2", 0, true)
 				return []client.Object{
 					canary,
@@ -475,7 +475,7 @@ func TestReconcile_CloneSet(t *testing.T) {
 				release.Status.UpdateRevision = util.ComputeHash(canaryTemplate, nil)
 				release.Status.CanaryStatus.UpdatedReplicas = 10
 				release.Status.CanaryStatus.UpdatedReadyReplicas = 10
-				release.Spec.ReleasePlan.BatchPartition = pointer.Int32Ptr(1)
+				release.Spec.ReleasePlan.BatchPartition = pointer.Int32(1)
 				release.Status.ObservedReleasePlanHash = util.HashReleasePlanBatches(&release.Spec.ReleasePlan)
 				return release
 			},
@@ -651,7 +651,7 @@ func TestReconcile_Deployment(t *testing.T) {
 				release := releaseDeploy.DeepCopy()
 				release.Status.CanaryStatus.UpdatedReplicas = 10
 				release.Status.CanaryStatus.UpdatedReadyReplicas = 10
-				release.Spec.ReleasePlan.BatchPartition = pointer.Int32Ptr(1)
+				release.Spec.ReleasePlan.BatchPartition = pointer.Int32(1)
 				return setState(release, v1beta1.ReadyBatchState)
 			},
 			GetDeployments: func() []client.Object {
@@ -694,7 +694,7 @@ func TestReconcile_Deployment(t *testing.T) {
 			},
 			GetDeployments: func() []client.Object {
 				stable := getStableWithReady(stableDeploy, "v2").(*apps.Deployment)
-				stable.Spec.Replicas = pointer.Int32Ptr(200)
+				stable.Spec.Replicas = pointer.Int32(200)
 				canary := getCanaryWithStage(stable, "v2", 0, true)
 				return []client.Object{
 					stable, canary,
@@ -891,7 +891,7 @@ func getCanaryWithStage(workload client.Object, version string, stage int, ready
 		d.ResourceVersion = strconv.Itoa(rand.Intn(100000000000))
 		d.Labels[util.CanaryDeploymentLabel] = "87076677"
 		d.Finalizers = []string{util.CanaryDeploymentFinalizer}
-		d.Spec.Replicas = pointer.Int32Ptr(int32(stageReplicas))
+		d.Spec.Replicas = pointer.Int32(int32(stageReplicas))
 		d.Spec.Template.Spec.Containers = containers(version)
 		d.Status.Replicas = int32(stageReplicas)
 		d.Status.ReadyReplicas = int32(stageReplicas)

diff --git a/pkg/controller/batchrelease/batchrelease_event_handler_test.go b/pkg/controller/batchrelease/batchrelease_event_handler_test.go
@@ -91,14 +91,14 @@ func TestWorkloadEventHandler_Update(t *testing.T) {
 				oldObject := getStableWithReady(stableDeploy, "v2").(*apps.Deployment)
 				oldObject.SetGeneration(2)
 				oldObject.Status.ObservedGeneration = 2
-				oldObject.Spec.Replicas = pointer.Int32Ptr(1000)
+				oldObject.Spec.Replicas = pointer.Int32(1000)
 				return oldObject
 			},
 			GetNewWorkload: func() client.Object {
 				newObject := getStableWithReady(stableDeploy, "v2").(*apps.Deployment)
 				newObject.SetGeneration(2)
 				newObject.Status.ObservedGeneration = 2
-				newObject.Spec.Replicas = pointer.Int32Ptr(1000)
+				newObject.Spec.Replicas = pointer.Int32(1000)
 				newObject.Status.Replicas = 1000
 				return newObject
 			},

diff --git a/pkg/controller/batchrelease/context/context.go b/pkg/controller/batchrelease/context/context.go
@@ -64,6 +64,8 @@ type BatchContext struct {
 	// the next two fields are only used for bluegreen style
 	CurrentSurge intstr.IntOrString `json:"currentSurge,omitempty"`
 	DesiredSurge intstr.IntOrString `json:"desiredSurge,omitempty"`
+	// batches field is added to support complicated scenes such as batch-id label
+	Batches []v1beta1.ReleaseBatch
 }
 
 type FilterFuncType func(pods []*corev1.Pod, ctx *BatchContext) []*corev1.Pod

diff --git a/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control.go b/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control.go
@@ -217,6 +217,7 @@ func (rc *realController) CalculateBatchContext(release *v1beta1.BatchRelease) (
 		UpdatedReadyReplicas:   rc.Status.UpdatedReadyReplicas,
 		DesiredUpdatedReplicas: int32(desired),
 		PlannedUpdatedReplicas: int32(desired),
+		Batches:                release.Spec.ReleasePlan.Batches, //shallow copy
 	}
 	// the number of no need update pods that marked before rollout
 	// if noNeedUpdate := release.Status.CanaryStatus.NoNeedUpdateReplicas; noNeedUpdate != nil {

diff --git a/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go b/pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go
@@ -305,7 +305,7 @@ func TestCalculateBatchContext(t *testing.T) {
 			workload: func() *kruiseappsv1alpha1.CloneSet {
 				return &kruiseappsv1alpha1.CloneSet{
 					Spec: kruiseappsv1alpha1.CloneSetSpec{
-						Replicas: pointer.Int32Ptr(10),
+						Replicas: pointer.Int32(10),
 						UpdateStrategy: kruiseappsv1alpha1.CloneSetUpdateStrategy{
 							MaxSurge: func() *intstr.IntOrString { p := intstr.FromInt(1); return &p }(),
 						},
@@ -348,6 +348,11 @@ func TestCalculateBatchContext(t *testing.T) {
 				UpdateRevision:         "update-version",
 				PlannedUpdatedReplicas: 5,
 				DesiredUpdatedReplicas: 5,
+				Batches: []v1beta1.ReleaseBatch{
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "50%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+				},
 			},
 		},
 
@@ -398,13 +403,18 @@ func TestCalculateBatchContext(t *testing.T) {
 				UpdateRevision:         "update-version",
 				PlannedUpdatedReplicas: 10,
 				DesiredUpdatedReplicas: 10,
+				Batches: []v1beta1.ReleaseBatch{
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "50%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+				},
 			},
 		},
 		"normal case batch2": {
 			workload: func() *kruiseappsv1alpha1.CloneSet {
 				return &kruiseappsv1alpha1.CloneSet{
 					Spec: kruiseappsv1alpha1.CloneSetSpec{
-						Replicas: pointer.Int32Ptr(10),
+						Replicas: pointer.Int32(10),
 						UpdateStrategy: kruiseappsv1alpha1.CloneSetUpdateStrategy{
 							MaxSurge: func() *intstr.IntOrString { p := intstr.FromString("100%"); return &p }(),
 						},
@@ -448,6 +458,11 @@ func TestCalculateBatchContext(t *testing.T) {
 				UpdatedReadyReplicas:   10,
 				PlannedUpdatedReplicas: 10,
 				DesiredUpdatedReplicas: 10,
+				Batches: []v1beta1.ReleaseBatch{
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "50%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+					{CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"}},
+				},
 			},
 		},
 	}

diff --git a/pkg/controller/batchrelease/control/bluegreenstyle/deployment/control.go b/pkg/controller/batchrelease/control/bluegreenstyle/deployment/control.go
@@ -220,6 +220,7 @@ func (rc *realController) CalculateBatchContext(release *v1beta1.BatchRelease) (
 		UpdatedReadyReplicas:   rc.Status.UpdatedReadyReplicas,
 		PlannedUpdatedReplicas: PlannedUpdatedReplicas,
 		DesiredUpdatedReplicas: PlannedUpdatedReplicas,
+		Batches:                release.Spec.ReleasePlan.Batches, //shallow copy
 	}, nil
 }
 

diff --git a/pkg/controller/batchrelease/control/bluegreenstyle/deployment/control_test.go b/pkg/controller/batchrelease/control/bluegreenstyle/deployment/control_test.go
@@ -428,6 +428,14 @@ func TestCalculateBatchContext(t *testing.T) {
 				UpdatedReadyReplicas:   2,
 				PlannedUpdatedReplicas: 10,
 				DesiredUpdatedReplicas: 10,
+				Batches: []v1beta1.ReleaseBatch{
+					{
+						CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "50%"},
+					},
+					{
+						CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "100%"},
+					},
+				},
 			},
 		},
 		"maxSurge=99%, replicas=5": {
@@ -439,7 +447,7 @@ func TestCalculateBatchContext(t *testing.T) {
 					AvailableReplicas: 9,
 					ReadyReplicas:     9,
 				}
-				deployment.Spec.Replicas = pointer.Int32Ptr(5)
+				deployment.Spec.Replicas = pointer.Int32(5)
 				// current partition, ie. maxSurge
 				deployment.Spec.Strategy.RollingUpdate.MaxSurge = &intstr.IntOrString{Type: intstr.String, StrVal: "90%"}
 				newRss := makeCanaryReplicaSets(deployment).(*apps.ReplicaSet)
@@ -480,6 +488,14 @@ func TestCalculateBatchContext(t *testing.T) {
 				UpdatedReadyReplicas:   4,
 				PlannedUpdatedReplicas: 4,
 				DesiredUpdatedReplicas: 4,
+				Batches: []v1beta1.ReleaseBatch{
+					{
+						CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "90%"},
+					},
+					{
+						CanaryReplicas: intstr.IntOrString{Type: intstr.String, StrVal: "99%"},
+					},
+				},
 			},
 		},
 

diff --git a/pkg/controller/batchrelease/control/canarystyle/deployment/canary.go b/pkg/controller/batchrelease/control/canarystyle/deployment/canary.go
@@ -145,7 +145,7 @@ func (r *realCanaryController) create(release *v1beta1.BatchRelease, template *a
 			canary.Spec.Template.Annotations[k] = v
 		}
 	}
-	canary.Spec.Replicas = pointer.Int32Ptr(0)
+	canary.Spec.Replicas = pointer.Int32(0)
 	canary.Spec.Paused = false
 
 	if err := r.canaryClient.Create(context.TODO(), canary); err != nil {

diff --git a/pkg/controller/batchrelease/control/canarystyle/deployment/control.go b/pkg/controller/batchrelease/control/canarystyle/deployment/control.go
@@ -94,6 +94,7 @@ func (rc *realController) CalculateBatchContext(release *v1beta1.BatchRelease) *
 		FailureThreshold:       release.Spec.ReleasePlan.FailureThreshold,
 		UpdatedReplicas:        rc.canaryObject.Status.Replicas,
 		UpdatedReadyReplicas:   rc.canaryObject.Status.AvailableReplicas,
+		Batches:                release.Spec.ReleasePlan.Batches, //shallow copy
 	}
 }