fix golang-lint-error

Signed-off-by: 守辰 <shouchen.zz@alibaba-inc.com>

.github/workflows/ci.yaml

@@ -64,7 +64,7 @@ jobs:
       - name: Run Unit Tests
         run: |
           make test
-          git status
+          [[ -z $(git status -s) ]] || (printf "Existing modified/untracked files.\nPlease run \"make generate manifests\" and push again.\n"; exit 1)
       - name: Publish Unit Test Coverage
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         env:
@@ -73,5 +73,3 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests
           file: cover.out
-      - name: Check diff
-        run: '[[ -z $(git status -s) ]] || (printf "Existing modified/untracked files.\nPlease run \"make generate manifests\" and push again.\n"; exit 1)'

.golangci.yml

@@ -26,6 +26,10 @@ linters:
       # Default is to use a neutral variety of English.
       # Setting locale to US will correct the British spelling of 'colour' to 'color'.
       locale: US
+      ignore-rules:
+      - finalise
+      - Finalising
+      - Cancelling
     depguard:
       rules:
         forbid-pkg-errors:

api/v1alpha1/batchrelease_plan_types.go

@@ -152,6 +152,6 @@ const (
 	RolloutPhasePreparing RolloutPhase = "Preparing"
 	// RolloutPhaseFinalizing indicates a rollout is finalizing
 	RolloutPhaseFinalizing RolloutPhase = "Finalizing"
-	// RolloutPhaseCompleted indicates a rollout is completed/cancelled/terminated
+	// RolloutPhaseCompleted indicates a rollout is completed/canceled/terminated
 	RolloutPhaseCompleted RolloutPhase = "Completed"
 )

api/v1alpha1/conversion.go

@@ -21,10 +21,11 @@ import (
 
 	"strings"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
 )
 
 func (src *Rollout) ConvertTo(dst conversion.Hub) error {

api/v1beta1/batchrelease_plan_types.go

@@ -154,6 +154,6 @@ const (
 	RolloutPhasePreparing RolloutPhase = "Preparing"
 	// RolloutPhaseFinalizing indicates a rollout is finalizing
 	RolloutPhaseFinalizing RolloutPhase = "Finalizing"
-	// RolloutPhaseCompleted indicates a rollout is completed/cancelled/terminated
+	// RolloutPhaseCompleted indicates a rollout is completed/canceled/terminated
 	RolloutPhaseCompleted RolloutPhase = "Completed"
 )

api/v1beta1/rollout_types.go

@@ -485,7 +485,10 @@ func (r *RolloutStatus) GetCanaryRevision() string {
 	if r.CanaryStatus != nil {
 		return r.CanaryStatus.CanaryRevision
 	}
-	return r.BlueGreenStatus.UpdatedRevision
+	if r.BlueGreenStatus != nil {
+		return r.BlueGreenStatus.UpdatedRevision
+	}
+	return ""
 }
 
 func (r *RolloutStatus) SetCanaryRevision(revision string) {

lua_configuration/convert_test_case_to_lua_object.go

@@ -7,16 +7,17 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	custom "github.com/openkruise/rollouts/pkg/trafficrouting/network/customNetworkProvider"
-	"github.com/openkruise/rollouts/pkg/util/luamanager"
 	lua "github.com/yuin/gopher-lua"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/yaml"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	custom "github.com/openkruise/rollouts/pkg/trafficrouting/network/customNetworkProvider"
+	"github.com/openkruise/rollouts/pkg/util/luamanager"
 )
 
 type TestCase struct {

main.go

@@ -18,20 +18,12 @@ package main
 
 import (
 	"flag"
-	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
 	"os"
 
+	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
+
 	kruisev1aplphal1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruisev1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	br "github.com/openkruise/rollouts/pkg/controller/batchrelease"
-	"github.com/openkruise/rollouts/pkg/controller/deployment"
-	"github.com/openkruise/rollouts/pkg/controller/rollout"
-	"github.com/openkruise/rollouts/pkg/controller/rollouthistory"
-	"github.com/openkruise/rollouts/pkg/controller/trafficrouting"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	utilfeature "github.com/openkruise/rollouts/pkg/util/feature"
-	"github.com/openkruise/rollouts/pkg/webhook"
 	"github.com/spf13/pflag"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -45,6 +37,16 @@ import (
 	ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 
+	rolloutapi "github.com/openkruise/rollouts/api"
+	br "github.com/openkruise/rollouts/pkg/controller/batchrelease"
+	"github.com/openkruise/rollouts/pkg/controller/deployment"
+	"github.com/openkruise/rollouts/pkg/controller/rollout"
+	"github.com/openkruise/rollouts/pkg/controller/rollouthistory"
+	"github.com/openkruise/rollouts/pkg/controller/trafficrouting"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
+	utilfeature "github.com/openkruise/rollouts/pkg/util/feature"
+	"github.com/openkruise/rollouts/pkg/webhook"
+
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"

pkg/controller/batchrelease/batchrelease_controller.go

@@ -21,12 +21,11 @@ import (
 	"encoding/json"
 	"flag"
 	"reflect"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sync"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
-	"github.com/openkruise/rollouts/pkg/util"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -44,6 +43,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/batchrelease/batchrelease_controller_test.go

@@ -27,9 +27,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -44,6 +41,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 const TIME_LAYOUT = "2006-01-02 15:04:05"

pkg/controller/batchrelease/batchrelease_event_handler.go

@@ -23,10 +23,6 @@ import (
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruiseappsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +35,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
+	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 )
 
 type EventAction string

pkg/controller/batchrelease/batchrelease_event_handler_test.go

@@ -24,8 +24,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,6 +33,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/event"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestWorkloadEventHandler_Update(t *testing.T) {

pkg/controller/batchrelease/batchrelease_executor.go

@@ -22,6 +22,16 @@ import (
 	"time"
 
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
+	apps "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/bluegreenstyle"
@@ -36,15 +46,6 @@ import (
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/statefulset"
 	"github.com/openkruise/rollouts/pkg/util"
 	"github.com/openkruise/rollouts/pkg/util/errors"
-	apps "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
-	"k8s.io/klog/v2"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 const (
@@ -124,7 +125,7 @@ func (r *Executor) executeBatchReleasePlan(release *v1beta1.BatchRelease, newSta
 		}
 
 	case v1beta1.RolloutPhaseCompleted:
-		// this state indicates that the plan is executed/cancelled successfully, should do nothing in these states.
+		// this state indicates that the plan is executed/canceled successfully, should do nothing in these states.
 	}
 
 	return result, newStatus, err

pkg/controller/batchrelease/batchrelease_status.go

@@ -19,15 +19,16 @@ package batchrelease
 import (
 	"reflect"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/integer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func (r *Executor) syncStatusBeforeExecuting(release *v1beta1.BatchRelease, newStatus *v1beta1.BatchReleaseStatus, controller control.Interface) (bool, reconcile.Result, error) {
@@ -46,7 +47,7 @@ func (r *Executor) syncStatusBeforeExecuting(release *v1beta1.BatchRelease, newS
 	 *************************************************************************/
 	//The following special cases are about the **batch release plan**, include:
 	//  (1). Plan has been terminated
-	//  (2). Plan is deleted or cancelled
+	//  (2). Plan is deleted or canceled
 	//  (3). Plan is changed during rollout
 	//  (4). Plan status is unexpected/unhealthy
 	case isPlanCompleted(release):
@@ -55,7 +56,7 @@ func (r *Executor) syncStatusBeforeExecuting(release *v1beta1.BatchRelease, newS
 
 	case isPlanFinalizing(release):
 		// handle the case that the plan is deleted or is terminating
-		message = "release plan is deleted or cancelled, then finalize"
+		message = "release plan is deleted or canceled, then finalize"
 		signalFinalizing(newStatus)
 
 	case isPlanChanged(release):

pkg/controller/batchrelease/context/context.go

@@ -20,10 +20,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type BatchContext struct {

pkg/controller/batchrelease/context/context_test.go

@@ -22,12 +22,13 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestIsBatchReady(t *testing.T) {

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

@@ -21,6 +21,14 @@ import (
 	"fmt"
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
@@ -29,13 +37,6 @@ import (
 	"github.com/openkruise/rollouts/pkg/util"
 	"github.com/openkruise/rollouts/pkg/util/errors"
 	"github.com/openkruise/rollouts/pkg/util/patch"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/klog/v2"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

pkg/controller/batchrelease/control/bluegreenstyle/cloneset/control_test.go

@@ -25,11 +25,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	control "github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -41,6 +36,12 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	control "github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/batchrelease/control/bluegreenstyle/control_plane.go

@@ -17,17 +17,18 @@ limitations under the License.
 package bluegreenstyle
 
 import (
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type realBatchControlPlane struct {

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

@@ -20,6 +20,16 @@ import (
 	"context"
 	"fmt"
 
+	apps "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/klog/v2"
+	utilpointer "k8s.io/utils/pointer"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1alpha1"
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
@@ -30,15 +40,6 @@ import (
 	"github.com/openkruise/rollouts/pkg/util"
 	"github.com/openkruise/rollouts/pkg/util/errors"
 	"github.com/openkruise/rollouts/pkg/util/patch"
-	apps "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/klog/v2"
-	utilpointer "k8s.io/utils/pointer"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

pkg/controller/batchrelease/control/bluegreenstyle/deployment/control_test.go

@@ -28,12 +28,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	control "github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/errors"
 	apps "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -46,6 +40,13 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	control "github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/errors"
 )
 
 var (

pkg/controller/batchrelease/control/bluegreenstyle/interface.go

@@ -17,10 +17,11 @@ limitations under the License.
 package bluegreenstyle
 
 import (
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"github.com/openkruise/rollouts/pkg/util"
-	corev1 "k8s.io/api/core/v1"
 )
 
 type Interface interface {

pkg/controller/batchrelease/control/canarystyle/control_plane.go

@@ -19,15 +19,16 @@ package canarystyle
 import (
 	"fmt"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 // CloneSetRolloutController is responsible for handling rollout CloneSet type of workloads

pkg/controller/batchrelease/control/canarystyle/deployment/canary.go

@@ -22,11 +22,6 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -36,6 +31,12 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
+	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 )
 
 type realCanaryController struct {

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

@@ -20,17 +20,18 @@ import (
 	"context"
 	"fmt"
 
+	apps "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/canarystyle"
 	"github.com/openkruise/rollouts/pkg/util"
 	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	apps "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

pkg/controller/batchrelease/control/canarystyle/deployment/control_test.go

@@ -24,11 +24,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
-	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,6 +35,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
+	expectations "github.com/openkruise/rollouts/pkg/util/expectation"
 )
 
 var (

pkg/controller/batchrelease/control/canarystyle/deployment/stable.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type realStableController struct {

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

@@ -21,17 +21,18 @@ import (
 	"fmt"
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"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/util"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

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

@@ -25,11 +25,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +34,12 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

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

@@ -20,11 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -33,6 +28,12 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type realBatchControlPlane struct {

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

@@ -5,17 +5,18 @@ import (
 	"fmt"
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"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/util"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

pkg/controller/batchrelease/control/partitionstyle/daemonset/control_test.go

@@ -9,11 +9,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,6 +20,12 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

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

@@ -25,11 +25,6 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +34,12 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

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

@@ -17,10 +17,11 @@ limitations under the License.
 package partitionstyle
 
 import (
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"github.com/openkruise/rollouts/pkg/util"
-	corev1 "k8s.io/api/core/v1"
 )
 
 type Interface interface {

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

@@ -21,17 +21,18 @@ import (
 	"fmt"
 	"math"
 
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/openkruise/rollouts/api/v1beta1"
 	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
 	"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/util"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type realController struct {

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

@@ -27,11 +27,6 @@ import (
 	appsv1pub "github.com/openkruise/kruise-api/apps/pub"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruiseappsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -43,6 +38,12 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/labelpatch"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/batchrelease/control/util.go

@@ -22,8 +22,6 @@ import (
 	"strings"
 
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +29,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 // CalculateBatchReplicas return the planned updated replicas of current batch.

pkg/controller/batchrelease/control/util_test.go

@@ -24,11 +24,12 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestParseIntegerAsPercentage(t *testing.T) {

pkg/controller/batchrelease/labelpatch/filter.go

@@ -21,12 +21,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/integer"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 // FilterPodsForUnorderedUpdate can filter pods before patch pod batch label when rolling back in batches.

pkg/controller/batchrelease/labelpatch/filter_test.go

@@ -23,12 +23,13 @@ import (
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestFilterPodsForUnorderedRollback(t *testing.T) {

pkg/controller/batchrelease/labelpatch/patcher.go

@@ -21,9 +21,6 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +28,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type LabelPatcher interface {

pkg/controller/batchrelease/labelpatch/patcher_test.go

@@ -24,9 +24,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
-	"github.com/openkruise/rollouts/pkg/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -37,6 +34,10 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	batchcontext "github.com/openkruise/rollouts/pkg/controller/batchrelease/context"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/deployment/deployment_controller.go

@@ -26,7 +26,6 @@ import (
 	"reflect"
 	"time"
 
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,18 +33,10 @@ import (
 	"k8s.io/klog/v2"
 
 	rolloutsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const (
-	// maxRetries is the number of times a deployment will be retried before it is dropped out of the queue.
-	// With the current rate-limiter in use (5ms*2^(maxRetries-1)) the following numbers represent the times
-	// a deployment is going to be requeued:
-	//
-	// 5ms, 10ms, 20ms, 40ms, 80ms, 160ms, 320ms, 640ms, 1.3s, 2.6s, 5.1s, 10.2s, 20.4s, 41s, 82s
-	maxRetries = 15
-)
-
 // controllerKind contains the schema.GroupVersionKind for this controller type.
 var controllerKind = apps.SchemeGroupVersion.WithKind("Deployment")
 

pkg/controller/deployment/sync.go

@@ -458,47 +458,7 @@ func (dc *DeploymentController) scaleReplicaSet(ctx context.Context, rs *apps.Re
 	return scaled, rs, err
 }
 
-// cleanupDeployment is responsible for cleaning up a deployment ie. retains all but the latest N old replica sets
-// where N=d.Spec.RevisionHistoryLimit. Old replica sets are older versions of the podtemplate of a deployment kept
-// around by default 1) for historical reasons and 2) for the ability to rollback a deployment.
-func (dc *DeploymentController) cleanupDeployment(ctx context.Context, oldRSs []*apps.ReplicaSet, deployment *apps.Deployment) error {
-	if !deploymentutil.HasRevisionHistoryLimit(deployment) {
-		return nil
-	}
-
-	// Avoid deleting replica set with deletion timestamp set
-	aliveFilter := func(rs *apps.ReplicaSet) bool {
-		return rs != nil && rs.ObjectMeta.DeletionTimestamp == nil
-	}
-	cleanableRSes := deploymentutil.FilterReplicaSets(oldRSs, aliveFilter)
-
-	diff := int32(len(cleanableRSes)) - *deployment.Spec.RevisionHistoryLimit
-	if diff <= 0 {
-		return nil
-	}
-
-	sort.Sort(deploymentutil.ReplicaSetsByRevision(cleanableRSes))
-	klog.V(4).Infof("Looking to cleanup old replica sets for deployment %q", deployment.Name)
-
-	for i := int32(0); i < diff; i++ {
-		rs := cleanableRSes[i]
-		// Avoid delete replica set with non-zero replica counts
-		if rs.Status.Replicas != 0 || *(rs.Spec.Replicas) != 0 || rs.Generation > rs.Status.ObservedGeneration || rs.DeletionTimestamp != nil {
-			continue
-		}
-		klog.V(4).Infof("Trying to cleanup replica set %q for deployment %q", rs.Name, deployment.Name)
-		if err := dc.runtimeClient.Delete(ctx, rs); err != nil && !errors.IsNotFound(err) {
-			// Return error instead of aggregating and continuing DELETEs on the theory
-			// that we may be overloading the api server.
-			return err
-		}
-	}
-
-	return nil
-}
-
 // syncDeploymentStatus checks if the status is up-to-date and sync it if necessary
-// It also updates the extra status annotation for advanced deployment
 func (dc *DeploymentController) syncDeploymentStatus(ctx context.Context, allRSs []*apps.ReplicaSet, newRS *apps.ReplicaSet, d *apps.Deployment) error {
 	newStatus := calculateStatus(allRSs, newRS, d, &dc.strategy)
 

pkg/controller/deployment/util/deployment_util.go

@@ -219,7 +219,7 @@ func SetNewReplicaSetAnnotations(deployment *apps.Deployment, newRS *apps.Replic
 			klog.Warningf("Updating replica set revision OldRevision not int %s", err)
 			return false
 		}
-		//If the RS annotation is empty then initialise it to 0
+		//If the RS annotation is empty then initialize it to 0
 		oldRevisionInt = 0
 	}
 	newRevisionInt, err := strconv.ParseInt(newRevision, 10, 64)

pkg/controller/rollout/rollout_bluegreen.go

@@ -22,10 +22,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,6 +30,11 @@ import (
 	"k8s.io/klog/v2"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type blueGreenReleaseManager struct {
@@ -295,13 +296,13 @@ func (m *blueGreenReleaseManager) doCanaryFinalising(c *RolloutContext) (bool, e
 		blueGreenStatus.FinalisingStep = nextStep
 		blueGreenStatus.LastUpdateTime = &metav1.Time{Time: time.Now()}
 	} else if blueGreenStatus.FinalisingStep == v1beta1.FinalisingStepTypeEnd {
-		klog.Infof("rollout(%s/%s) finalising process is already completed", c.Rollout.Namespace, c.Rollout.Name)
+		klog.Infof("rollout(%s/%s) finalizing process is already completed", c.Rollout.Namespace, c.Rollout.Name)
 		return true, nil
 	}
-	klog.Infof("rollout(%s/%s) Finalising Step is %s", c.Rollout.Namespace, c.Rollout.Name, blueGreenStatus.FinalisingStep)
+	klog.Infof("rollout(%s/%s) finalizing Step is %s", c.Rollout.Namespace, c.Rollout.Name, blueGreenStatus.FinalisingStep)
 
 	var retry bool
-	// the order of steps is maitained by calculating thenextStep
+	// the order of steps is maintained by calculating the nextStep
 	switch blueGreenStatus.FinalisingStep {
 	// set workload.pause=false; set workload.partition=0
 	case v1beta1.FinalisingStepResumeWorkload:
@@ -327,7 +328,7 @@ func (m *blueGreenReleaseManager) doCanaryFinalising(c *RolloutContext) (bool, e
 		retry, err = true, fmt.Errorf("only for debugging, just wait endlessly")
 	default:
 		nextStep = nextBlueGreenTask(c.FinalizeReason, "")
-		klog.Warningf("unexpected finalising step, current step(%s),  start from the first step(%s)", blueGreenStatus.FinalisingStep, nextStep)
+		klog.Warningf("unexpected finalizing step, current step(%s),  start from the first step(%s)", blueGreenStatus.FinalisingStep, nextStep)
 		blueGreenStatus.FinalisingStep = nextStep
 		return false, nil
 	}

pkg/controller/rollout/rollout_bluegreen_test.go

@@ -21,13 +21,14 @@ import (
 	"reflect"
 	"testing"
 
+	apps "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	netv1 "k8s.io/api/networking/v1"
+
 	"github.com/openkruise/rollouts/api/v1alpha1"
 	"github.com/openkruise/rollouts/api/v1beta1"
 	"github.com/openkruise/rollouts/pkg/trafficrouting"
 	"github.com/openkruise/rollouts/pkg/util"
-	apps "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	netv1 "k8s.io/api/networking/v1"
 
 	// metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -51,6 +52,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 			getObj: func() ([]*apps.Deployment, []*apps.ReplicaSet) {
 				dep1 := deploymentDemo.DeepCopy()
 				rs1 := rsDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				return []*apps.Deployment{dep1}, []*apps.ReplicaSet{rs1}
 			},
 			getNetwork: func() ([]*corev1.Service, []*netv1.Ingress) {
@@ -64,7 +66,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				obj.Status.BlueGreenStatus.UpdatedRevision = "6f8cc56547"
 				obj.Status.BlueGreenStatus.CurrentStepIndex = 1
 				obj.Status.BlueGreenStatus.NextStepIndex = 2
-				obj.Status.BlueGreenStatus.ObservedRolloutID = "88bd5dbfd"
+				obj.Status.BlueGreenStatus.ObservedRolloutID = "test-id"
 				obj.Status.BlueGreenStatus.CurrentStepState = v1beta1.CanaryStepStateUpgrade
 				cond := util.GetRolloutCondition(obj.Status, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
@@ -80,7 +82,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				s.BlueGreenStatus.CurrentStepIndex = 1
 				s.BlueGreenStatus.NextStepIndex = 2
 				s.BlueGreenStatus.CurrentStepState = v1beta1.CanaryStepStateUpgrade
-				s.BlueGreenStatus.ObservedRolloutID = "88bd5dbfd"
+				s.BlueGreenStatus.ObservedRolloutID = "test-id"
 				cond := util.GetRolloutCondition(*s, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
 				util.SetRolloutCondition(s, *cond)
@@ -104,7 +106,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				}
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.BlueGreenRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				return br
 			},
 		},
@@ -114,6 +116,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				dep1 := deploymentDemo.DeepCopy()
 				rs1 := rsDemo.DeepCopy()
 				rs2 := rsDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				rs2.Name = "echoserver-canary"
 				rs2.Labels["pod-template-hash"] = "pod-template-hash-v2"
 				rs2.Spec.Template.Spec.Containers[0].Image = "echoserver:v2"
@@ -131,7 +134,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				obj.Status.BlueGreenStatus.CurrentStepIndex = 1
 				obj.Status.BlueGreenStatus.NextStepIndex = 2
 				obj.Status.BlueGreenStatus.CurrentStepState = v1beta1.CanaryStepStateUpgrade
-				obj.Status.BlueGreenStatus.ObservedRolloutID = "88bd5dbfd"
+				obj.Status.BlueGreenStatus.ObservedRolloutID = "test-id"
 				cond := util.GetRolloutCondition(obj.Status, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
 				util.SetRolloutCondition(&obj.Status, *cond)
@@ -152,7 +155,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				}
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.BlueGreenRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				br.Status = v1beta1.BatchReleaseStatus{
 					ObservedGeneration:      1,
 					ObservedReleasePlanHash: util.HashReleasePlanBatches(&br.Spec.ReleasePlan),
@@ -176,7 +179,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				s.BlueGreenStatus.UpdatedReadyReplicas = 1
 				s.BlueGreenStatus.CurrentStepIndex = 1
 				s.BlueGreenStatus.NextStepIndex = 2
-				s.BlueGreenStatus.ObservedRolloutID = "88bd5dbfd"
+				s.BlueGreenStatus.ObservedRolloutID = "test-id"
 				s.BlueGreenStatus.CurrentStepState = v1beta1.CanaryStepStateTrafficRouting
 				cond := util.GetRolloutCondition(*s, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
@@ -201,7 +204,7 @@ func TestBlueGreenRunCanary(t *testing.T) {
 				}
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.BlueGreenRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				return br
 			},
 		},
@@ -260,6 +263,8 @@ func TestBlueGreenRunCanary(t *testing.T) {
 			cond.Message = ""
 			util.SetRolloutCondition(cStatus, *cond)
 			expectStatus := cs.expectStatus()
+			// canary revision may change after k8s API changes, munge the revision to make the test stable
+			expectStatus.SetCanaryRevision(cStatus.GetCanaryRevision())
 			if !reflect.DeepEqual(expectStatus, cStatus) {
 				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(cs.expectStatus()), util.DumpJSON(cStatus))
 			}
@@ -330,8 +335,11 @@ func TestBlueGreenRunCanaryPaused(t *testing.T) {
 			cStatus.BlueGreenStatus.LastUpdateTime = nil
 			cStatus.BlueGreenStatus.Message = ""
 			cStatus.Message = ""
-			if !reflect.DeepEqual(cs.expectStatus(), cStatus) {
+			expectStatus := cs.expectStatus()
-				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(cs.expectStatus()), util.DumpJSON(cStatus))
+			// canary revision may change after k8s API changes, munge the revision to make the test stable
+			expectStatus.SetCanaryRevision(cStatus.GetCanaryRevision())
+			if !reflect.DeepEqual(expectStatus, cStatus) {
+				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(expectStatus), util.DumpJSON(cStatus))
 			}
 		})
 	}

pkg/controller/rollout/rollout_canary.go

@@ -22,10 +22,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,6 +31,11 @@ import (
 	"k8s.io/klog/v2"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type canaryReleaseManager struct {

pkg/controller/rollout/rollout_canary_test.go

@@ -21,10 +21,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -34,6 +30,11 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestRunCanary(t *testing.T) {
@@ -49,6 +50,7 @@ func TestRunCanary(t *testing.T) {
 			name: "run canary upgrade1",
 			getObj: func() ([]*apps.Deployment, []*apps.ReplicaSet) {
 				dep1 := deploymentDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				rs1 := rsDemo.DeepCopy()
 				return []*apps.Deployment{dep1}, []*apps.ReplicaSet{rs1}
 			},
@@ -103,7 +105,7 @@ func TestRunCanary(t *testing.T) {
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.EnableExtraWorkloadForCanary = true
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.CanaryRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				return br
 			},
 		},
@@ -112,6 +114,8 @@ func TestRunCanary(t *testing.T) {
 			getObj: func() ([]*apps.Deployment, []*apps.ReplicaSet) {
 				dep1 := deploymentDemo.DeepCopy()
 				dep2 := deploymentDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
+				dep2.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				dep2.UID = "1ca4d850-9ec3-48bd-84cb-19f2e8cf4180"
 				dep2.Name = dep1.Name + "-canary"
 				dep2.Labels[util.CanaryDeploymentLabel] = dep1.Name
@@ -144,7 +148,7 @@ func TestRunCanary(t *testing.T) {
 				obj.Status.CanaryStatus.CurrentStepIndex = 1
 				obj.Status.CanaryStatus.NextStepIndex = 2
 				obj.Status.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateUpgrade
-				obj.Status.CanaryStatus.ObservedRolloutID = "88bd5dbfd"
+				obj.Status.CanaryStatus.ObservedRolloutID = "test-id"
 				cond := util.GetRolloutCondition(obj.Status, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
 				util.SetRolloutCondition(&obj.Status, *cond)
@@ -166,7 +170,7 @@ func TestRunCanary(t *testing.T) {
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.EnableExtraWorkloadForCanary = true
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.CanaryRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				br.Status = v1beta1.BatchReleaseStatus{
 					ObservedGeneration: 1,
 					// since we use RollingStyle over EnableExtraWorkloadForCanary now, former hardcoded hash
@@ -193,7 +197,7 @@ func TestRunCanary(t *testing.T) {
 				s.CanaryStatus.CurrentStepIndex = 1
 				s.CanaryStatus.NextStepIndex = 2
 				s.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateTrafficRouting
-				s.CanaryStatus.ObservedRolloutID = "88bd5dbfd"
+				s.CanaryStatus.ObservedRolloutID = "test-id"
 				cond := util.GetRolloutCondition(*s, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
 				util.SetRolloutCondition(s, *cond)
@@ -218,7 +222,7 @@ func TestRunCanary(t *testing.T) {
 				br.Spec.ReleasePlan.BatchPartition = utilpointer.Int32(0)
 				br.Spec.ReleasePlan.EnableExtraWorkloadForCanary = true
 				br.Spec.ReleasePlan.RollingStyle = v1beta1.CanaryRollingStyle
-				br.Spec.ReleasePlan.RolloutID = "88bd5dbfd"
+				br.Spec.ReleasePlan.RolloutID = "test-id"
 				return br
 			},
 		},
@@ -277,6 +281,8 @@ func TestRunCanary(t *testing.T) {
 			cond.Message = ""
 			util.SetRolloutCondition(cStatus, *cond)
 			expectStatus := cs.expectStatus()
+			// canary revision may change after k8s API changes, munge the revision to make the test stable
+			expectStatus.SetCanaryRevision(cStatus.GetCanaryRevision())
 			if !reflect.DeepEqual(expectStatus, cStatus) {
 				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(cs.expectStatus()), util.DumpJSON(cStatus))
 			}
@@ -347,8 +353,11 @@ func TestRunCanaryPaused(t *testing.T) {
 			cStatus.CanaryStatus.LastUpdateTime = nil
 			cStatus.CanaryStatus.Message = ""
 			cStatus.Message = ""
-			if !reflect.DeepEqual(cs.expectStatus(), cStatus) {
+			expectStatus := cs.expectStatus()
-				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(cs.expectStatus()), util.DumpJSON(cStatus))
+			// canary revision may change after k8s API changes, munge the revision to make the test stable
+			expectStatus.SetCanaryRevision(cStatus.GetCanaryRevision())
+			if !reflect.DeepEqual(expectStatus, cStatus) {
+				t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(expectStatus), util.DumpJSON(cStatus))
 			}
 		})
 	}

pkg/controller/rollout/rollout_controller.go

@@ -19,13 +19,11 @@ package rollout
 import (
 	"context"
 	"flag"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sync"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
+
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
@@ -35,6 +33,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/rollout/rollout_controller_test.go

@@ -19,11 +19,6 @@ package rollout
 import (
 	"fmt"
 
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -34,6 +29,12 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	utilpointer "k8s.io/utils/pointer"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
 )
 
 var (

pkg/controller/rollout/rollout_event_handler.go

@@ -19,8 +19,6 @@ package rollout
 import (
 	"context"
 
-	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -30,6 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 )
 
 var _ handler.EventHandler = &enqueueRequestForWorkload{}

pkg/controller/rollout/rollout_progressing.go

@@ -21,11 +21,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilerrors "github.com/openkruise/rollouts/pkg/util/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,6 +28,12 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilerrors "github.com/openkruise/rollouts/pkg/util/errors"
 )
 
 var defaultGracePeriodSeconds int32 = 3
@@ -156,7 +157,7 @@ func (r *RolloutReconciler) reconcileRolloutProgressing(rollout *v1beta1.Rollout
 			return nil, err
 			// finalizer is finished
 		} else if done {
-			progressingStateTransition(newStatus, corev1.ConditionFalse, v1alpha1.ProgressingReasonCompleted, "Rollout progressing has been cancelled")
+			progressingStateTransition(newStatus, corev1.ConditionFalse, v1alpha1.ProgressingReasonCompleted, "Rollout progressing has been canceled")
 			setRolloutSucceededCondition(newStatus, corev1.ConditionFalse)
 		} else {
 			// Incomplete, recheck
@@ -277,7 +278,7 @@ func (r *RolloutReconciler) handleRollbackDirectly(rollout *v1beta1.Rollout, wor
 	newStatus.SetCanaryRevision(workload.CanaryRevision)
 	r.Recorder.Eventf(rollout, corev1.EventTypeNormal, "Progressing", "workload has been rollback, then rollout is canceled")
 	klog.Infof("rollout(%s/%s) workload has been rollback directly, then rollout canceled", rollout.Namespace, rollout.Name)
-	progressingStateTransition(newStatus, corev1.ConditionTrue, v1alpha1.ProgressingReasonCancelling, "The workload has been rolled back and the rollout process will be cancelled")
+	progressingStateTransition(newStatus, corev1.ConditionTrue, v1alpha1.ProgressingReasonCancelling, "The workload has been rolled back and the rollout process will be canceled")
 	return nil
 }
 

pkg/controller/rollout/rollout_progressing_test.go

@@ -21,10 +21,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -34,6 +30,11 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestReconcileRolloutProgressing(t *testing.T) {
@@ -50,6 +51,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 			getObj: func() ([]*apps.Deployment, []*apps.ReplicaSet) {
 				dep1 := deploymentDemo.DeepCopy()
 				rs1 := rsDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				return []*apps.Deployment{dep1}, []*apps.ReplicaSet{rs1}
 			},
 			getNetwork: func() ([]*corev1.Service, []*netv1.Ingress) {
@@ -74,7 +76,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				s.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateInit
 				s.CurrentStepIndex = s.CanaryStatus.CurrentStepIndex
 				s.CurrentStepState = s.CanaryStatus.CurrentStepState
-				s.CanaryStatus.ObservedRolloutID = "88bd5dbfd"
+				s.CanaryStatus.ObservedRolloutID = "test-id"
 				return s
 			},
 			expectTr: func() *v1alpha1.TrafficRouting {
@@ -88,6 +90,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 			getObj: func() ([]*apps.Deployment, []*apps.ReplicaSet) {
 				dep1 := deploymentDemo.DeepCopy()
 				rs1 := rsDemo.DeepCopy()
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				return []*apps.Deployment{dep1}, []*apps.ReplicaSet{rs1}
 			},
 			getNetwork: func() ([]*corev1.Service, []*netv1.Ingress) {
@@ -108,7 +111,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				s.CanaryStatus.CurrentStepIndex = 1
 				s.CanaryStatus.NextStepIndex = 2
 				s.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateInit
-				s.CanaryStatus.ObservedRolloutID = "88bd5dbfd"
+				s.CanaryStatus.ObservedRolloutID = "test-id"
 				cond := util.GetRolloutCondition(*s, v1beta1.RolloutConditionProgressing)
 				cond.Reason = v1alpha1.ProgressingReasonInRolling
 				util.SetRolloutCondition(s, *cond)
@@ -125,6 +128,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				dep2.UID = "1ca4d850-9ec3-48bd-84cb-19f2e8cf4180"
 				dep2.Name = dep1.Name + "-canary"
 				dep2.Labels[util.CanaryDeploymentLabel] = dep1.Name
+				dep1.Labels[v1beta1.RolloutIDLabel] = "test-id"
 				rs1 := rsDemo.DeepCopy()
 				rs2 := rsDemo.DeepCopy()
 				rs2.Name = "echoserver-canary-2"
@@ -149,7 +153,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				obj.Status.CanaryStatus.ObservedWorkloadGeneration = 2
 				obj.Status.CanaryStatus.RolloutHash = "f55bvd874d5f2fzvw46bv966x4bwbdv4wx6bd9f7b46ww788954b8z8w29b7wxfd"
 				obj.Status.CanaryStatus.StableRevision = "pod-template-hash-v1"
-				obj.Status.CanaryStatus.CanaryRevision = "88bd5dbfd"
+				obj.Status.CanaryStatus.CanaryRevision = "b4bdb86db"
 				obj.Status.CanaryStatus.CurrentStepIndex = 1
 				obj.Status.CanaryStatus.NextStepIndex = 2
 				obj.Status.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateUpgrade
@@ -163,7 +167,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				s.CanaryStatus.ObservedWorkloadGeneration = 2
 				s.CanaryStatus.RolloutHash = "f55bvd874d5f2fzvw46bv966x4bwbdv4wx6bd9f7b46ww788954b8z8w29b7wxfd"
 				s.CanaryStatus.StableRevision = "pod-template-hash-v1"
-				s.CanaryStatus.CanaryRevision = "88bd5dbfd"
+				s.CanaryStatus.CanaryRevision = "b4bdb86db"
 				s.CanaryStatus.PodTemplateHash = "pod-template-hash-v2"
 				s.CanaryStatus.CurrentStepIndex = 1
 				s.CanaryStatus.NextStepIndex = 2
@@ -208,7 +212,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				obj.Status.CanaryStatus.ObservedWorkloadGeneration = 2
 				obj.Status.CanaryStatus.RolloutHash = "f55bvd874d5f2fzvw46bv966x4bwbdv4wx6bd9f7b46ww788954b8z8w29b7wxfd"
 				obj.Status.CanaryStatus.StableRevision = "pod-template-hash-v1"
-				obj.Status.CanaryStatus.CanaryRevision = "88bd5dbfd"
+				obj.Status.CanaryStatus.CanaryRevision = "b4bdb86db"
 				obj.Status.CanaryStatus.PodTemplateHash = "pod-template-hash-v2"
 				obj.Status.CanaryStatus.CurrentStepIndex = 4
 				obj.Status.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateCompleted
@@ -222,7 +226,7 @@ func TestReconcileRolloutProgressing(t *testing.T) {
 				s.CanaryStatus.ObservedWorkloadGeneration = 2
 				s.CanaryStatus.RolloutHash = "f55bvd874d5f2fzvw46bv966x4bwbdv4wx6bd9f7b46ww788954b8z8w29b7wxfd"
 				s.CanaryStatus.StableRevision = "pod-template-hash-v1"
-				s.CanaryStatus.CanaryRevision = "88bd5dbfd"
+				s.CanaryStatus.CanaryRevision = "b4bdb86db"
 				s.CanaryStatus.PodTemplateHash = "pod-template-hash-v2"
 				s.CanaryStatus.CurrentStepIndex = 4
 				s.CanaryStatus.NextStepIndex = 0
@@ -888,9 +892,9 @@ func checkRolloutEqual(c client.WithWatch, t *testing.T, key client.ObjectKey, e
 		cond2.LastTransitionTime = metav1.Time{}
 		util.SetRolloutCondition(cStatus, *cond2)
 	}
-	if expect.CanaryStatus != nil && cStatus.CanaryStatus != nil && expect.CanaryStatus.CanaryRevision != cStatus.CanaryStatus.CanaryRevision {
+
-		t.Fatalf("canary revision not equal: expect(%s), but get(%s)", expect.CanaryStatus.CanaryRevision, cStatus.CanaryStatus.CanaryRevision)
+	// canary revision may change after k8s API changes, munge the revision to make the test stable
-	}
+	expect.SetCanaryRevision(cStatus.GetCanaryRevision())
 	if !reflect.DeepEqual(expect, cStatus) {
 		t.Fatalf("expect(%s), but get(%s)", util.DumpJSON(expect), util.DumpJSON(cStatus))
 	}

pkg/controller/rollout/rollout_releaseManager.go

@@ -21,13 +21,14 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type ReleaseManager interface {

pkg/controller/rollout/rollout_status.go

@@ -22,9 +22,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,6 +30,10 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func (r *RolloutReconciler) calculateRolloutStatus(rollout *v1beta1.Rollout) (retry bool, newStatus *v1beta1.RolloutStatus, err error) {

pkg/controller/rollout/rollout_status_test.go

@@ -20,13 +20,14 @@ import (
 	"context"
 	"testing"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/tools/record"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestCalculateRolloutHash(t *testing.T) {

pkg/controller/rollouthistory/rollouthistory_controller_test.go

@@ -23,8 +23,6 @@ import (
 
 	"github.com/openkruise/kruise-api/apps/pub"
 	kruisev1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -37,6 +35,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 )
 
 func init() {

pkg/controller/rollouthistory/rollouthistory_event_handler.go

@@ -19,13 +19,14 @@ package rollouthistory
 import (
 	"context"
 
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
 )
 
 var _ handler.EventHandler = &enqueueRequestForRolloutHistory{}

pkg/controller/rollouthistory/util.go

@@ -25,14 +25,15 @@ import (
 
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 // For RolloutHistory

pkg/controller/trafficrouting/trafficrouting_controller.go

@@ -24,9 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -40,6 +37,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/controller/trafficrouting/trafficrouting_controller_test.go

@@ -22,11 +22,6 @@ import (
 	"reflect"
 	"testing"
 
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +34,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
 )
 
 var (

pkg/trafficrouting/manager_test.go

@@ -24,12 +24,6 @@ import (
 	"testing"
 	"time"
 
-	rolloutapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
-	"github.com/openkruise/rollouts/pkg/util/grace"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -44,6 +38,13 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
+	"github.com/openkruise/rollouts/pkg/util/grace"
 )
 
 var (

pkg/trafficrouting/network/customNetworkProvider/custom_network_provider.go

@@ -23,11 +23,6 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
-	"github.com/openkruise/rollouts/pkg/util/luamanager"
 	lua "github.com/yuin/gopher-lua"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -41,6 +36,12 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
+	"github.com/openkruise/rollouts/pkg/util/luamanager"
 )
 
 const (

pkg/trafficrouting/network/customNetworkProvider/custom_network_provider_test.go

@@ -26,12 +26,6 @@ import (
 	"strings"
 	"testing"
 
-	rolloutapi "github.com/openkruise/rollouts/api"
-	rolloutsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
-	"github.com/openkruise/rollouts/pkg/util/luamanager"
 	"github.com/stretchr/testify/assert"
 	lua "github.com/yuin/gopher-lua"
 	corev1 "k8s.io/api/core/v1"
@@ -48,6 +42,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 	"sigs.k8s.io/yaml"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	rolloutsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
+	"github.com/openkruise/rollouts/pkg/util/luamanager"
 )
 
 var (

pkg/trafficrouting/network/gateway/gateway.go

@@ -17,9 +17,6 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -28,6 +25,10 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type Config struct {

pkg/trafficrouting/network/gateway/gateway_test.go

@@ -17,10 +17,11 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	utilpointer "k8s.io/utils/pointer"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var (

pkg/trafficrouting/network/ingress/ingress.go

@@ -23,11 +23,6 @@ import (
 	"reflect"
 
 	jsonpatch "github.com/evanphx/json-patch"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
-	"github.com/openkruise/rollouts/pkg/util/luamanager"
 	lua "github.com/yuin/gopher-lua"
 	netv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -41,6 +36,12 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/trafficrouting/network"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
+	"github.com/openkruise/rollouts/pkg/util/luamanager"
 )
 
 type ingressController struct {

pkg/trafficrouting/network/ingress/ingress_test.go

@@ -19,10 +19,6 @@ import (
 	"reflect"
 	"testing"
 
-	rolloutsapi "github.com/openkruise/rollouts/api"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/util/configuration"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -33,6 +29,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	rolloutsapi "github.com/openkruise/rollouts/api"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/util/configuration"
 )
 
 var (

pkg/util/condition.go

@@ -17,9 +17,10 @@ limitations under the License.
 package util
 
 import (
-	"github.com/openkruise/rollouts/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
 )
 
 // NewRolloutCondition creates a new rollout condition.

pkg/util/configuration/configuration.go

@@ -20,10 +20,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/openkruise/rollouts/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 const (

pkg/util/controller_finder.go

@@ -23,9 +23,6 @@ import (
 
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,6 +30,10 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 )
 
 // Workload is used to return (controller, scale, selector) fields from the

pkg/util/controller_finder_test.go

@@ -11,12 +11,13 @@ import (
 	"math/rand"
 
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
 	apps "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
 )
 
 var namespace string = "unit-test"
@@ -195,7 +196,7 @@ func TestGetWorkloadForRef(t *testing.T) {
 				rs := generateRS(*dep)
 				rs.Namespace = namespace
 				rs.Spec.Replicas = dep.Spec.Replicas
-				rs.Labels[apps.DefaultDeploymentUniqueLabelKey] = "c9dcf87d5"
+				rs.Labels[apps.DefaultDeploymentUniqueLabelKey] = "cd68dc9"
 				return dep, &rs, nil
 			},
 			expectWorkload: func() *Workload {
@@ -217,7 +218,7 @@ func TestGetWorkloadForRef(t *testing.T) {
 					},
 					Replicas:           10,
 					StableRevision:     "stable",
-					CanaryRevision:     "c9dcf87d5",
+					CanaryRevision:     "cd68dc9",
 					PodTemplateHash:    "",
 					RevisionLabelKey:   "pod-template-hash",
 					IsStatusConsistent: true,
@@ -242,7 +243,7 @@ func TestGetWorkloadForRef(t *testing.T) {
 				rs := generateRS(*dep)
 				rs.Namespace = namespace
 				rs.Spec.Replicas = dep.Spec.Replicas
-				rs.Labels[apps.DefaultDeploymentUniqueLabelKey] = "c9dcf87d5"
+				rs.Labels[apps.DefaultDeploymentUniqueLabelKey] = "cd68dc9"
 				return dep, &rs, nil
 			},
 			expectWorkload: func() *Workload {
@@ -257,8 +258,8 @@ func TestGetWorkloadForRef(t *testing.T) {
 					},
 					Replicas:             10,
 					StableRevision:       "stable",
-					CanaryRevision:       "c9dcf87d5",
+					CanaryRevision:       "cd68dc9",
-					PodTemplateHash:      "c9dcf87d5",
+					PodTemplateHash:      "cd68dc9",
 					RevisionLabelKey:     "pod-template-hash",
 					IsStatusConsistent:   true,
 					InRolloutProgressing: true,
@@ -299,7 +300,7 @@ func TestGetWorkloadForRef(t *testing.T) {
 					},
 					Replicas:             10,
 					StableRevision:       "stable",
-					CanaryRevision:       "c9dcf87d5",
+					CanaryRevision:       "cd68dc9",
 					PodTemplateHash:      "stable",
 					RevisionLabelKey:     "pod-template-hash",
 					IsStatusConsistent:   true,
@@ -355,7 +356,7 @@ func TestGetWorkloadForRef(t *testing.T) {
 			finder := NewControllerFinder(cli)
 			workload, err := finder.GetWorkloadForRef(rollout)
 			if !checkWorkloadEqual(workload, cs.expectWorkload()) {
-				t.Fatal("expected workload not equal got workload")
+				t.Fatalf("expected workload not equal got workload: \n expected: %v \n got: %v", DumpJSON(cs.expectWorkload()), DumpJSON(workload))
 			}
 			if res := checkErrorEqual(err, cs.err); res != "" {
 				t.Fatal(res)

pkg/util/luamanager/lua_test.go

@@ -22,14 +22,15 @@ import (
 	"reflect"
 	"testing"
 
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/util"
 	lua "github.com/yuin/gopher-lua"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	luajson "layeh.com/gopher-json"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 type LuaData struct {

pkg/util/parse_utils.go

@@ -235,7 +235,7 @@ func ParseWorkloadStatus(object client.Object) *WorkloadStatus {
 
 	case *unstructured.Unstructured:
 		return &WorkloadStatus{
-			ObservedGeneration:   int64(parseStatusIntFromUnstructured(o, "observedGeneration")),
+			ObservedGeneration:   parseStatusIntFromUnstructured(o, "observedGeneration"),
 			Replicas:             int32(parseStatusIntFromUnstructured(o, "replicas")),
 			ReadyReplicas:        int32(parseStatusIntFromUnstructured(o, "readyReplicas")),
 			UpdatedReplicas:      int32(parseStatusIntFromUnstructured(o, "updatedReplicas")),

pkg/util/patch/patch_utils.go

@@ -19,13 +19,14 @@ package patch
 import (
 	"strings"
 
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 const (

pkg/util/patch/patch_utils_test.go

@@ -21,8 +21,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/openkruise/rollouts/pkg/util"
 	v1 "k8s.io/api/core/v1"
+
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestCommonPatch(t *testing.T) {

pkg/util/pod_utils.go

@@ -20,10 +20,11 @@ import (
 	"context"
 	"strings"
 
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 )
 
 // IsPodReady returns true if a pod is ready; false otherwise.

pkg/util/rollout_utils.go

@@ -21,15 +21,13 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"strings"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruiseappsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util/client"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -39,6 +37,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	rolloutv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	rolloutv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util/client"
 )
 
 // RolloutState is annotation[rollouts.kruise.io/in-progressing] value

pkg/util/workloads_utils.go

@@ -30,8 +30,6 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/feature"
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -45,6 +43,9 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/feature"
 )
 
 var (

pkg/util/workloads_utils_test.go

@@ -25,7 +25,6 @@ import (
 	. "github.com/onsi/gomega"
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutapi "github.com/openkruise/rollouts/api"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,6 +32,8 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
 )
 
 var scheme *runtime.Scheme

pkg/webhook/rollout/validating/rollout_create_update_handler.go

@@ -23,16 +23,17 @@ import (
 	"net/http"
 	"reflect"
 
-	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	addmissionv1 "k8s.io/api/admission/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 )
 
 var (

pkg/webhook/rollout/validating/rollout_create_update_handler_test.go

@@ -21,9 +21,6 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
 	apps "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -31,6 +28,10 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
 )
 
 var (

pkg/webhook/rollout/validating/validate_v1alphal_rollout.go

@@ -22,14 +22,15 @@ import (
 	"reflect"
 	"strings"
 
-	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
 )
 
 func (h *RolloutCreateUpdateHandler) validateV1alpha1RolloutUpdate(oldObj, newObj *appsv1alpha1.Rollout) field.ErrorList {

pkg/webhook/rollout/validating/webhooks.go

@@ -17,9 +17,10 @@ limitations under the License.
 package validating
 
 import (
-	"github.com/openkruise/rollouts/pkg/webhook/types"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	"github.com/openkruise/rollouts/pkg/webhook/types"
 )
 
 // +kubebuilder:webhook:path=/validate-rollouts-kruise-io-rollout,mutating=false,failurePolicy=fail,sideEffects=None,admissionReviewVersions=v1;v1beta1,groups=rollouts.kruise.io,resources=rollouts,verbs=create;update,versions=v1alpha1;v1beta1,name=vrollout.kb.io

pkg/webhook/server.go

@@ -19,16 +19,18 @@ package webhook
 import (
 	"context"
 	"fmt"
-	"github.com/openkruise/rollouts/pkg/webhook/types"
 	"time"
 
-	webhookcontroller "github.com/openkruise/rollouts/pkg/webhook/util/controller"
+	"github.com/openkruise/rollouts/pkg/webhook/types"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/conversion"
+
+	webhookcontroller "github.com/openkruise/rollouts/pkg/webhook/util/controller"
 )
 
 type GateFunc func() (enabled bool)

pkg/webhook/util/controller/webhook_controller.go

@@ -22,12 +22,6 @@ import (
 	"sync"
 	"time"
 
-	webhooktypes "github.com/openkruise/rollouts/pkg/webhook/types"
-	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
-	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
-	"github.com/openkruise/rollouts/pkg/webhook/util/crd"
-	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
-	"github.com/openkruise/rollouts/pkg/webhook/util/writer"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	v1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -45,6 +39,13 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
+
+	webhooktypes "github.com/openkruise/rollouts/pkg/webhook/types"
+	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
+	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
+	"github.com/openkruise/rollouts/pkg/webhook/util/crd"
+	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
+	"github.com/openkruise/rollouts/pkg/webhook/util/writer"
 )
 
 const (

pkg/webhook/util/crd/crd.go

@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"reflect"
 
-	rolloutapi "github.com/openkruise/rollouts/api"
-	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apiextensionslisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
@@ -31,6 +29,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	webhookutil "github.com/openkruise/rollouts/pkg/webhook/util"
 )
 
 var (

pkg/webhook/util/writer/certwriter.go

@@ -24,8 +24,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
 	"k8s.io/klog/v2"
+
+	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
 )
 
 const (

pkg/webhook/util/writer/fs.go

@@ -24,9 +24,10 @@ import (
 	"os"
 	"path"
 
+	"k8s.io/klog/v2"
+
 	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
 	"github.com/openkruise/rollouts/pkg/webhook/util/writer/atomic"
-	"k8s.io/klog/v2"
 )
 
 const (

pkg/webhook/util/writer/secret.go

@@ -21,13 +21,14 @@ import (
 	"context"
 	"errors"
 
-	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
+
+	"github.com/openkruise/rollouts/pkg/webhook/util/generator"
 )
 
 const (

pkg/webhook/workload/mutating/unified_update_handler.go

@@ -23,11 +23,6 @@ import (
 	"net/http"
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	util2 "github.com/openkruise/rollouts/pkg/webhook/util"
-	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 	admissionv1 "k8s.io/api/admission/v1"
 	v1 "k8s.io/api/admissionregistration/v1"
 	apps "k8s.io/api/apps/v1"
@@ -39,6 +34,12 @@ import (
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
+	util2 "github.com/openkruise/rollouts/pkg/webhook/util"
+	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 )
 
 // UnifiedWorkloadHandler handles Pod
@@ -111,11 +112,11 @@ func (h *UnifiedWorkloadHandler) Handle(ctx context.Context, req admission.Reque
 		if !changed {
 			return admission.Allowed("")
 		}
-		marshalled, err := json.Marshal(newObj.Object)
+		marshaled, err := json.Marshal(newObj.Object)
 		if err != nil {
 			return admission.Errored(http.StatusInternalServerError, err)
 		}
-		return admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled)
+		return admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled)
 	}
 }
 

pkg/webhook/workload/mutating/unified_update_handler_test.go

@@ -24,13 +24,14 @@ import (
 	"testing"
 
 	kruiseappsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 func TestHandleStatefulSet(t *testing.T) {

pkg/webhook/workload/mutating/webhooks.go

@@ -17,10 +17,11 @@ limitations under the License.
 package mutating
 
 import (
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/webhook/types"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/webhook/types"
 )
 
 // +kubebuilder:webhook:path=/mutate-apps-kruise-io-v1alpha1-cloneset,mutating=true,failurePolicy=fail,sideEffects=None,admissionReviewVersions=v1;v1beta1,groups=apps.kruise.io,resources=clonesets,verbs=update,versions=v1alpha1,name=mcloneset.kb.io

pkg/webhook/workload/mutating/workload_update_handler.go

@@ -24,12 +24,6 @@ import (
 	"strings"
 
 	kruiseappsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	utilclient "github.com/openkruise/rollouts/pkg/util/client"
-	util2 "github.com/openkruise/rollouts/pkg/webhook/util"
-	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 	admissionv1 "k8s.io/api/admission/v1"
 	v1 "k8s.io/api/admissionregistration/v1"
 	apps "k8s.io/api/apps/v1"
@@ -44,6 +38,13 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	utilclient "github.com/openkruise/rollouts/pkg/util/client"
+	util2 "github.com/openkruise/rollouts/pkg/webhook/util"
+	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 )
 
 // WorkloadHandler handles Pod
@@ -113,7 +114,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if !changed {
 				return admission.Allowed("")
 			}
-			marshalled, err := json.Marshal(newObjClone)
+			marshaled, err := json.Marshal(newObjClone)
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
@@ -121,7 +122,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
-			return admission.PatchResponseFromRaw(original, marshalled)
+			return admission.PatchResponseFromRaw(original, marshaled)
 		case util.ControllerKruiseKindDS.Kind:
 			// check daemonset
 			newObj := &kruiseappsv1alpha1.DaemonSet{}
@@ -142,7 +143,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if !changed {
 				return admission.Allowed("")
 			}
-			marshalled, err := json.Marshal(newObjClone)
+			marshaled, err := json.Marshal(newObjClone)
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
@@ -150,7 +151,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
-			return admission.PatchResponseFromRaw(original, marshalled)
+			return admission.PatchResponseFromRaw(original, marshaled)
 		}
 
 	// native k8s deloyment
@@ -176,7 +177,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if !changed {
 				return admission.Allowed("")
 			}
-			marshalled, err := json.Marshal(newObjClone)
+			marshaled, err := json.Marshal(newObjClone)
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
@@ -184,7 +185,7 @@ func (h *WorkloadHandler) Handle(ctx context.Context, req admission.Request) adm
 			if err != nil {
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
-			return admission.PatchResponseFromRaw(original, marshalled)
+			return admission.PatchResponseFromRaw(original, marshaled)
 		}
 	}
 

pkg/webhook/workload/mutating/workload_update_handler_test.go

@@ -25,11 +25,6 @@ import (
 
 	kruisev1aplphal "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruiseappsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutapi "github.com/openkruise/rollouts/api"
-	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
-	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
-	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 	"github.com/stretchr/testify/assert"
 	addmissionv1 "k8s.io/api/admission/v1"
 	v12 "k8s.io/api/admissionregistration/v1"
@@ -44,6 +39,12 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
+	appsv1alpha1 "github.com/openkruise/rollouts/api/v1alpha1"
+	appsv1beta1 "github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
+	"github.com/openkruise/rollouts/pkg/webhook/util/configuration"
 )
 
 var (

test/e2e/rollout_test.go

@@ -31,9 +31,6 @@ import (
 	. "github.com/onsi/gomega"
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	"github.com/openkruise/rollouts/api/v1alpha1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -47,6 +44,10 @@ import (
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+	"github.com/openkruise/rollouts/api/v1alpha1"
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 const (

test/e2e/rollout_v1beta1_test.go

@@ -29,9 +29,6 @@ import (
 	"github.com/onsi/gomega/format"
 	appsv1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	appsv1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	"github.com/openkruise/rollouts/api/v1beta1"
-	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
-	"github.com/openkruise/rollouts/pkg/util"
 	apps "k8s.io/api/apps/v1"
 	scalingV1 "k8s.io/api/autoscaling/v1"
 	scalingV2 "k8s.io/api/autoscaling/v2"
@@ -46,6 +43,10 @@ import (
 	"k8s.io/klog/v2"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/openkruise/rollouts/api/v1beta1"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control"
+	"github.com/openkruise/rollouts/pkg/util"
 )
 
 var _ = SIGDescribe("Rollout v1beta1", func() {

test/e2e/suite_test.go

@@ -30,7 +30,6 @@ import (
 	. "github.com/onsi/gomega"
 	kruisev1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
 	kruisev1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	rolloutapi "github.com/openkruise/rollouts/api"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -42,6 +41,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 	"sigs.k8s.io/yaml"
+
+	rolloutapi "github.com/openkruise/rollouts/api"
 )
 
 var k8sClient client.Client