From 9da10b538a13b42ac35f9b9667ee15463d3419cb Mon Sep 17 00:00:00 2001 From: KunWuLuan Date: Tue, 19 Mar 2024 15:09:31 +0800 Subject: [PATCH] fix import Signed-off-by: KunWuLuan --- apis/runtime/v1alpha1/api.pb.go | 5 ++--- apis/runtime/v1alpha1/api_grpc.pb.go | 1 - apis/slo/v1alpha1/nodemetric_types.go | 3 +-- .../apis/config/validation/validation_loadaware_test.go | 3 +-- pkg/descheduler/test/test_utils.go | 2 +- pkg/koordlet/metriccache/mockmetriccache/mock.go | 1 - .../metriccache/mockmetriccache/mock_metric_result.go | 3 +-- .../metriccache/mockmetriccache/mock_tsdb_storage.go | 1 - pkg/koordlet/statesinformer/mockstatesinformer/mock.go | 3 +-- pkg/koordlet/util/testutil/mock_utils.go | 5 ++--- test/e2e/framework/exec_util.go | 2 +- test/e2e/framework/manifest/manifest.go | 2 +- test/e2e/framework/provider.go | 2 +- test/e2e/quota/multi_tree.go | 3 +-- test/e2e/quota/quota.go | 3 +-- test/e2e/quota/quota_guaranteed.go | 3 +-- test/utils/image/csi_manifest.go | 2 +- 17 files changed, 16 insertions(+), 28 deletions(-) diff --git a/apis/runtime/v1alpha1/api.pb.go b/apis/runtime/v1alpha1/api.pb.go index ebd7ce76c..1c6dbdf3e 100644 --- a/apis/runtime/v1alpha1/api.pb.go +++ b/apis/runtime/v1alpha1/api.pb.go @@ -40,12 +40,11 @@ limitations under the License. package v1alpha1 import ( - reflect "reflect" - sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/apis/runtime/v1alpha1/api_grpc.pb.go b/apis/runtime/v1alpha1/api_grpc.pb.go index b37dec25f..79c2412e5 100644 --- a/apis/runtime/v1alpha1/api_grpc.pb.go +++ b/apis/runtime/v1alpha1/api_grpc.pb.go @@ -24,7 +24,6 @@ package v1alpha1 import ( context "context" - grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/apis/slo/v1alpha1/nodemetric_types.go b/apis/slo/v1alpha1/nodemetric_types.go index 2e132979b..f7b096444 100644 --- a/apis/slo/v1alpha1/nodemetric_types.go +++ b/apis/slo/v1alpha1/nodemetric_types.go @@ -17,9 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiext "github.com/koordinator-sh/koordinator/apis/extension" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/pkg/descheduler/apis/config/validation/validation_loadaware_test.go b/pkg/descheduler/apis/config/validation/validation_loadaware_test.go index 82920c279..30bfbf591 100644 --- a/pkg/descheduler/apis/config/validation/validation_loadaware_test.go +++ b/pkg/descheduler/apis/config/validation/validation_loadaware_test.go @@ -19,9 +19,8 @@ package validation import ( "testing" - "github.com/stretchr/testify/assert" - deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" + "github.com/stretchr/testify/assert" ) func TestValidateLowLoadUtilizationArgs_NumerOfNodes(t *testing.T) { diff --git a/pkg/descheduler/test/test_utils.go b/pkg/descheduler/test/test_utils.go index cf1dc1291..02c685b8c 100644 --- a/pkg/descheduler/test/test_utils.go +++ b/pkg/descheduler/test/test_utils.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "k8s.io/client-go/informers/core/v1" + "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/tools/cache" "github.com/koordinator-sh/koordinator/pkg/descheduler/framework" diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock.go b/pkg/koordlet/metriccache/mockmetriccache/mock.go index 1d956e6b7..ed1b6b09b 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock.go @@ -26,7 +26,6 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" ) diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go b/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go index 628a8546a..dbed36ba3 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go @@ -26,9 +26,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - storage "github.com/prometheus/prometheus/storage" - metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" + storage "github.com/prometheus/prometheus/storage" ) // MockMetricResult is a mock of MetricResult interface. diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go b/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go index 66c6a3d8d..51973e8ba 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go @@ -26,7 +26,6 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" ) diff --git a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go index 00be2d8e8..9d1b73103 100644 --- a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go +++ b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go @@ -26,11 +26,10 @@ import ( gomock "github.com/golang/mock/gomock" v1alpha1 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha1" - v1 "k8s.io/api/core/v1" - v1alpha10 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" statesinformer "github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer" impl "github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer/impl" + v1 "k8s.io/api/core/v1" ) // MockStatesInformer is a mock of StatesInformer interface. diff --git a/pkg/koordlet/util/testutil/mock_utils.go b/pkg/koordlet/util/testutil/mock_utils.go index b419b054e..29ece0586 100644 --- a/pkg/koordlet/util/testutil/mock_utils.go +++ b/pkg/koordlet/util/testutil/mock_utils.go @@ -20,14 +20,13 @@ import ( "fmt" "github.com/golang/mock/gomock" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/utils/pointer" - slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" mock_metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache/mockmetriccache" "github.com/koordinator-sh/koordinator/pkg/koordlet/statesinformer" "github.com/koordinator-sh/koordinator/pkg/koordlet/util" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/utils/pointer" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/e2e/framework/exec_util.go b/test/e2e/framework/exec_util.go index ebe3bac67..4d96fb37b 100644 --- a/test/e2e/framework/exec_util.go +++ b/test/e2e/framework/exec_util.go @@ -23,7 +23,7 @@ import ( "net/url" "strings" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" restclient "k8s.io/client-go/rest" diff --git a/test/e2e/framework/manifest/manifest.go b/test/e2e/framework/manifest/manifest.go index 5c08bb3d0..7de1784d0 100644 --- a/test/e2e/framework/manifest/manifest.go +++ b/test/e2e/framework/manifest/manifest.go @@ -24,7 +24,7 @@ import ( "time" appsv1 "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilyaml "k8s.io/apimachinery/pkg/util/yaml" diff --git a/test/e2e/framework/provider.go b/test/e2e/framework/provider.go index 10f96ecd6..986cec981 100644 --- a/test/e2e/framework/provider.go +++ b/test/e2e/framework/provider.go @@ -21,7 +21,7 @@ import ( "os" "sync" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" ) diff --git a/test/e2e/quota/multi_tree.go b/test/e2e/quota/multi_tree.go index d35cf3442..3adcf8c87 100644 --- a/test/e2e/quota/multi_tree.go +++ b/test/e2e/quota/multi_tree.go @@ -29,14 +29,13 @@ import ( quotav1 "k8s.io/apiserver/pkg/quota/v1" schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned" - schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" - "github.com/koordinator-sh/koordinator/apis/extension" quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/util" "github.com/koordinator-sh/koordinator/test/e2e/framework" e2enode "github.com/koordinator-sh/koordinator/test/e2e/framework/node" imageutils "github.com/koordinator-sh/koordinator/test/utils/image" + schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" ) var QuotaE2eLabel = "koord-quota-e2e" diff --git a/test/e2e/quota/quota.go b/test/e2e/quota/quota.go index 3d98b8268..215cbfad8 100644 --- a/test/e2e/quota/quota.go +++ b/test/e2e/quota/quota.go @@ -28,13 +28,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned" - schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" - "github.com/koordinator-sh/koordinator/apis/extension" "github.com/koordinator-sh/koordinator/pkg/util" "github.com/koordinator-sh/koordinator/test/e2e/framework" e2enode "github.com/koordinator-sh/koordinator/test/e2e/framework/node" e2epod "github.com/koordinator-sh/koordinator/test/e2e/framework/pod" + schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" ) var _ = SIGDescribe("basic-quota", func() { diff --git a/test/e2e/quota/quota_guaranteed.go b/test/e2e/quota/quota_guaranteed.go index d206b0208..f5c1247e9 100644 --- a/test/e2e/quota/quota_guaranteed.go +++ b/test/e2e/quota/quota_guaranteed.go @@ -31,13 +31,12 @@ import ( apiv1 "k8s.io/kubernetes/pkg/api/v1/pod" schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned" - schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" - "github.com/koordinator-sh/koordinator/apis/extension" "github.com/koordinator-sh/koordinator/pkg/util" "github.com/koordinator-sh/koordinator/test/e2e/framework" e2enode "github.com/koordinator-sh/koordinator/test/e2e/framework/node" e2epod "github.com/koordinator-sh/koordinator/test/e2e/framework/pod" + schedv1alpha1 "sigs.k8s.io/scheduler-plugins/pkg/apis/scheduling/v1alpha1" ) var _ = SIGDescribe("quota-guaranteed", func() { diff --git a/test/utils/image/csi_manifest.go b/test/utils/image/csi_manifest.go index 80d7d3f98..9f7eeaf18 100644 --- a/test/utils/image/csi_manifest.go +++ b/test/utils/image/csi_manifest.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" - testing_manifests "github.com/koordinator-sh/koordinator/test/e2e/testing-manifests" + "github.com/koordinator-sh/koordinator/test/e2e/testing-manifests" ) // All of the image tags are of the format k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3.