Optimize the KeepWorkloadPausedOnRolloutDeletion logic to ensure workload configurations can be restored after rollout completion.

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>

Author: zmberg

api/v1beta1/batchrelease_plan_types.go

@@ -71,7 +71,10 @@ type FinalizingPolicyType string
 const (
 	// WaitResumeFinalizingPolicyType will wait workload to be resumed, which means
 	// controller will be hold at Finalizing phase until all pods of workload is upgraded.
-	// WaitResumeFinalizingPolicyType only works in canary-style BatchRelease controller.
+	// WaitResumeFinalizingPolicyType currently serves two purposes:
+	// 1. In canary deployments, it determines whether to wait for the stable deployment to complete.
+	// 2. It distinguishes between a normal deployment completion and a rollout cancellation during deployment.
+	// Only a normal deployment completion will result in a WaitResume state.
 	WaitResumeFinalizingPolicyType FinalizingPolicyType = "WaitResume"
 	// ImmediateFinalizingPolicyType will not to wait workload to be resumed.
 	ImmediateFinalizingPolicyType FinalizingPolicyType = "Immediate"

pkg/controller/batchrelease/control/partitionstyle/cloneset/control.go

@@ -122,7 +122,9 @@ func (rc *realController) Finalize(release *v1beta1.BatchRelease) error {
 
 	// if batchPartition == nil, workload should be promoted.
 	if release.Spec.ReleasePlan.BatchPartition == nil {
-		if utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) {
+		// This condition is only met when a rollout is canceled during the release process.
+		if utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) &&
+			!control.ShouldWaitResume(release) {
 			specBody = `,"spec":{"updateStrategy":{"paused":false}}`
 		} else {
 			specBody = `,"spec":{"updateStrategy":{"partition":null,"paused":false}}`

pkg/controller/batchrelease/control/partitionstyle/deployment/control.go

@@ -144,7 +144,11 @@ func (rc *realController) Finalize(release *v1beta1.BatchRelease) error {
 	patchData := patch.NewDeploymentPatch()
 	if release.Spec.ReleasePlan.BatchPartition == nil {
 		strategy := util.GetDeploymentStrategy(rc.object)
-		if !utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) {
+		// This condition is only met when a rollout is canceled during the release process.
+		if utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) &&
+			!control.ShouldWaitResume(release) {
+			patchData.UpdatePaused(true)
+		} else {
 			patchData.UpdatePaused(false)
 		}
 		if rc.object.Spec.Strategy.Type == apps.RecreateDeploymentStrategyType {

pkg/controller/batchrelease/control/partitionstyle/statefulset/control.go

@@ -21,6 +21,8 @@ import (
 	"fmt"
 	"math"
 
+	"github.com/openkruise/rollouts/pkg/feature"
+	utilfeature "github.com/openkruise/rollouts/pkg/util/feature"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -32,9 +34,7 @@ import (
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/feature"
 	"github.com/openkruise/rollouts/pkg/util"
-	utilfeature "github.com/openkruise/rollouts/pkg/util/feature"
 )
 
 type realController struct {
@@ -136,8 +136,11 @@ func (rc *realController) Finalize(release *v1beta1.BatchRelease) error {
 
 	var specBody string
 	// If batchPartition == nil, workload should be promoted;
-	if release.Spec.ReleasePlan.BatchPartition == nil && !utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) {
-		specBody = `,"spec":{"updateStrategy":{"rollingUpdate":{"partition":null}}}`
+	if release.Spec.ReleasePlan.BatchPartition == nil {
+		if !(utilfeature.DefaultMutableFeatureGate.Enabled(feature.KeepWorkloadPausedOnRolloutDeletion) &&
+			!control.ShouldWaitResume(release)) {
+			specBody = `,"spec":{"updateStrategy":{"rollingUpdate":{"partition":null}}}`
+		}
 	}
 	body := fmt.Sprintf(`{"metadata":{"annotations":{"%s":null}}%s}`, util.BatchReleaseControlAnnotation, specBody)
 	clone := util.GetEmptyObjectWithKey(rc.object)