fix golang-lint-error

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

Author: shouchen.zz

.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"
-	"github.com/openkruise/rollouts/pkg/util"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+
 	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"