From d8bf9c9b53c9f618ddbdafca5cb674f6dae8f5e0 Mon Sep 17 00:00:00 2001 From: Zhen Zhang Date: Wed, 7 May 2025 10:24:43 +0800 Subject: [PATCH] update golang-lint to v2 and fix related goimports error (#2019) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 守辰 --- .github/workflows/ci.yaml | 4 +- .golangci.yml | 136 ++++++++---------- cmd/helm_hook/main.go | 3 +- hack/gen-openapi-spec/main.go | 5 +- pkg/control/pubcontrol/api.go | 5 +- pkg/control/pubcontrol/pub_control.go | 15 +- pkg/control/pubcontrol/pub_control_test.go | 3 +- pkg/control/sidecarcontrol/hash.go | 3 +- pkg/control/sidecarcontrol/hash_test.go | 3 +- pkg/control/sidecarcontrol/util.go | 15 +- pkg/control/sidecarcontrol/util_test.go | 7 +- .../advancedcronjob/advancedcronjob_utils.go | 3 +- .../broadcastjob/broadcastjob_utils.go | 3 +- .../cloneset/cloneset_predownload_image.go | 13 +- pkg/controller/cloneset/cloneset_status.go | 11 +- pkg/controller/cloneset/core/api.go | 3 +- pkg/controller/cloneset/sync/api.go | 9 +- .../cloneset/sync/cloneset_scale_test.go | 13 +- .../cloneset/sync/cloneset_sync_utils_test.go | 9 +- .../cloneset/sync/cloneset_update.go | 13 +- pkg/controller/controllers.go | 7 +- pkg/controller/daemonset/daemonset_history.go | 5 +- .../daemonset/daemonset_util_test.go | 3 +- pkg/controller/ephemeraljob/econtainer/api.go | 3 +- .../imagepulljob/imagepulljob_utils.go | 5 +- .../imagepulljob/imagepulljob_utils_test.go | 5 +- .../persistent_pod_state_controller.go | 3 +- .../pod_readiness_controller_test.go | 5 +- ...zz_resourcedistribution_controller_test.go | 5 +- .../sidecarset/sidecarset_processor.go | 3 +- .../inplace_update_action.go | 3 +- .../kill_container_action.go | 3 +- .../sidecar_terminator_controller_test.go | 3 +- pkg/controller/sidecarterminator/utils.go | 3 +- .../sidecarterminator/utils_test.go | 3 +- .../statefulset/stateful_set_utils.go | 3 +- .../uniteddeployment/adapter/adapter_test.go | 5 +- .../uniteddeployment/adapter/adapter_util.go | 3 +- .../adapter/cloneset_adapter.go | 7 +- .../uniteddeployment/allocator_test.go | 3 +- .../fuzz_uniteddeployment_controller_test.go | 7 +- pkg/controller/uniteddeployment/subset.go | 3 +- .../uniteddeployment/subset_control_test.go | 7 +- ...iteddeployment_controller_cloneset_test.go | 5 +- .../uniteddeployment_controller_test.go | 5 +- .../uniteddeployment_controller_utils.go | 5 +- .../fuzz_workloadspread_controller_test.go | 5 +- pkg/controller/workloadspread/reschedule.go | 3 +- .../workloadspread_controller_test.go | 5 +- .../workloadspread_controller_utils.go | 3 +- .../workloadspread_controller_utils_test.go | 3 +- .../containerrecreate/crr_daemon_util.go | 3 +- pkg/daemon/criruntime/factory_unix.go | 5 +- pkg/daemon/imagepuller/utils.go | 7 +- .../kuberuntime/kuberuntime_container.go | 2 +- pkg/daemon/podprobe/results_manager.go | 3 +- pkg/daemon/podprobe/results_manager_test.go | 5 +- pkg/daemon/util/secret_manager.go | 3 +- pkg/daemon/util/secret_manager_test.go | 3 +- pkg/util/configuration/configuration.go | 3 +- pkg/util/configuration/types.go | 3 +- .../container_launch_priority.go | 3 +- .../controllerfinder/controller_finder.go | 9 +- pkg/util/controllerfinder/pods_finder.go | 7 +- pkg/util/discovery/discovery.go | 5 +- pkg/util/fieldindex/register_test.go | 3 +- pkg/util/history/controller_history_test.go | 5 +- pkg/util/imagejob/imagejob_reader.go | 11 +- pkg/util/lifecycle/lifecycle_utils.go | 7 +- pkg/util/podprobemarker/pod_probe_marker.go | 7 +- pkg/util/podreadiness/pod_readiness.go | 3 +- pkg/util/podreadiness/pod_readiness_utils.go | 7 +- pkg/util/refmanager/ref_manager.go | 3 +- pkg/util/revision/revision.go | 5 +- pkg/util/revision/revision_test.go | 7 +- pkg/util/secret/parse.go | 3 +- pkg/util/specifieddelete/specified_delete.go | 3 +- pkg/util/updatesort/priority_sort.go | 5 +- pkg/util/updatesort/priority_sort_test.go | 3 +- pkg/util/updatesort/scatter_sort.go | 3 +- pkg/util/updatesort/scatter_sort_test.go | 3 +- .../fuzz_workloadspread_utils_test.go | 3 +- pkg/util/workloadspread/utils.go | 5 +- pkg/util/workloadspread/utils_test.go | 3 +- pkg/util/workloadspread/workloadspread.go | 3 +- .../workloadspread/workloadspread_test.go | 3 +- .../advancedcronjob_create_update_handler.go | 4 +- ...ancedcronjob_create_update_handler_test.go | 3 +- .../broadcastjob_create_update_handler.go | 4 +- .../validating/broadcastjob_test.go | 3 +- .../cloneset_create_update_handler.go | 4 +- .../mutating/crr_mutating_handler.go | 4 +- .../mutating/daemonset_mutating_handler.go | 4 +- .../imagelistpulljob_create_update_handler.go | 4 +- .../imagepulljob_create_update_handler.go | 4 +- .../imagepulljob_create_update_handler.go | 9 +- .../nodeimage_create_update_handler.go | 4 +- .../pod/mutating/persistent_pod_state.go | 9 +- .../pod/mutating/pod_create_update_handler.go | 4 +- pkg/webhook/pod/mutating/pod_probe_marker.go | 7 +- .../pod/mutating/pod_probe_marker_test.go | 5 +- pkg/webhook/pod/mutating/pod_readiness.go | 7 +- pkg/webhook/pod/mutating/sidecarset.go | 5 +- pkg/webhook/pod/mutating/sidecarset_test.go | 13 +- pkg/webhook/pod/mutating/workloadspread.go | 3 +- .../validating/pub_validating_test.go | 3 +- ...zz_resourcedistribution_validating_test.go | 5 +- .../sidecarset_create_update_handler.go | 4 +- .../sidecarset_create_update_handler.go | 3 +- pkg/webhook/sidecarset/validating/utils.go | 7 +- .../statefulset_create_update_handler.go | 8 +- .../validating/statefulset_validation.go | 2 +- .../uniteddeployment_create_update_handler.go | 4 +- .../fuzz_uniteddeployment_validation_test.go | 3 +- pkg/webhook/util/writer/external_test.go | 5 +- .../fuzz_workloadspread_validation_test.go | 5 +- .../validating/workloadspread_validation.go | 5 +- 117 files changed, 399 insertions(+), 318 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 343925214..3c89fe233 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ permissions: read-all env: # Common versions GO_VERSION: '1.22' - GOLANGCI_VERSION: 'v1.55.2' + GOLANGCI_VERSION: 'v2.1' DOCKER_BUILDX_VERSION: 'v0.4.2' # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run @@ -58,7 +58,7 @@ jobs: run: | make generate - name: Lint golang code - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 with: version: ${{ env.GOLANGCI_VERSION }} args: --verbose diff --git a/.golangci.yml b/.golangci.yml index abecc2358..5b249066b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,93 +1,73 @@ -# options for analysis running +version: "2" run: - # default concurrency is a available CPU number concurrency: 4 - - # timeout for analysis, e.g. 30s, 5m, default is 1m - deadline: 5m - - # exit code when at least one issue was found, default is 1 issues-exit-code: 1 - - # include test files or not, default is true tests: true - # list of build tags, all linters use it. Default is empty list. - #build-tags: - # - mytag - - # which dirs to skip: they won't be analyzed; - # can use regexp here: generated.*, regexp is applied on full path; - # default value is empty list, but next dirs are always skipped independently - # from this option's value: - # third_party$, testdata$, examples$, Godeps$, builtin$ - skip-dirs: - - apis - - pkg/client - - vendor - - test - - # which files to skip: they will be analyzed, but issues from them - # won't be reported. Default value is empty list, but there is - # no need to include all autogenerated files, we confidently recognize - # autogenerated files. If it's not please let us know. - skip-files: - # - ".*\\.my\\.go$" - # - lib/bad.go # output configuration options output: - # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" - format: colored-line-number - - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - - -# all available settings of specific linters -linters-settings: - golint: - # minimal confidence for issues, default is 0.8 - min-confidence: 0.8 - gofmt: - # simplify code: gofmt with `-s` option, true by default - simplify: true - goimports: - # put imports beginning with prefix after 3rd-party packages; - # it's a comma-separated list of prefixes - #local-prefixes: github.com/openkruise/kruise - misspell: - # Correct spellings using locale preferences for US or UK. - # Default is to use a neutral variety of English. - # Setting locale to US will correct the British spelling of 'colour' to 'color'. - locale: default - #ignore-words: - # - someword - depguard: - rules: - forbid-pkg-errors: - deny: - - pkg: "github.com/pkg/errors" - dsc: Should be replaced with standard lib errors or fmt.Errorf - + formats: + text: + path: stdout + colors: true linters: - fast: false - disable-all: true + default: none enable: - # TODO Enforce the below linters later - - gofmt + - depguard - govet - - goimports - ineffassign - misspell - - vet - unconvert - unused - - depguard -issues: - exclude: - # staticcheck - - 'SA1019: package github.com/golang/protobuf/proto is deprecated: Use the "google.golang.org/protobuf/proto" package instead' + settings: + misspell: + # Correct spellings using locale preferences for US or UK. + # Default is to use a neutral variety of English. + # Setting locale to US will correct the British spelling of 'colour' to 'color'. + locale: US + depguard: + rules: + forbid-pkg-errors: + deny: + - pkg: "github.com/pkg/errors" + desc: Should be replaced with standard lib errors or fmt.Errorf + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + rules: + - path: (.+)\.go$ + text: 'SA1019: package github.com/golang/protobuf/proto is deprecated: Use the "google.golang.org/protobuf/proto" package instead' + paths: + - third_party$ + - builtin$ + - examples$ + - apis + - pkg/client + - vendor + - test +formatters: + enable: + - gofmt + - goimports + settings: + gofmt: + simplify: true + goimports: + # put imports beginning with prefix after 3rd-party packages; + local-prefixes: + - github.com/openkruise/kruise + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ + - apis + - pkg/client + - vendor + - test diff --git a/cmd/helm_hook/main.go b/cmd/helm_hook/main.go index 8882f1d43..dbc2a85b7 100644 --- a/cmd/helm_hook/main.go +++ b/cmd/helm_hook/main.go @@ -20,9 +20,10 @@ import ( "context" "log" - kruiseclientset "github.com/openkruise/kruise/pkg/client/clientset/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" + + kruiseclientset "github.com/openkruise/kruise/pkg/client/clientset/versioned" ) func main() { diff --git a/hack/gen-openapi-spec/main.go b/hack/gen-openapi-spec/main.go index 5b06af16f..acfea3bae 100644 --- a/hack/gen-openapi-spec/main.go +++ b/hack/gen-openapi-spec/main.go @@ -23,11 +23,12 @@ import ( "os" "strings" + "k8s.io/kube-openapi/pkg/common" + "k8s.io/kube-openapi/pkg/validation/spec" + appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" - "k8s.io/kube-openapi/pkg/common" - "k8s.io/kube-openapi/pkg/validation/spec" ) // Generate OpenAPI spec definitions for Kruise Resources diff --git a/pkg/control/pubcontrol/api.go b/pkg/control/pubcontrol/api.go index fc4e4e8ee..500ef8852 100644 --- a/pkg/control/pubcontrol/api.go +++ b/pkg/control/pubcontrol/api.go @@ -17,12 +17,13 @@ limitations under the License. package pubcontrol import ( - policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" - "github.com/openkruise/kruise/pkg/util/controllerfinder" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" + + policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" + "github.com/openkruise/kruise/pkg/util/controllerfinder" ) var PubControl pubControl diff --git a/pkg/control/pubcontrol/pub_control.go b/pkg/control/pubcontrol/pub_control.go index 6e7e5606e..f63f2898a 100644 --- a/pkg/control/pubcontrol/pub_control.go +++ b/pkg/control/pubcontrol/pub_control.go @@ -22,13 +22,6 @@ import ( "strconv" "strings" - appspub "github.com/openkruise/kruise/apis/apps/pub" - policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" - "github.com/openkruise/kruise/pkg/control/sidecarcontrol" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" - "github.com/openkruise/kruise/pkg/util/controllerfinder" - "github.com/openkruise/kruise/pkg/util/inplaceupdate" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -36,6 +29,14 @@ import ( "k8s.io/klog/v2" kubecontroller "k8s.io/kubernetes/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/client" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" + "github.com/openkruise/kruise/pkg/control/sidecarcontrol" + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" + "github.com/openkruise/kruise/pkg/util/controllerfinder" + "github.com/openkruise/kruise/pkg/util/inplaceupdate" ) type commonControl struct { diff --git a/pkg/control/pubcontrol/pub_control_test.go b/pkg/control/pubcontrol/pub_control_test.go index d59954363..0aa4753cd 100644 --- a/pkg/control/pubcontrol/pub_control_test.go +++ b/pkg/control/pubcontrol/pub_control_test.go @@ -20,8 +20,9 @@ import ( "fmt" "testing" - "github.com/openkruise/kruise/apis/apps/pub" corev1 "k8s.io/api/core/v1" + + "github.com/openkruise/kruise/apis/apps/pub" ) func TestIsPodUnavailableChanged(t *testing.T) { diff --git a/pkg/control/sidecarcontrol/hash.go b/pkg/control/sidecarcontrol/hash.go index be631500d..c93a6ee03 100644 --- a/pkg/control/sidecarcontrol/hash.go +++ b/pkg/control/sidecarcontrol/hash.go @@ -21,8 +21,9 @@ import ( "encoding/json" "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "k8s.io/apimachinery/pkg/util/rand" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) // SidecarSetHash returns a hash of the SidecarSet. diff --git a/pkg/control/sidecarcontrol/hash_test.go b/pkg/control/sidecarcontrol/hash_test.go index 6bf9c8f9e..47ad0f5a8 100644 --- a/pkg/control/sidecarcontrol/hash_test.go +++ b/pkg/control/sidecarcontrol/hash_test.go @@ -3,9 +3,10 @@ package sidecarcontrol import ( "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) var always = corev1.ContainerRestartPolicyAlways diff --git a/pkg/control/sidecarcontrol/util.go b/pkg/control/sidecarcontrol/util.go index b590f4584..28c470bba 100644 --- a/pkg/control/sidecarcontrol/util.go +++ b/pkg/control/sidecarcontrol/util.go @@ -25,13 +25,6 @@ import ( "strings" jsonpatch "github.com/evanphx/json-patch" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/features" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" - "github.com/openkruise/kruise/pkg/util/configuration" - "github.com/openkruise/kruise/pkg/util/expectations" - utilfeature "github.com/openkruise/kruise/pkg/util/feature" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,6 +35,14 @@ import ( kubecontroller "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/fieldpath" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/features" + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" + "github.com/openkruise/kruise/pkg/util/configuration" + "github.com/openkruise/kruise/pkg/util/expectations" + utilfeature "github.com/openkruise/kruise/pkg/util/feature" ) const ( diff --git a/pkg/control/sidecarcontrol/util_test.go b/pkg/control/sidecarcontrol/util_test.go index cff328d7f..152cb780c 100644 --- a/pkg/control/sidecarcontrol/util_test.go +++ b/pkg/control/sidecarcontrol/util_test.go @@ -24,14 +24,15 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/configuration" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/configuration" ) func init() { diff --git a/pkg/controller/advancedcronjob/advancedcronjob_utils.go b/pkg/controller/advancedcronjob/advancedcronjob_utils.go index 3592a7b68..798b2e273 100644 --- a/pkg/controller/advancedcronjob/advancedcronjob_utils.go +++ b/pkg/controller/advancedcronjob/advancedcronjob_utils.go @@ -5,8 +5,9 @@ import ( "strings" "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func FindTemplateKind(spec appsv1alpha1.AdvancedCronJobSpec) appsv1alpha1.TemplateKind { diff --git a/pkg/controller/broadcastjob/broadcastjob_utils.go b/pkg/controller/broadcastjob/broadcastjob_utils.go index 8903564d7..6cdd0e611 100644 --- a/pkg/controller/broadcastjob/broadcastjob_utils.go +++ b/pkg/controller/broadcastjob/broadcastjob_utils.go @@ -21,10 +21,11 @@ import ( "fmt" "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) // IsJobFinished returns true when finishing job diff --git a/pkg/controller/cloneset/cloneset_predownload_image.go b/pkg/controller/cloneset/cloneset_predownload_image.go index cdfb3d92d..87eb570eb 100644 --- a/pkg/controller/cloneset/cloneset_predownload_image.go +++ b/pkg/controller/cloneset/cloneset_predownload_image.go @@ -20,12 +20,6 @@ import ( "context" "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - clonesetcore "github.com/openkruise/kruise/pkg/controller/cloneset/core" - clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" - "github.com/openkruise/kruise/pkg/util" - imagejobutilfunc "github.com/openkruise/kruise/pkg/util/imagejob/utilfunction" - "github.com/openkruise/kruise/pkg/util/inplaceupdate" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -35,6 +29,13 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller/history" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + clonesetcore "github.com/openkruise/kruise/pkg/controller/cloneset/core" + clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" + "github.com/openkruise/kruise/pkg/util" + imagejobutilfunc "github.com/openkruise/kruise/pkg/util/imagejob/utilfunction" + "github.com/openkruise/kruise/pkg/util/inplaceupdate" ) func (r *ReconcileCloneSet) createImagePullJobsForInPlaceUpdate(cs *appsv1alpha1.CloneSet, currentRevision, updateRevision *apps.ControllerRevision) error { diff --git a/pkg/controller/cloneset/cloneset_status.go b/pkg/controller/cloneset/cloneset_status.go index f876d5587..945345171 100644 --- a/pkg/controller/cloneset/cloneset_status.go +++ b/pkg/controller/cloneset/cloneset_status.go @@ -20,16 +20,17 @@ import ( "context" "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - clonesetcore "github.com/openkruise/kruise/pkg/controller/cloneset/core" - "github.com/openkruise/kruise/pkg/controller/cloneset/sync" - clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" - "github.com/openkruise/kruise/pkg/util" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + clonesetcore "github.com/openkruise/kruise/pkg/controller/cloneset/core" + "github.com/openkruise/kruise/pkg/controller/cloneset/sync" + clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" + "github.com/openkruise/kruise/pkg/util" ) // StatusUpdater is interface for updating CloneSet status. diff --git a/pkg/controller/cloneset/core/api.go b/pkg/controller/cloneset/core/api.go index eea935797..8cf013180 100644 --- a/pkg/controller/cloneset/core/api.go +++ b/pkg/controller/cloneset/core/api.go @@ -17,10 +17,11 @@ limitations under the License. package core import ( + v1 "k8s.io/api/core/v1" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" "github.com/openkruise/kruise/pkg/util/inplaceupdate" - v1 "k8s.io/api/core/v1" ) type Control interface { diff --git a/pkg/controller/cloneset/sync/api.go b/pkg/controller/cloneset/sync/api.go index 0bb438de7..587913ddf 100644 --- a/pkg/controller/cloneset/sync/api.go +++ b/pkg/controller/cloneset/sync/api.go @@ -17,15 +17,16 @@ limitations under the License. package sync import ( + apps "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + "k8s.io/client-go/tools/record" + "sigs.k8s.io/controller-runtime/pkg/client" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" "github.com/openkruise/kruise/pkg/util/controllerfinder" "github.com/openkruise/kruise/pkg/util/inplaceupdate" "github.com/openkruise/kruise/pkg/util/lifecycle" - apps "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" - "k8s.io/client-go/tools/record" - "sigs.k8s.io/controller-runtime/pkg/client" ) // Interface for managing pods scaling and updating. diff --git a/pkg/controller/cloneset/sync/cloneset_scale_test.go b/pkg/controller/cloneset/sync/cloneset_scale_test.go index 3a6aa8adf..7d68758c6 100644 --- a/pkg/controller/cloneset/sync/cloneset_scale_test.go +++ b/pkg/controller/cloneset/sync/cloneset_scale_test.go @@ -24,12 +24,6 @@ import ( "testing" "time" - appspub "github.com/openkruise/kruise/apis/apps/pub" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - clonesettest "github.com/openkruise/kruise/pkg/controller/cloneset/test" - clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/expectations" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -45,6 +39,13 @@ import ( utilpointer "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + clonesettest "github.com/openkruise/kruise/pkg/controller/cloneset/test" + clonesetutils "github.com/openkruise/kruise/pkg/controller/cloneset/utils" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/expectations" ) var ( diff --git a/pkg/controller/cloneset/sync/cloneset_sync_utils_test.go b/pkg/controller/cloneset/sync/cloneset_sync_utils_test.go index 50dd0926b..c23551072 100644 --- a/pkg/controller/cloneset/sync/cloneset_sync_utils_test.go +++ b/pkg/controller/cloneset/sync/cloneset_sync_utils_test.go @@ -21,15 +21,16 @@ import ( "reflect" "testing" + apps "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/openkruise/kruise/pkg/features" utilfeature "github.com/openkruise/kruise/pkg/util/feature" "github.com/openkruise/kruise/pkg/util/revision" - apps "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" ) func TestCalculateDiffsWithExpectation(t *testing.T) { diff --git a/pkg/controller/cloneset/sync/cloneset_update.go b/pkg/controller/cloneset/sync/cloneset_update.go index 031b55f6d..acf0c4df2 100644 --- a/pkg/controller/cloneset/sync/cloneset_update.go +++ b/pkg/controller/cloneset/sync/cloneset_update.go @@ -22,6 +22,13 @@ import ( "sort" "time" + apps "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/klog/v2" + "sigs.k8s.io/controller-runtime/pkg/client" + appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" @@ -35,12 +42,6 @@ import ( "github.com/openkruise/kruise/pkg/util/lifecycle" "github.com/openkruise/kruise/pkg/util/specifieddelete" "github.com/openkruise/kruise/pkg/util/updatesort" - apps "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/klog/v2" - "sigs.k8s.io/controller-runtime/pkg/client" ) func (c *realControl) Update(cs *appsv1alpha1.CloneSet, diff --git a/pkg/controller/controllers.go b/pkg/controller/controllers.go index 621136cc6..091434f53 100644 --- a/pkg/controller/controllers.go +++ b/pkg/controller/controllers.go @@ -17,6 +17,10 @@ limitations under the License. package controller import ( + "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/klog/v2" + "sigs.k8s.io/controller-runtime/pkg/manager" + "github.com/openkruise/kruise/pkg/controller/advancedcronjob" "github.com/openkruise/kruise/pkg/controller/broadcastjob" "github.com/openkruise/kruise/pkg/controller/cloneset" @@ -38,9 +42,6 @@ import ( "github.com/openkruise/kruise/pkg/controller/statefulset" "github.com/openkruise/kruise/pkg/controller/uniteddeployment" "github.com/openkruise/kruise/pkg/controller/workloadspread" - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/klog/v2" - "sigs.k8s.io/controller-runtime/pkg/manager" ) var controllerAddFuncs []func(manager.Manager) error diff --git a/pkg/controller/daemonset/daemonset_history.go b/pkg/controller/daemonset/daemonset_history.go index 359c452ca..807f1ec98 100644 --- a/pkg/controller/daemonset/daemonset_history.go +++ b/pkg/controller/daemonset/daemonset_history.go @@ -23,8 +23,6 @@ import ( "fmt" "reflect" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" apps "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,6 +32,9 @@ import ( "k8s.io/klog/v2" kubecontroller "k8s.io/kubernetes/pkg/controller" labelsutil "k8s.io/kubernetes/pkg/util/labels" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func (dsc *ReconcileDaemonSet) constructHistory(ctx context.Context, ds *appsv1alpha1.DaemonSet) (cur *apps.ControllerRevision, old []*apps.ControllerRevision, err error) { diff --git a/pkg/controller/daemonset/daemonset_util_test.go b/pkg/controller/daemonset/daemonset_util_test.go index 653afdf56..1a3a4c277 100644 --- a/pkg/controller/daemonset/daemonset_util_test.go +++ b/pkg/controller/daemonset/daemonset_util_test.go @@ -21,7 +21,6 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -32,6 +31,8 @@ import ( kubecontroller "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/securitycontext" labelsutil "k8s.io/kubernetes/pkg/util/labels" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func Test_nodeInSameCondition(t *testing.T) { diff --git a/pkg/controller/ephemeraljob/econtainer/api.go b/pkg/controller/ephemeraljob/econtainer/api.go index e7d84abdd..48c07fcf1 100644 --- a/pkg/controller/ephemeraljob/econtainer/api.go +++ b/pkg/controller/ephemeraljob/econtainer/api.go @@ -3,8 +3,9 @@ package econtainer import ( "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) type EphemeralContainerInterface interface { diff --git a/pkg/controller/imagepulljob/imagepulljob_utils.go b/pkg/controller/imagepulljob/imagepulljob_utils.go index fd526b104..06e59e0b0 100644 --- a/pkg/controller/imagepulljob/imagepulljob_utils.go +++ b/pkg/controller/imagepulljob/imagepulljob_utils.go @@ -22,8 +22,6 @@ import ( "reflect" "strings" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -31,6 +29,9 @@ import ( "k8s.io/klog/v2" utilpointer "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) type syncAction string diff --git a/pkg/controller/imagepulljob/imagepulljob_utils_test.go b/pkg/controller/imagepulljob/imagepulljob_utils_test.go index c88471672..cd07c5c6b 100644 --- a/pkg/controller/imagepulljob/imagepulljob_utils_test.go +++ b/pkg/controller/imagepulljob/imagepulljob_utils_test.go @@ -20,12 +20,13 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilpointer "k8s.io/utils/pointer" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func TestTargetFromSource(t *testing.T) { diff --git a/pkg/controller/persistentpodstate/persistent_pod_state_controller.go b/pkg/controller/persistentpodstate/persistent_pod_state_controller.go index c9f967173..f7cdfcccf 100644 --- a/pkg/controller/persistentpodstate/persistent_pod_state_controller.go +++ b/pkg/controller/persistentpodstate/persistent_pod_state_controller.go @@ -23,9 +23,10 @@ import ( "strconv" "strings" - "github.com/openkruise/kruise/pkg/util/configuration" "k8s.io/utils/ptr" + "github.com/openkruise/kruise/pkg/util/configuration" + ctrlUtil "github.com/openkruise/kruise/pkg/controller/util" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/controller/podreadiness/pod_readiness_controller_test.go b/pkg/controller/podreadiness/pod_readiness_controller_test.go index 9f91b84b9..af2cb6f64 100644 --- a/pkg/controller/podreadiness/pod_readiness_controller_test.go +++ b/pkg/controller/podreadiness/pod_readiness_controller_test.go @@ -20,14 +20,15 @@ import ( "context" "testing" - appspub "github.com/openkruise/kruise/apis/apps/pub" - utilpodreadiness "github.com/openkruise/kruise/pkg/util/podreadiness" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + utilpodreadiness "github.com/openkruise/kruise/pkg/util/podreadiness" ) func TestReconcile(t *testing.T) { diff --git a/pkg/controller/resourcedistribution/fuzz_resourcedistribution_controller_test.go b/pkg/controller/resourcedistribution/fuzz_resourcedistribution_controller_test.go index a1c99eeee..bf40bd5d1 100644 --- a/pkg/controller/resourcedistribution/fuzz_resourcedistribution_controller_test.go +++ b/pkg/controller/resourcedistribution/fuzz_resourcedistribution_controller_test.go @@ -20,10 +20,11 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - fuzzutils "github.com/openkruise/kruise/test/fuzz" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + fuzzutils "github.com/openkruise/kruise/test/fuzz" ) func FuzzMatchFunctions(f *testing.F) { diff --git a/pkg/controller/sidecarset/sidecarset_processor.go b/pkg/controller/sidecarset/sidecarset_processor.go index 6e6aea6fa..09584187c 100644 --- a/pkg/controller/sidecarset/sidecarset_processor.go +++ b/pkg/controller/sidecarset/sidecarset_processor.go @@ -25,6 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + podutil "k8s.io/kubernetes/pkg/api/v1/pod" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/openkruise/kruise/pkg/control/sidecarcontrol" controlutil "github.com/openkruise/kruise/pkg/controller/util" @@ -33,7 +35,6 @@ import ( "github.com/openkruise/kruise/pkg/util/fieldindex" historyutil "github.com/openkruise/kruise/pkg/util/history" webhookutil "github.com/openkruise/kruise/pkg/webhook/util" - podutil "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/sidecarterminator/inplace_update_action.go b/pkg/controller/sidecarterminator/inplace_update_action.go index bb72d5a0b..2835edde1 100644 --- a/pkg/controller/sidecarterminator/inplace_update_action.go +++ b/pkg/controller/sidecarterminator/inplace_update_action.go @@ -19,13 +19,14 @@ package sidecarterminator import ( "context" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/retry" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func (r *ReconcileSidecarTerminator) executeInPlaceUpdateAction(originalPod *corev1.Pod, sidecars sets.Set[string]) error { diff --git a/pkg/controller/sidecarterminator/kill_container_action.go b/pkg/controller/sidecarterminator/kill_container_action.go index bd13ef072..e9df20fe9 100644 --- a/pkg/controller/sidecarterminator/kill_container_action.go +++ b/pkg/controller/sidecarterminator/kill_container_action.go @@ -20,13 +20,14 @@ import ( "context" "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func (r *ReconcileSidecarTerminator) executeKillContainerAction(pod *corev1.Pod, sidecars sets.Set[string]) error { diff --git a/pkg/controller/sidecarterminator/sidecar_terminator_controller_test.go b/pkg/controller/sidecarterminator/sidecar_terminator_controller_test.go index 4347f1e17..4b1416ac4 100644 --- a/pkg/controller/sidecarterminator/sidecar_terminator_controller_test.go +++ b/pkg/controller/sidecarterminator/sidecar_terminator_controller_test.go @@ -23,7 +23,6 @@ import ( "sort" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,6 +33,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) const ( diff --git a/pkg/controller/sidecarterminator/utils.go b/pkg/controller/sidecarterminator/utils.go index 57973727d..54a4a11d6 100644 --- a/pkg/controller/sidecarterminator/utils.go +++ b/pkg/controller/sidecarterminator/utils.go @@ -19,9 +19,10 @@ package sidecarterminator import ( "strings" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func isInterestingPod(pod *corev1.Pod) bool { diff --git a/pkg/controller/sidecarterminator/utils_test.go b/pkg/controller/sidecarterminator/utils_test.go index 22d9c725f..e0727cc08 100644 --- a/pkg/controller/sidecarterminator/utils_test.go +++ b/pkg/controller/sidecarterminator/utils_test.go @@ -19,10 +19,11 @@ package sidecarterminator import ( "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestInterestingPod(t *testing.T) { diff --git a/pkg/controller/statefulset/stateful_set_utils.go b/pkg/controller/statefulset/stateful_set_utils.go index af8dab4bf..e9cf0119d 100644 --- a/pkg/controller/statefulset/stateful_set_utils.go +++ b/pkg/controller/statefulset/stateful_set_utils.go @@ -26,7 +26,6 @@ import ( "strconv" "time" - apiutil "github.com/openkruise/kruise/pkg/util/api" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -39,6 +38,8 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/history" + apiutil "github.com/openkruise/kruise/pkg/util/api" + appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" "github.com/openkruise/kruise/pkg/features" diff --git a/pkg/controller/uniteddeployment/adapter/adapter_test.go b/pkg/controller/uniteddeployment/adapter/adapter_test.go index ff2fc3986..a94681eab 100644 --- a/pkg/controller/uniteddeployment/adapter/adapter_test.go +++ b/pkg/controller/uniteddeployment/adapter/adapter_test.go @@ -19,14 +19,15 @@ package adapter import ( "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/apis/apps/v1beta1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/scale/scheme/appsv1beta1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/apis/apps/v1beta1" ) func TestPostUpdate(t *testing.T) { diff --git a/pkg/controller/uniteddeployment/adapter/adapter_util.go b/pkg/controller/uniteddeployment/adapter/adapter_util.go index 039a8aabe..9d7733d3c 100644 --- a/pkg/controller/uniteddeployment/adapter/adapter_util.go +++ b/pkg/controller/uniteddeployment/adapter/adapter_util.go @@ -19,12 +19,13 @@ package adapter import ( "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/validation" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func getSubsetPrefix(controllerName, subsetName string) string { diff --git a/pkg/controller/uniteddeployment/adapter/cloneset_adapter.go b/pkg/controller/uniteddeployment/adapter/cloneset_adapter.go index df5c5e7b4..e78081fc9 100644 --- a/pkg/controller/uniteddeployment/adapter/cloneset_adapter.go +++ b/pkg/controller/uniteddeployment/adapter/cloneset_adapter.go @@ -9,15 +9,16 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/ptr" - alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/refmanager" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/refmanager" ) type CloneSetAdapter struct { diff --git a/pkg/controller/uniteddeployment/allocator_test.go b/pkg/controller/uniteddeployment/allocator_test.go index 982f6ee42..dac7d4f4a 100644 --- a/pkg/controller/uniteddeployment/allocator_test.go +++ b/pkg/controller/uniteddeployment/allocator_test.go @@ -21,9 +21,10 @@ import ( "sort" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func sortToAllocator(infos subsetInfos) *specificAllocator { diff --git a/pkg/controller/uniteddeployment/fuzz_uniteddeployment_controller_test.go b/pkg/controller/uniteddeployment/fuzz_uniteddeployment_controller_test.go index a97a0783c..4eb738747 100644 --- a/pkg/controller/uniteddeployment/fuzz_uniteddeployment_controller_test.go +++ b/pkg/controller/uniteddeployment/fuzz_uniteddeployment_controller_test.go @@ -20,13 +20,14 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/controller/uniteddeployment/adapter" - fuzzutils "github.com/openkruise/kruise/test/fuzz" v1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/controller/uniteddeployment/adapter" + fuzzutils "github.com/openkruise/kruise/test/fuzz" ) var fakeScheme = runtime.NewScheme() diff --git a/pkg/controller/uniteddeployment/subset.go b/pkg/controller/uniteddeployment/subset.go index ad4915678..c5fe06e5e 100644 --- a/pkg/controller/uniteddeployment/subset.go +++ b/pkg/controller/uniteddeployment/subset.go @@ -17,9 +17,10 @@ limitations under the License. package uniteddeployment import ( - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) // Subset stores the details of a subset resource owned by one UnitedDeployment. diff --git a/pkg/controller/uniteddeployment/subset_control_test.go b/pkg/controller/uniteddeployment/subset_control_test.go index d89ef621b..364710bb6 100644 --- a/pkg/controller/uniteddeployment/subset_control_test.go +++ b/pkg/controller/uniteddeployment/subset_control_test.go @@ -8,9 +8,6 @@ import ( "math/rand" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/apis/apps/v1beta1" - "github.com/openkruise/kruise/pkg/controller/uniteddeployment/adapter" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -18,6 +15,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/apis/apps/v1beta1" + "github.com/openkruise/kruise/pkg/controller/uniteddeployment/adapter" ) func init() { diff --git a/pkg/controller/uniteddeployment/uniteddeployment_controller_cloneset_test.go b/pkg/controller/uniteddeployment/uniteddeployment_controller_cloneset_test.go index 9d091e8c8..ef50f435e 100644 --- a/pkg/controller/uniteddeployment/uniteddeployment_controller_cloneset_test.go +++ b/pkg/controller/uniteddeployment/uniteddeployment_controller_cloneset_test.go @@ -8,8 +8,6 @@ import ( "testing" "github.com/onsi/gomega" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -19,6 +17,9 @@ import ( "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" ) func TestCloneSetAll(t *testing.T) { diff --git a/pkg/controller/uniteddeployment/uniteddeployment_controller_test.go b/pkg/controller/uniteddeployment/uniteddeployment_controller_test.go index cc842c0dc..3c4ba22c6 100644 --- a/pkg/controller/uniteddeployment/uniteddeployment_controller_test.go +++ b/pkg/controller/uniteddeployment/uniteddeployment_controller_test.go @@ -22,8 +22,6 @@ import ( "time" "github.com/onsi/gomega" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - utilclient "github.com/openkruise/kruise/pkg/util/client" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -31,6 +29,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + utilclient "github.com/openkruise/kruise/pkg/util/client" ) var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: "default"}} diff --git a/pkg/controller/uniteddeployment/uniteddeployment_controller_utils.go b/pkg/controller/uniteddeployment/uniteddeployment_controller_utils.go index 9675915be..062c50dbd 100644 --- a/pkg/controller/uniteddeployment/uniteddeployment_controller_utils.go +++ b/pkg/controller/uniteddeployment/uniteddeployment_controller_utils.go @@ -23,11 +23,12 @@ import ( "strconv" "strings" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util/expectations" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util/expectations" ) const updateRetries = 5 diff --git a/pkg/controller/workloadspread/fuzz_workloadspread_controller_test.go b/pkg/controller/workloadspread/fuzz_workloadspread_controller_test.go index 6ca83ff4c..cdbd548a7 100644 --- a/pkg/controller/workloadspread/fuzz_workloadspread_controller_test.go +++ b/pkg/controller/workloadspread/fuzz_workloadspread_controller_test.go @@ -21,12 +21,13 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - fuzzutils "github.com/openkruise/kruise/test/fuzz" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + fuzzutils "github.com/openkruise/kruise/test/fuzz" ) var ( diff --git a/pkg/controller/workloadspread/reschedule.go b/pkg/controller/workloadspread/reschedule.go index a42905367..e5a894adc 100644 --- a/pkg/controller/workloadspread/reschedule.go +++ b/pkg/controller/workloadspread/reschedule.go @@ -20,10 +20,11 @@ import ( "context" "time" - "github.com/openkruise/kruise/pkg/controller/util" corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" + "github.com/openkruise/kruise/pkg/controller/util" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" wsutil "github.com/openkruise/kruise/pkg/webhook/workloadspread/validating" ) diff --git a/pkg/controller/workloadspread/workloadspread_controller_test.go b/pkg/controller/workloadspread/workloadspread_controller_test.go index 16879fcce..c993f649b 100644 --- a/pkg/controller/workloadspread/workloadspread_controller_test.go +++ b/pkg/controller/workloadspread/workloadspread_controller_test.go @@ -25,8 +25,6 @@ import ( "testing" "time" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/configuration" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -44,6 +42,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/configuration" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/openkruise/kruise/pkg/util/controllerfinder" "github.com/openkruise/kruise/pkg/util/fieldindex" diff --git a/pkg/controller/workloadspread/workloadspread_controller_utils.go b/pkg/controller/workloadspread/workloadspread_controller_utils.go index 831454f8f..37d997845 100644 --- a/pkg/controller/workloadspread/workloadspread_controller_utils.go +++ b/pkg/controller/workloadspread/workloadspread_controller_utils.go @@ -20,13 +20,14 @@ import ( "encoding/json" "reflect" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/strategicpatch" schedulecorev1 "k8s.io/component-helpers/scheduling/corev1" "k8s.io/component-helpers/scheduling/corev1/nodeaffinity" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) // NewWorkloadSpreadSubsetCondition creates a new WorkloadSpreadSubset condition. diff --git a/pkg/controller/workloadspread/workloadspread_controller_utils_test.go b/pkg/controller/workloadspread/workloadspread_controller_utils_test.go index 966ec426f..0006037d4 100644 --- a/pkg/controller/workloadspread/workloadspread_controller_utils_test.go +++ b/pkg/controller/workloadspread/workloadspread_controller_utils_test.go @@ -20,11 +20,12 @@ import ( "fmt" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) const ( diff --git a/pkg/daemon/containerrecreate/crr_daemon_util.go b/pkg/daemon/containerrecreate/crr_daemon_util.go index 0a0869f9e..e95e4a6bc 100644 --- a/pkg/daemon/containerrecreate/crr_daemon_util.go +++ b/pkg/daemon/containerrecreate/crr_daemon_util.go @@ -21,13 +21,14 @@ import ( "fmt" "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" kubeletcontainer "k8s.io/kubernetes/pkg/kubelet/container" utilpointer "k8s.io/utils/pointer" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) const ( diff --git a/pkg/daemon/criruntime/factory_unix.go b/pkg/daemon/criruntime/factory_unix.go index 8c0bc8594..fb71c22dc 100644 --- a/pkg/daemon/criruntime/factory_unix.go +++ b/pkg/daemon/criruntime/factory_unix.go @@ -24,10 +24,11 @@ import ( "fmt" "os" - runtimeimage "github.com/openkruise/kruise/pkg/daemon/criruntime/imageruntime" - daemonutil "github.com/openkruise/kruise/pkg/daemon/util" "k8s.io/klog/v2" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" + + runtimeimage "github.com/openkruise/kruise/pkg/daemon/criruntime/imageruntime" + daemonutil "github.com/openkruise/kruise/pkg/daemon/util" ) const ( diff --git a/pkg/daemon/imagepuller/utils.go b/pkg/daemon/imagepuller/utils.go index 2ff1f8f6c..4ffc172df 100644 --- a/pkg/daemon/imagepuller/utils.go +++ b/pkg/daemon/imagepuller/utils.go @@ -22,12 +22,13 @@ import ( "math/rand" "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - clientalpha1 "github.com/openkruise/kruise/pkg/client/clientset/versioned/typed/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" "golang.org/x/time/rate" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + clientalpha1 "github.com/openkruise/kruise/pkg/client/clientset/versioned/typed/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func logNewImages(oldObj, newObj *appsv1alpha1.NodeImage) { diff --git a/pkg/daemon/kuberuntime/kuberuntime_container.go b/pkg/daemon/kuberuntime/kuberuntime_container.go index e2a71b1dd..2c8429906 100644 --- a/pkg/daemon/kuberuntime/kuberuntime_container.go +++ b/pkg/daemon/kuberuntime/kuberuntime_container.go @@ -189,7 +189,7 @@ func (m *genericRuntimeManager) KillContainer(pod *v1.Pod, containerID kubeletco // kubelet restart. // To solve this problem, we've already written necessary information into container labels. Here we // just need to retrieve them from container labels and restore the specs. -// TODO(random-liu): Add a node e2e test to test this behaviour. +// TODO(random-liu): Add a node e2e test to test this behavior. // TODO(random-liu): Change the lifecycle handler to just accept information needed, so that we can // just pass the needed function not create the fake object. func (m *genericRuntimeManager) restoreSpecsFromContainerLabels(containerID kubeletcontainer.ContainerID) (*v1.Pod, *v1.Container, error) { diff --git a/pkg/daemon/podprobe/results_manager.go b/pkg/daemon/podprobe/results_manager.go index 8e8ebdc1f..593f46658 100644 --- a/pkg/daemon/podprobe/results_manager.go +++ b/pkg/daemon/podprobe/results_manager.go @@ -19,9 +19,10 @@ package podprobe import ( "sync" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) const maxSyncProbeTime = 600 diff --git a/pkg/daemon/podprobe/results_manager_test.go b/pkg/daemon/podprobe/results_manager_test.go index 6b640fa79..1314c9cf7 100644 --- a/pkg/daemon/podprobe/results_manager_test.go +++ b/pkg/daemon/podprobe/results_manager_test.go @@ -22,10 +22,11 @@ import ( "testing" "time" - appsalphav1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" + + appsalphav1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func TestResultManagerSet(t *testing.T) { diff --git a/pkg/daemon/util/secret_manager.go b/pkg/daemon/util/secret_manager.go index 519315764..3fc1f12e1 100644 --- a/pkg/daemon/util/secret_manager.go +++ b/pkg/daemon/util/secret_manager.go @@ -21,11 +21,12 @@ import ( "math/rand" "time" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) // SecretManager is the interface to get secrets from API Server. diff --git a/pkg/daemon/util/secret_manager_test.go b/pkg/daemon/util/secret_manager_test.go index f697d9c8e..d96831c1e 100644 --- a/pkg/daemon/util/secret_manager_test.go +++ b/pkg/daemon/util/secret_manager_test.go @@ -21,10 +21,11 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestGetSecretsFromCache(t *testing.T) { diff --git a/pkg/util/configuration/configuration.go b/pkg/util/configuration/configuration.go index da42abc78..91535fed4 100644 --- a/pkg/util/configuration/configuration.go +++ b/pkg/util/configuration/configuration.go @@ -22,10 +22,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/openkruise/kruise/pkg/util" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/openkruise/kruise/pkg/util" ) const ( diff --git a/pkg/util/configuration/types.go b/pkg/util/configuration/types.go index c546099c3..9d98229ff 100644 --- a/pkg/util/configuration/types.go +++ b/pkg/util/configuration/types.go @@ -17,10 +17,11 @@ limitations under the License. package configuration import ( - "github.com/openkruise/kruise/apis/apps/v1alpha1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + + "github.com/openkruise/kruise/apis/apps/v1alpha1" ) const ( diff --git a/pkg/util/containerlaunchpriority/container_launch_priority.go b/pkg/util/containerlaunchpriority/container_launch_priority.go index 634cc0b54..b0b00be1a 100644 --- a/pkg/util/containerlaunchpriority/container_launch_priority.go +++ b/pkg/util/containerlaunchpriority/container_launch_priority.go @@ -20,8 +20,9 @@ import ( "fmt" "strconv" - appspub "github.com/openkruise/kruise/apis/apps/pub" v1 "k8s.io/api/core/v1" + + appspub "github.com/openkruise/kruise/apis/apps/pub" ) const ( diff --git a/pkg/util/controllerfinder/controller_finder.go b/pkg/util/controllerfinder/controller_finder.go index 604b45ac2..335da3a1e 100644 --- a/pkg/util/controllerfinder/controller_finder.go +++ b/pkg/util/controllerfinder/controller_finder.go @@ -19,10 +19,6 @@ package controllerfinder import ( "context" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" - apiutil "github.com/openkruise/kruise/pkg/util/api" - "github.com/openkruise/kruise/pkg/util/configuration" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -40,6 +36,11 @@ import ( scaleclient "k8s.io/client-go/scale" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" + apiutil "github.com/openkruise/kruise/pkg/util/api" + "github.com/openkruise/kruise/pkg/util/configuration" ) var Finder *ControllerFinder diff --git a/pkg/util/controllerfinder/pods_finder.go b/pkg/util/controllerfinder/pods_finder.go index fc41c4a69..b36fcec6b 100644 --- a/pkg/util/controllerfinder/pods_finder.go +++ b/pkg/util/controllerfinder/pods_finder.go @@ -20,9 +20,6 @@ import ( "context" "fmt" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" - "github.com/openkruise/kruise/pkg/util/fieldindex" appsv1 "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/klog/v2" kubecontroller "k8s.io/kubernetes/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" + "github.com/openkruise/kruise/pkg/util/fieldindex" ) // GetPodsForRef return target workload's podList and spec.replicas. diff --git a/pkg/util/discovery/discovery.go b/pkg/util/discovery/discovery.go index 5179aa9d5..3fbbebd8f 100644 --- a/pkg/util/discovery/discovery.go +++ b/pkg/util/discovery/discovery.go @@ -22,14 +22,15 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/openkruise/kruise/apis" - "github.com/openkruise/kruise/pkg/client" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + + "github.com/openkruise/kruise/apis" + "github.com/openkruise/kruise/pkg/client" ) var ( diff --git a/pkg/util/fieldindex/register_test.go b/pkg/util/fieldindex/register_test.go index f9496a9b5..cd56d675a 100644 --- a/pkg/util/fieldindex/register_test.go +++ b/pkg/util/fieldindex/register_test.go @@ -5,8 +5,9 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestIndexSidecarSet(t *testing.T) { diff --git a/pkg/util/history/controller_history_test.go b/pkg/util/history/controller_history_test.go index 3be9c12d3..c6e886755 100644 --- a/pkg/util/history/controller_history_test.go +++ b/pkg/util/history/controller_history_test.go @@ -20,8 +20,6 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,6 +27,9 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/controller/history" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func TestRevisionHistory(t *testing.T) { diff --git a/pkg/util/imagejob/imagejob_reader.go b/pkg/util/imagejob/imagejob_reader.go index 0bea0c538..147427dcd 100644 --- a/pkg/util/imagejob/imagejob_reader.go +++ b/pkg/util/imagejob/imagejob_reader.go @@ -22,11 +22,6 @@ import ( "sort" "sync" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - sortingcontrol "github.com/openkruise/kruise/pkg/control/sorting" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" - "github.com/openkruise/kruise/pkg/util/fieldindex" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -37,6 +32,12 @@ import ( kubecontroller "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/slice" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + sortingcontrol "github.com/openkruise/kruise/pkg/control/sorting" + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" + "github.com/openkruise/kruise/pkg/util/fieldindex" ) var ( diff --git a/pkg/util/lifecycle/lifecycle_utils.go b/pkg/util/lifecycle/lifecycle_utils.go index 7fecfa7de..a7e501575 100644 --- a/pkg/util/lifecycle/lifecycle_utils.go +++ b/pkg/util/lifecycle/lifecycle_utils.go @@ -21,9 +21,6 @@ import ( "strings" "time" - appspub "github.com/openkruise/kruise/apis/apps/pub" - "github.com/openkruise/kruise/pkg/util/podadapter" - "github.com/openkruise/kruise/pkg/util/podreadiness" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" coreinformers "k8s.io/client-go/informers/core/v1" @@ -31,6 +28,10 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + "github.com/openkruise/kruise/pkg/util/podadapter" + "github.com/openkruise/kruise/pkg/util/podreadiness" ) const ( diff --git a/pkg/util/podprobemarker/pod_probe_marker.go b/pkg/util/podprobemarker/pod_probe_marker.go index 6f9a59378..3ce3b12a1 100644 --- a/pkg/util/podprobemarker/pod_probe_marker.go +++ b/pkg/util/podprobemarker/pod_probe_marker.go @@ -20,14 +20,15 @@ import ( "context" "strings" - appsalphav1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" + + appsalphav1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" ) func GetPodProbeMarkerForPod(reader client.Reader, pod *corev1.Pod) ([]*appsalphav1.PodProbeMarker, error) { diff --git a/pkg/util/podreadiness/pod_readiness.go b/pkg/util/podreadiness/pod_readiness.go index 665de694a..dd9835560 100644 --- a/pkg/util/podreadiness/pod_readiness.go +++ b/pkg/util/podreadiness/pod_readiness.go @@ -19,10 +19,11 @@ package podreadiness import ( "sort" + v1 "k8s.io/api/core/v1" + appspub "github.com/openkruise/kruise/apis/apps/pub" "github.com/openkruise/kruise/pkg/util" "github.com/openkruise/kruise/pkg/util/podadapter" - v1 "k8s.io/api/core/v1" ) type Interface interface { diff --git a/pkg/util/podreadiness/pod_readiness_utils.go b/pkg/util/podreadiness/pod_readiness_utils.go index f863fe009..0c4b78ee2 100644 --- a/pkg/util/podreadiness/pod_readiness_utils.go +++ b/pkg/util/podreadiness/pod_readiness_utils.go @@ -19,12 +19,13 @@ package podreadiness import ( "encoding/json" - appspub "github.com/openkruise/kruise/apis/apps/pub" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/podadapter" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/podadapter" ) func addNotReadyKey(adp podadapter.Adapter, pod *v1.Pod, msg Message, condType v1.PodConditionType) error { diff --git a/pkg/util/refmanager/ref_manager.go b/pkg/util/refmanager/ref_manager.go index 9286983ce..49df93655 100644 --- a/pkg/util/refmanager/ref_manager.go +++ b/pkg/util/refmanager/ref_manager.go @@ -23,7 +23,6 @@ import ( "reflect" "sync" - "github.com/openkruise/kruise/pkg/util" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -31,6 +30,8 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + "github.com/openkruise/kruise/pkg/util" ) // RefManager provides the method to diff --git a/pkg/util/revision/revision.go b/pkg/util/revision/revision.go index 6a3f36543..c0b3c3282 100644 --- a/pkg/util/revision/revision.go +++ b/pkg/util/revision/revision.go @@ -19,12 +19,13 @@ package revision import ( "strings" + apps "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + appspub "github.com/openkruise/kruise/apis/apps/pub" "github.com/openkruise/kruise/pkg/features" utilfeature "github.com/openkruise/kruise/pkg/util/feature" "github.com/openkruise/kruise/pkg/util/lifecycle" - apps "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" ) // IsPodUpdate return true when: diff --git a/pkg/util/revision/revision_test.go b/pkg/util/revision/revision_test.go index 406ae7b84..5cfd8c584 100644 --- a/pkg/util/revision/revision_test.go +++ b/pkg/util/revision/revision_test.go @@ -19,12 +19,13 @@ package revision import ( "testing" - appspub "github.com/openkruise/kruise/apis/apps/pub" - "github.com/openkruise/kruise/pkg/features" - utilfeature "github.com/openkruise/kruise/pkg/util/feature" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + "github.com/openkruise/kruise/pkg/features" + utilfeature "github.com/openkruise/kruise/pkg/util/feature" ) func TestIsPodUpdate(t *testing.T) { diff --git a/pkg/util/secret/parse.go b/pkg/util/secret/parse.go index 2168e2e12..7a569147d 100644 --- a/pkg/util/secret/parse.go +++ b/pkg/util/secret/parse.go @@ -4,11 +4,12 @@ import ( "context" "fmt" - daemonutil "github.com/openkruise/kruise/pkg/daemon/util" corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/credentialprovider" credentialprovidersecrets "k8s.io/kubernetes/pkg/credentialprovider/secrets" + + daemonutil "github.com/openkruise/kruise/pkg/daemon/util" ) func AuthInfos(ctx context.Context, imageName, tag string, pullSecrets []corev1.Secret) []daemonutil.AuthInfo { diff --git a/pkg/util/specifieddelete/specified_delete.go b/pkg/util/specifieddelete/specified_delete.go index 8624cd9ac..a52d40eb3 100644 --- a/pkg/util/specifieddelete/specified_delete.go +++ b/pkg/util/specifieddelete/specified_delete.go @@ -20,11 +20,12 @@ import ( "context" "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func IsSpecifiedDelete(obj metav1.Object) bool { diff --git a/pkg/util/updatesort/priority_sort.go b/pkg/util/updatesort/priority_sort.go index 9c7a7dd0c..e45dbc3d7 100644 --- a/pkg/util/updatesort/priority_sort.go +++ b/pkg/util/updatesort/priority_sort.go @@ -20,10 +20,11 @@ import ( "sort" "strconv" - appspub "github.com/openkruise/kruise/apis/apps/pub" - "github.com/openkruise/kruise/pkg/util" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" + + appspub "github.com/openkruise/kruise/apis/apps/pub" + "github.com/openkruise/kruise/pkg/util" ) type prioritySort struct { diff --git a/pkg/util/updatesort/priority_sort_test.go b/pkg/util/updatesort/priority_sort_test.go index 64e9807f8..76f634b94 100644 --- a/pkg/util/updatesort/priority_sort_test.go +++ b/pkg/util/updatesort/priority_sort_test.go @@ -19,8 +19,9 @@ package updatesort import ( "testing" - appspub "github.com/openkruise/kruise/apis/apps/pub" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appspub "github.com/openkruise/kruise/apis/apps/pub" ) func TestCompare(t *testing.T) { diff --git a/pkg/util/updatesort/scatter_sort.go b/pkg/util/updatesort/scatter_sort.go index 3c72d1c0d..0509a6717 100644 --- a/pkg/util/updatesort/scatter_sort.go +++ b/pkg/util/updatesort/scatter_sort.go @@ -20,8 +20,9 @@ import ( "math" "sort" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) type scatterSort struct { diff --git a/pkg/util/updatesort/scatter_sort_test.go b/pkg/util/updatesort/scatter_sort_test.go index 0e4a399c2..a093880b6 100644 --- a/pkg/util/updatesort/scatter_sort_test.go +++ b/pkg/util/updatesort/scatter_sort_test.go @@ -22,9 +22,10 @@ import ( "strings" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestGenerateRules(t *testing.T) { diff --git a/pkg/util/workloadspread/fuzz_workloadspread_utils_test.go b/pkg/util/workloadspread/fuzz_workloadspread_utils_test.go index 412f007aa..51ff3273e 100644 --- a/pkg/util/workloadspread/fuzz_workloadspread_utils_test.go +++ b/pkg/util/workloadspread/fuzz_workloadspread_utils_test.go @@ -20,9 +20,10 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" + corev1 "k8s.io/api/core/v1" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" fuzzutils "github.com/openkruise/kruise/test/fuzz" - corev1 "k8s.io/api/core/v1" ) func FuzzNestedField(f *testing.F) { diff --git a/pkg/util/workloadspread/utils.go b/pkg/util/workloadspread/utils.go index 34d308168..689ab5048 100644 --- a/pkg/util/workloadspread/utils.go +++ b/pkg/util/workloadspread/utils.go @@ -22,10 +22,11 @@ import ( "strconv" "strings" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" "k8s.io/apimachinery/pkg/labels" intstrutil "k8s.io/apimachinery/pkg/util/intstr" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func hasPercentSubset(ws *appsv1alpha1.WorkloadSpread) (has bool) { diff --git a/pkg/util/workloadspread/utils_test.go b/pkg/util/workloadspread/utils_test.go index d53f24ff7..db6173109 100644 --- a/pkg/util/workloadspread/utils_test.go +++ b/pkg/util/workloadspread/utils_test.go @@ -4,11 +4,12 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" intstrutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestNestedField(t *testing.T) { diff --git a/pkg/util/workloadspread/workloadspread.go b/pkg/util/workloadspread/workloadspread.go index 1b340b124..09b86594d 100644 --- a/pkg/util/workloadspread/workloadspread.go +++ b/pkg/util/workloadspread/workloadspread.go @@ -44,6 +44,8 @@ import ( kubecontroller "k8s.io/kubernetes/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/client" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" kubeClient "github.com/openkruise/kruise/pkg/client" @@ -51,7 +53,6 @@ import ( "github.com/openkruise/kruise/pkg/util" utilclient "github.com/openkruise/kruise/pkg/util/client" "github.com/openkruise/kruise/pkg/util/configuration" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) const ( diff --git a/pkg/util/workloadspread/workloadspread_test.go b/pkg/util/workloadspread/workloadspread_test.go index 01fe3e028..a0b5f3918 100644 --- a/pkg/util/workloadspread/workloadspread_test.go +++ b/pkg/util/workloadspread/workloadspread_test.go @@ -26,7 +26,6 @@ import ( "testing" "time" - "github.com/openkruise/kruise/pkg/util/configuration" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" @@ -47,6 +46,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + "github.com/openkruise/kruise/pkg/util/configuration" + appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" diff --git a/pkg/webhook/advancedcronjob/mutating/advancedcronjob_create_update_handler.go b/pkg/webhook/advancedcronjob/mutating/advancedcronjob_create_update_handler.go index 35b24cfd9..4e1be67c5 100644 --- a/pkg/webhook/advancedcronjob/mutating/advancedcronjob_create_update_handler.go +++ b/pkg/webhook/advancedcronjob/mutating/advancedcronjob_create_update_handler.go @@ -75,11 +75,11 @@ func (h *AdvancedCronJobCreateUpdateHandler) Handle(ctx context.Context, req adm if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) 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) } //var _ inject.Client = &BroadcastJobCreateUpdateHandler{} diff --git a/pkg/webhook/advancedcronjob/validating/advancedcronjob_create_update_handler_test.go b/pkg/webhook/advancedcronjob/validating/advancedcronjob_create_update_handler_test.go index d3168dc93..049debf0e 100644 --- a/pkg/webhook/advancedcronjob/validating/advancedcronjob_create_update_handler_test.go +++ b/pkg/webhook/advancedcronjob/validating/advancedcronjob_create_update_handler_test.go @@ -23,9 +23,10 @@ import ( batchv1 "k8s.io/api/batch/v1" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/pointer" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) func TestValidateCronJobSpec(t *testing.T) { diff --git a/pkg/webhook/broadcastjob/mutating/broadcastjob_create_update_handler.go b/pkg/webhook/broadcastjob/mutating/broadcastjob_create_update_handler.go index 7dea55d47..bb43604a1 100644 --- a/pkg/webhook/broadcastjob/mutating/broadcastjob_create_update_handler.go +++ b/pkg/webhook/broadcastjob/mutating/broadcastjob_create_update_handler.go @@ -75,11 +75,11 @@ func (h *BroadcastJobCreateUpdateHandler) Handle(ctx context.Context, req admiss return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) 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) } //var _ inject.Client = &BroadcastJobCreateUpdateHandler{} diff --git a/pkg/webhook/broadcastjob/validating/broadcastjob_test.go b/pkg/webhook/broadcastjob/validating/broadcastjob_test.go index 59116e743..898322ac8 100644 --- a/pkg/webhook/broadcastjob/validating/broadcastjob_test.go +++ b/pkg/webhook/broadcastjob/validating/broadcastjob_test.go @@ -19,11 +19,12 @@ package validating import ( "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" ) var valInt32 int32 = 1 diff --git a/pkg/webhook/cloneset/mutating/cloneset_create_update_handler.go b/pkg/webhook/cloneset/mutating/cloneset_create_update_handler.go index 159ddc5d9..e472258e7 100644 --- a/pkg/webhook/cloneset/mutating/cloneset_create_update_handler.go +++ b/pkg/webhook/cloneset/mutating/cloneset_create_update_handler.go @@ -71,11 +71,11 @@ func (h *CloneSetCreateUpdateHandler) Handle(ctx context.Context, req admission. if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit CloneSet patches", "namespace", obj.Namespace, "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/containerrecreaterequest/mutating/crr_mutating_handler.go b/pkg/webhook/containerrecreaterequest/mutating/crr_mutating_handler.go index 62bd69832..76447a3b0 100644 --- a/pkg/webhook/containerrecreaterequest/mutating/crr_mutating_handler.go +++ b/pkg/webhook/containerrecreaterequest/mutating/crr_mutating_handler.go @@ -140,11 +140,11 @@ func (h *ContainerRecreateRequestHandler) Handle(ctx context.Context, req admiss if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) 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) } func isTerminatedBySidecarTerminator(pod *v1.Pod) bool { diff --git a/pkg/webhook/daemonset/mutating/daemonset_mutating_handler.go b/pkg/webhook/daemonset/mutating/daemonset_mutating_handler.go index 429f23e36..e7ef1756c 100644 --- a/pkg/webhook/daemonset/mutating/daemonset_mutating_handler.go +++ b/pkg/webhook/daemonset/mutating/daemonset_mutating_handler.go @@ -58,11 +58,11 @@ func (h *DaemonSetCreateUpdateHandler) Handle(ctx context.Context, req admission if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit DaemonSet patches", "namespace", obj.Namespace, "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/imagelistpulljob/mutating/imagelistpulljob_create_update_handler.go b/pkg/webhook/imagelistpulljob/mutating/imagelistpulljob_create_update_handler.go index f78a73d67..c7379f83d 100644 --- a/pkg/webhook/imagelistpulljob/mutating/imagelistpulljob_create_update_handler.go +++ b/pkg/webhook/imagelistpulljob/mutating/imagelistpulljob_create_update_handler.go @@ -51,11 +51,11 @@ func (h *ImageListPullJobCreateUpdateHandler) Handle(ctx context.Context, req ad if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit ImageListPullJob patches", "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/imagepulljob/mutating/imagepulljob_create_update_handler.go b/pkg/webhook/imagepulljob/mutating/imagepulljob_create_update_handler.go index 507aae798..dadf1627e 100644 --- a/pkg/webhook/imagepulljob/mutating/imagepulljob_create_update_handler.go +++ b/pkg/webhook/imagepulljob/mutating/imagepulljob_create_update_handler.go @@ -52,11 +52,11 @@ func (h *ImagePullJobCreateUpdateHandler) Handle(ctx context.Context, req admiss if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit ImagePullJob patches", "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/imagepulljob/validating/imagepulljob_create_update_handler.go b/pkg/webhook/imagepulljob/validating/imagepulljob_create_update_handler.go index b5e92c0f4..b360ff320 100644 --- a/pkg/webhook/imagepulljob/validating/imagepulljob_create_update_handler.go +++ b/pkg/webhook/imagepulljob/validating/imagepulljob_create_update_handler.go @@ -21,15 +21,16 @@ import ( "fmt" "net/http" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - daemonutil "github.com/openkruise/kruise/pkg/daemon/util" - "github.com/openkruise/kruise/pkg/features" - utilfeature "github.com/openkruise/kruise/pkg/util/feature" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" utilpointer "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + daemonutil "github.com/openkruise/kruise/pkg/daemon/util" + "github.com/openkruise/kruise/pkg/features" + utilfeature "github.com/openkruise/kruise/pkg/util/feature" ) // ImagePullJobCreateUpdateHandler handles ImagePullJob diff --git a/pkg/webhook/nodeimage/mutating/nodeimage_create_update_handler.go b/pkg/webhook/nodeimage/mutating/nodeimage_create_update_handler.go index 9bf0c03ad..44957d8c6 100644 --- a/pkg/webhook/nodeimage/mutating/nodeimage_create_update_handler.go +++ b/pkg/webhook/nodeimage/mutating/nodeimage_create_update_handler.go @@ -63,11 +63,11 @@ func (h *NodeImageCreateUpdateHandler) Handle(ctx context.Context, req admission if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit NodeImage patches", "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/pod/mutating/persistent_pod_state.go b/pkg/webhook/pod/mutating/persistent_pod_state.go index a472ab0fa..0647e8484 100644 --- a/pkg/webhook/pod/mutating/persistent_pod_state.go +++ b/pkg/webhook/pod/mutating/persistent_pod_state.go @@ -19,16 +19,17 @@ package mutating import ( "context" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" - utilclient "github.com/openkruise/kruise/pkg/util/client" - "github.com/openkruise/kruise/pkg/util/configuration" admissionv1 "k8s.io/api/admission/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" + utilclient "github.com/openkruise/kruise/pkg/util/client" + "github.com/openkruise/kruise/pkg/util/configuration" ) const ( diff --git a/pkg/webhook/pod/mutating/pod_create_update_handler.go b/pkg/webhook/pod/mutating/pod_create_update_handler.go index ed0044356..b750653d5 100644 --- a/pkg/webhook/pod/mutating/pod_create_update_handler.go +++ b/pkg/webhook/pod/mutating/pod_create_update_handler.go @@ -120,7 +120,7 @@ func (h *PodCreateHandler) Handle(ctx context.Context, req admission.Request) ad if !changed { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } @@ -128,5 +128,5 @@ func (h *PodCreateHandler) Handle(ctx context.Context, req admission.Request) ad if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - return admission.PatchResponseFromRaw(original, marshalled) + return admission.PatchResponseFromRaw(original, marshaled) } diff --git a/pkg/webhook/pod/mutating/pod_probe_marker.go b/pkg/webhook/pod/mutating/pod_probe_marker.go index be4f6d835..e3cc1bbfd 100644 --- a/pkg/webhook/pod/mutating/pod_probe_marker.go +++ b/pkg/webhook/pod/mutating/pod_probe_marker.go @@ -21,14 +21,15 @@ import ( "fmt" "strings" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/podprobemarker" admissionv1 "k8s.io/api/admission/v1" corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/podprobemarker" ) // mutating relate-pub annotation in pod diff --git a/pkg/webhook/pod/mutating/pod_probe_marker_test.go b/pkg/webhook/pod/mutating/pod_probe_marker_test.go index 68005976f..44ca4fa28 100644 --- a/pkg/webhook/pod/mutating/pod_probe_marker_test.go +++ b/pkg/webhook/pod/mutating/pod_probe_marker_test.go @@ -21,8 +21,6 @@ import ( "reflect" "testing" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/util" admissionv1 "k8s.io/api/admission/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -30,6 +28,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/util" ) func TestPodProbeMarkerMutatingPod(t *testing.T) { diff --git a/pkg/webhook/pod/mutating/pod_readiness.go b/pkg/webhook/pod/mutating/pod_readiness.go index 624fccc98..d2cd8eeb7 100644 --- a/pkg/webhook/pod/mutating/pod_readiness.go +++ b/pkg/webhook/pod/mutating/pod_readiness.go @@ -17,13 +17,14 @@ limitations under the License. package mutating import ( + admissionv1 "k8s.io/api/admission/v1" + v1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + appspub "github.com/openkruise/kruise/apis/apps/pub" "github.com/openkruise/kruise/pkg/features" "github.com/openkruise/kruise/pkg/util" utilfeature "github.com/openkruise/kruise/pkg/util/feature" - admissionv1 "k8s.io/api/admission/v1" - v1 "k8s.io/api/core/v1" - "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) func injectPodReadinessGate(req admission.Request, pod *v1.Pod) (skip bool) { diff --git a/pkg/webhook/pod/mutating/sidecarset.go b/pkg/webhook/pod/mutating/sidecarset.go index 0fd1a99e6..c841f8fe0 100644 --- a/pkg/webhook/pod/mutating/sidecarset.go +++ b/pkg/webhook/pod/mutating/sidecarset.go @@ -24,6 +24,9 @@ import ( "sort" "strings" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/intstr" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/openkruise/kruise/pkg/control/sidecarcontrol" "github.com/openkruise/kruise/pkg/features" @@ -32,8 +35,6 @@ import ( utilfeature "github.com/openkruise/kruise/pkg/util/feature" "github.com/openkruise/kruise/pkg/util/fieldindex" "github.com/openkruise/kruise/pkg/util/history" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/util/intstr" admissionv1 "k8s.io/api/admission/v1" apps "k8s.io/api/apps/v1" diff --git a/pkg/webhook/pod/mutating/sidecarset_test.go b/pkg/webhook/pod/mutating/sidecarset_test.go index bb8ca3e71..53dfc1a5e 100644 --- a/pkg/webhook/pod/mutating/sidecarset_test.go +++ b/pkg/webhook/pod/mutating/sidecarset_test.go @@ -26,12 +26,6 @@ import ( "sort" "testing" - "github.com/openkruise/kruise/apis" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/control/sidecarcontrol" - "github.com/openkruise/kruise/pkg/util" - "github.com/openkruise/kruise/pkg/util/fieldindex" - webhookutil "github.com/openkruise/kruise/pkg/webhook/util" admissionv1 "k8s.io/api/admission/v1" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -44,6 +38,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + "github.com/openkruise/kruise/apis" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/control/sidecarcontrol" + "github.com/openkruise/kruise/pkg/util" + "github.com/openkruise/kruise/pkg/util/fieldindex" + webhookutil "github.com/openkruise/kruise/pkg/webhook/util" ) const ( diff --git a/pkg/webhook/pod/mutating/workloadspread.go b/pkg/webhook/pod/mutating/workloadspread.go index 48b574d79..a1b59fd6b 100644 --- a/pkg/webhook/pod/mutating/workloadspread.go +++ b/pkg/webhook/pod/mutating/workloadspread.go @@ -19,13 +19,14 @@ package mutating import ( "context" - wsutil "github.com/openkruise/kruise/pkg/util/workloadspread" admissionv1 "k8s.io/api/admission/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/util/dryrun" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + wsutil "github.com/openkruise/kruise/pkg/util/workloadspread" ) func (h *PodCreateHandler) workloadSpreadMutatingPod(ctx context.Context, req admission.Request, pod *corev1.Pod) (skip bool, err error) { diff --git a/pkg/webhook/podunavailablebudget/validating/pub_validating_test.go b/pkg/webhook/podunavailablebudget/validating/pub_validating_test.go index a571f74de..9411f88eb 100644 --- a/pkg/webhook/podunavailablebudget/validating/pub_validating_test.go +++ b/pkg/webhook/podunavailablebudget/validating/pub_validating_test.go @@ -20,13 +20,14 @@ import ( "context" "testing" - policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + policyv1alpha1 "github.com/openkruise/kruise/apis/policy/v1alpha1" ) func init() { diff --git a/pkg/webhook/resourcedistribution/validating/fuzz_resourcedistribution_validating_test.go b/pkg/webhook/resourcedistribution/validating/fuzz_resourcedistribution_validating_test.go index 4c62b8ff1..c2abb2a87 100644 --- a/pkg/webhook/resourcedistribution/validating/fuzz_resourcedistribution_validating_test.go +++ b/pkg/webhook/resourcedistribution/validating/fuzz_resourcedistribution_validating_test.go @@ -20,13 +20,14 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - fuzzutils "github.com/openkruise/kruise/test/fuzz" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + fuzzutils "github.com/openkruise/kruise/test/fuzz" ) var ( diff --git a/pkg/webhook/sidecarset/mutating/sidecarset_create_update_handler.go b/pkg/webhook/sidecarset/mutating/sidecarset_create_update_handler.go index feeeefe45..8b06cbca8 100644 --- a/pkg/webhook/sidecarset/mutating/sidecarset_create_update_handler.go +++ b/pkg/webhook/sidecarset/mutating/sidecarset_create_update_handler.go @@ -87,11 +87,11 @@ func (h *SidecarSetCreateHandler) Handle(ctx context.Context, req admission.Requ if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) 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) } //var _ inject.Client = &SidecarSetCreateHandler{} diff --git a/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go b/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go index 8b96a0490..8971ca8d2 100644 --- a/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go +++ b/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go @@ -24,11 +24,12 @@ import ( "regexp" "strings" + "k8s.io/apimachinery/pkg/util/intstr" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" "github.com/openkruise/kruise/pkg/control/sidecarcontrol" "github.com/openkruise/kruise/pkg/util" webhookutil "github.com/openkruise/kruise/pkg/webhook/util" - "k8s.io/apimachinery/pkg/util/intstr" admissionv1 "k8s.io/api/admission/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/webhook/sidecarset/validating/utils.go b/pkg/webhook/sidecarset/validating/utils.go index a93bd36ef..7af7d9013 100644 --- a/pkg/webhook/sidecarset/validating/utils.go +++ b/pkg/webhook/sidecarset/validating/utils.go @@ -19,14 +19,15 @@ package validating import ( "fmt" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - "github.com/openkruise/kruise/pkg/control/sidecarcontrol" - "github.com/openkruise/kruise/pkg/util" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/apis/core" corev1 "k8s.io/kubernetes/pkg/apis/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + "github.com/openkruise/kruise/pkg/control/sidecarcontrol" + "github.com/openkruise/kruise/pkg/util" ) func getCoreVolumes(volumes []v1.Volume, fldPath *field.Path) ([]core.Volume, field.ErrorList) { diff --git a/pkg/webhook/statefulset/mutating/statefulset_create_update_handler.go b/pkg/webhook/statefulset/mutating/statefulset_create_update_handler.go index 0c05f7e7d..2587a867e 100644 --- a/pkg/webhook/statefulset/mutating/statefulset_create_update_handler.go +++ b/pkg/webhook/statefulset/mutating/statefulset_create_update_handler.go @@ -101,17 +101,17 @@ func (h *StatefulSetCreateUpdateHandler) Handle(ctx context.Context, req admissi obj.Status = appsv1beta1.StatefulSetStatus{} var err error - var marshalled []byte + var marshaled []byte if objv1alpha1 != nil { if err := objv1alpha1.ConvertFrom(obj); err != nil { return admission.Errored(http.StatusBadRequest, fmt.Errorf("failed to convert v1beta1->v1alpha1: %v", err)) } - marshalled, err = json.Marshal(objv1alpha1) + marshaled, err = json.Marshal(objv1alpha1) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } } else { - marshalled, err = json.Marshal(obj) + marshaled, err = json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } @@ -119,7 +119,7 @@ func (h *StatefulSetCreateUpdateHandler) Handle(ctx context.Context, req admissi if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit StatefulSet patches", "namespace", obj.Namespace, "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/statefulset/validating/statefulset_validation.go b/pkg/webhook/statefulset/validating/statefulset_validation.go index 0af436adf..e28cac08c 100644 --- a/pkg/webhook/statefulset/validating/statefulset_validation.go +++ b/pkg/webhook/statefulset/validating/statefulset_validation.go @@ -7,7 +7,6 @@ import ( "regexp" "github.com/appscode/jsonpatch" - apiutil "github.com/openkruise/kruise/pkg/util/api" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" @@ -22,6 +21,7 @@ import ( appspub "github.com/openkruise/kruise/apis/apps/pub" appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1" + apiutil "github.com/openkruise/kruise/pkg/util/api" "github.com/openkruise/kruise/pkg/util/pvc" webhookutil "github.com/openkruise/kruise/pkg/webhook/util" "github.com/openkruise/kruise/pkg/webhook/util/convertor" diff --git a/pkg/webhook/uniteddeployment/mutating/uniteddeployment_create_update_handler.go b/pkg/webhook/uniteddeployment/mutating/uniteddeployment_create_update_handler.go index 06cdb6803..b2be62608 100644 --- a/pkg/webhook/uniteddeployment/mutating/uniteddeployment_create_update_handler.go +++ b/pkg/webhook/uniteddeployment/mutating/uniteddeployment_create_update_handler.go @@ -77,11 +77,11 @@ func (h *UnitedDeploymentCreateUpdateHandler) Handle(ctx context.Context, req ad if reflect.DeepEqual(obj, copy) { return admission.Allowed("") } - marshalled, err := json.Marshal(obj) + marshaled, err := json.Marshal(obj) if err != nil { return admission.Errored(http.StatusInternalServerError, err) } - resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshalled) + resp := admission.PatchResponseFromRaw(req.AdmissionRequest.Object.Raw, marshaled) if len(resp.Patches) > 0 { klog.V(5).InfoS("Admit UnitedDeployment patches", "namespace", obj.Namespace, "name", obj.Name, "patches", util.DumpJSON(resp.Patches)) } diff --git a/pkg/webhook/uniteddeployment/validating/fuzz_uniteddeployment_validation_test.go b/pkg/webhook/uniteddeployment/validating/fuzz_uniteddeployment_validation_test.go index ccf2bd3a4..824aaaf68 100644 --- a/pkg/webhook/uniteddeployment/validating/fuzz_uniteddeployment_validation_test.go +++ b/pkg/webhook/uniteddeployment/validating/fuzz_uniteddeployment_validation_test.go @@ -20,9 +20,10 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" + "k8s.io/apimachinery/pkg/util/validation/field" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" fuzzutils "github.com/openkruise/kruise/test/fuzz" - "k8s.io/apimachinery/pkg/util/validation/field" ) func FuzzValidateUnitedDeploymentSpec(f *testing.F) { diff --git a/pkg/webhook/util/writer/external_test.go b/pkg/webhook/util/writer/external_test.go index 87faa69bd..202d92db1 100644 --- a/pkg/webhook/util/writer/external_test.go +++ b/pkg/webhook/util/writer/external_test.go @@ -21,12 +21,13 @@ import ( "testing" "github.com/onsi/gomega" - webhookutil "github.com/openkruise/kruise/pkg/webhook/util" - "github.com/openkruise/kruise/pkg/webhook/util/generator" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/fake" + + webhookutil "github.com/openkruise/kruise/pkg/webhook/util" + "github.com/openkruise/kruise/pkg/webhook/util/generator" ) func TestEnsureCert(t *testing.T) { diff --git a/pkg/webhook/workloadspread/validating/fuzz_workloadspread_validation_test.go b/pkg/webhook/workloadspread/validating/fuzz_workloadspread_validation_test.go index a40e43fc6..633cb63a0 100644 --- a/pkg/webhook/workloadspread/validating/fuzz_workloadspread_validation_test.go +++ b/pkg/webhook/workloadspread/validating/fuzz_workloadspread_validation_test.go @@ -20,8 +20,6 @@ import ( "testing" fuzz "github.com/AdaLogics/go-fuzz-headers" - appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" - fuzzutils "github.com/openkruise/kruise/test/fuzz" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" @@ -30,6 +28,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" + fuzzutils "github.com/openkruise/kruise/test/fuzz" ) var ( diff --git a/pkg/webhook/workloadspread/validating/workloadspread_validation.go b/pkg/webhook/workloadspread/validating/workloadspread_validation.go index 48b1ccb13..1f8927508 100644 --- a/pkg/webhook/workloadspread/validating/workloadspread_validation.go +++ b/pkg/webhook/workloadspread/validating/workloadspread_validation.go @@ -26,8 +26,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/strategicpatch" - webhookutil "github.com/openkruise/kruise/pkg/webhook/util" - "github.com/openkruise/kruise/pkg/webhook/util/convertor" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" @@ -41,6 +39,9 @@ import ( corevalidation "k8s.io/kubernetes/pkg/apis/core/validation" "sigs.k8s.io/controller-runtime/pkg/client" + webhookutil "github.com/openkruise/kruise/pkg/webhook/util" + "github.com/openkruise/kruise/pkg/webhook/util/convertor" + appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1" appsvbeta1 "github.com/openkruise/kruise/apis/apps/v1beta1" "github.com/openkruise/kruise/pkg/util/configuration"