From eaddd15b26c72510f87d41c4b6b7061a6e26a126 Mon Sep 17 00:00:00 2001 From: KunWuLuan Date: Wed, 6 Mar 2024 17:18:52 +0800 Subject: [PATCH] goimports -w -local github.com/koordinator-sh/koordinator ./ Signed-off-by: KunWuLuan --- apis/config/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/configuration/zz_generated.deepcopy.go | 3 ++- apis/quota/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/runtime/v1alpha1/api.pb.go | 5 +++-- apis/runtime/v1alpha1/api_grpc.pb.go | 1 + apis/scheduling/v1alpha1/zz_generated.deepcopy.go | 2 +- apis/slo/v1alpha1/nodemetric_types.go | 3 ++- apis/slo/v1alpha1/zz_generated.deepcopy.go | 7 ++++--- pkg/client/clientset/versioned/clientset.go | 7 ++++--- .../clientset/versioned/fake/clientset_generated.go | 11 ++++++----- pkg/client/clientset/versioned/fake/register.go | 9 +++++---- pkg/client/clientset/versioned/scheme/register.go | 9 +++++---- .../typed/config/v1alpha1/clustercolocationprofile.go | 5 +++-- .../versioned/typed/config/v1alpha1/config_client.go | 3 ++- .../v1alpha1/fake/fake_clustercolocationprofile.go | 3 ++- .../typed/config/v1alpha1/fake/fake_config_client.go | 3 ++- .../typed/quota/v1alpha1/elasticquotaprofile.go | 5 +++-- .../quota/v1alpha1/fake/fake_elasticquotaprofile.go | 3 ++- .../typed/quota/v1alpha1/fake/fake_quota_client.go | 3 ++- .../versioned/typed/quota/v1alpha1/quota_client.go | 3 ++- .../versioned/typed/scheduling/v1alpha1/device.go | 5 +++-- .../typed/scheduling/v1alpha1/fake/fake_device.go | 3 ++- .../scheduling/v1alpha1/fake/fake_podmigrationjob.go | 3 ++- .../scheduling/v1alpha1/fake/fake_reservation.go | 3 ++- .../v1alpha1/fake/fake_scheduling_client.go | 3 ++- .../typed/scheduling/v1alpha1/podmigrationjob.go | 5 +++-- .../typed/scheduling/v1alpha1/reservation.go | 5 +++-- .../typed/scheduling/v1alpha1/scheduling_client.go | 3 ++- .../typed/slo/v1alpha1/fake/fake_nodemetric.go | 3 ++- .../versioned/typed/slo/v1alpha1/fake/fake_nodeslo.go | 3 ++- .../typed/slo/v1alpha1/fake/fake_slo_client.go | 3 ++- .../versioned/typed/slo/v1alpha1/nodemetric.go | 5 +++-- .../clientset/versioned/typed/slo/v1alpha1/nodeslo.go | 5 +++-- .../versioned/typed/slo/v1alpha1/slo_client.go | 3 ++- .../config/v1alpha1/clustercolocationprofile.go | 9 +++++---- pkg/client/informers/externalversions/factory.go | 9 +++++---- pkg/client/informers/externalversions/generic.go | 5 +++-- .../internalinterfaces/factory_interfaces.go | 3 ++- .../quota/v1alpha1/elasticquotaprofile.go | 9 +++++---- .../externalversions/scheduling/v1alpha1/device.go | 9 +++++---- .../scheduling/v1alpha1/podmigrationjob.go | 9 +++++---- .../scheduling/v1alpha1/reservation.go | 9 +++++---- .../externalversions/slo/v1alpha1/nodemetric.go | 9 +++++---- .../externalversions/slo/v1alpha1/nodeslo.go | 9 +++++---- .../config/v1alpha1/clustercolocationprofile.go | 3 ++- .../listers/quota/v1alpha1/elasticquotaprofile.go | 3 ++- pkg/client/listers/scheduling/v1alpha1/device.go | 3 ++- .../listers/scheduling/v1alpha1/podmigrationjob.go | 3 ++- pkg/client/listers/scheduling/v1alpha1/reservation.go | 3 ++- pkg/client/listers/slo/v1alpha1/nodemetric.go | 3 ++- pkg/client/listers/slo/v1alpha1/nodeslo.go | 3 ++- .../apis/config/v1alpha2/zz_generated.conversion.go | 3 ++- .../apis/config/v1alpha2/zz_generated.deepcopy.go | 3 ++- .../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 + .../statesinformer/mockstatesinformer/mock.go | 3 ++- pkg/koordlet/util/testutil/mock_utils.go | 5 +++-- .../apis/config/v1beta2/zz_generated.conversion.go | 5 +++-- .../frameworkext/topologymanager/policy_test.go | 7 ++++--- pkg/scheduler/plugins/nodenumaresource/util.go | 2 +- pkg/scheduler/plugins/nodenumaresource/util_test.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 +- 71 files changed, 182 insertions(+), 120 deletions(-) diff --git a/apis/config/v1alpha1/zz_generated.deepcopy.go b/apis/config/v1alpha1/zz_generated.deepcopy.go index 954e864b0..7ea7cf2b2 100644 --- a/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/apis/configuration/zz_generated.deepcopy.go b/apis/configuration/zz_generated.deepcopy.go index 946cc8563..2c63db0db 100644 --- a/apis/configuration/zz_generated.deepcopy.go +++ b/apis/configuration/zz_generated.deepcopy.go @@ -22,8 +22,9 @@ limitations under the License. package configuration import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - "k8s.io/apimachinery/pkg/apis/meta/v1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/apis/quota/v1alpha1/zz_generated.deepcopy.go b/apis/quota/v1alpha1/zz_generated.deepcopy.go index d3e382561..d0a52e2a0 100644 --- a/apis/quota/v1alpha1/zz_generated.deepcopy.go +++ b/apis/quota/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/runtime/v1alpha1/api.pb.go b/apis/runtime/v1alpha1/api.pb.go index 1c6dbdf3e..ebd7ce76c 100644 --- a/apis/runtime/v1alpha1/api.pb.go +++ b/apis/runtime/v1alpha1/api.pb.go @@ -40,11 +40,12 @@ 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 79c2412e5..b37dec25f 100644 --- a/apis/runtime/v1alpha1/api_grpc.pb.go +++ b/apis/runtime/v1alpha1/api_grpc.pb.go @@ -24,6 +24,7 @@ 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/scheduling/v1alpha1/zz_generated.deepcopy.go b/apis/scheduling/v1alpha1/zz_generated.deepcopy.go index 877e86621..0c04d5744 100644 --- a/apis/scheduling/v1alpha1/zz_generated.deepcopy.go +++ b/apis/scheduling/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/slo/v1alpha1/nodemetric_types.go b/apis/slo/v1alpha1/nodemetric_types.go index f7b096444..2e132979b 100644 --- a/apis/slo/v1alpha1/nodemetric_types.go +++ b/apis/slo/v1alpha1/nodemetric_types.go @@ -17,8 +17,9 @@ limitations under the License. package v1alpha1 import ( - apiext "github.com/koordinator-sh/koordinator/apis/extension" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + apiext "github.com/koordinator-sh/koordinator/apis/extension" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! diff --git a/apis/slo/v1alpha1/zz_generated.deepcopy.go b/apis/slo/v1alpha1/zz_generated.deepcopy.go index df9eacacd..e695b1855 100644 --- a/apis/slo/v1alpha1/zz_generated.deepcopy.go +++ b/apis/slo/v1alpha1/zz_generated.deepcopy.go @@ -22,12 +22,13 @@ limitations under the License. package v1alpha1 import ( - "github.com/koordinator-sh/koordinator/apis/extension" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + + "github.com/koordinator-sh/koordinator/apis/extension" + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 0d6705fa7..315795c18 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -22,13 +22,14 @@ import ( "fmt" "net/http" + discovery "k8s.io/client-go/discovery" + rest "k8s.io/client-go/rest" + flowcontrol "k8s.io/client-go/util/flowcontrol" + configv1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/config/v1alpha1" quotav1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/quota/v1alpha1" schedulingv1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" slov1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/slo/v1alpha1" - discovery "k8s.io/client-go/discovery" - rest "k8s.io/client-go/rest" - flowcontrol "k8s.io/client-go/util/flowcontrol" ) type Interface interface { diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 1e12ba4ff..23cc9746b 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,6 +19,12 @@ limitations under the License. package fake import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/discovery" + fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" + clientset "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" configv1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/config/v1alpha1" fakeconfigv1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/config/v1alpha1/fake" @@ -28,11 +34,6 @@ import ( fakeschedulingv1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake" slov1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/slo/v1alpha1" fakeslov1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/discovery" - fakediscovery "k8s.io/client-go/discovery/fake" - "k8s.io/client-go/testing" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 856389a42..dd8b286d0 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -19,15 +19,16 @@ limitations under the License. package fake import ( - configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" - quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" + quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index d9ff69ce3..40cb4499c 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -19,15 +19,16 @@ limitations under the License. package scheme import ( - configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" - quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" + quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/typed/config/v1alpha1/clustercolocationprofile.go b/pkg/client/clientset/versioned/typed/config/v1alpha1/clustercolocationprofile.go index 187df8ed6..695d09215 100644 --- a/pkg/client/clientset/versioned/typed/config/v1alpha1/clustercolocationprofile.go +++ b/pkg/client/clientset/versioned/typed/config/v1alpha1/clustercolocationprofile.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // ClusterColocationProfilesGetter has a method to return a ClusterColocationProfileInterface. diff --git a/pkg/client/clientset/versioned/typed/config/v1alpha1/config_client.go b/pkg/client/clientset/versioned/typed/config/v1alpha1/config_client.go index 4b6873c5b..a6f12c372 100644 --- a/pkg/client/clientset/versioned/typed/config/v1alpha1/config_client.go +++ b/pkg/client/clientset/versioned/typed/config/v1alpha1/config_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type ConfigV1alpha1Interface interface { diff --git a/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_clustercolocationprofile.go b/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_clustercolocationprofile.go index 9ea896212..bde68511e 100644 --- a/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_clustercolocationprofile.go +++ b/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_clustercolocationprofile.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" ) // FakeClusterColocationProfiles implements ClusterColocationProfileInterface diff --git a/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go b/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go index 9837814d2..24f346828 100644 --- a/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go +++ b/pkg/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/config/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/config/v1alpha1" ) type FakeConfigV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha1/elasticquotaprofile.go b/pkg/client/clientset/versioned/typed/quota/v1alpha1/elasticquotaprofile.go index eaf1631ba..ad923a18f 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha1/elasticquotaprofile.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha1/elasticquotaprofile.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // ElasticQuotaProfilesGetter has a method to return a ElasticQuotaProfileInterface. diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_elasticquotaprofile.go b/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_elasticquotaprofile.go index d61158334..486f4eb6f 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_elasticquotaprofile.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_elasticquotaprofile.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" ) // FakeElasticQuotaProfiles implements ElasticQuotaProfileInterface diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_quota_client.go b/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_quota_client.go index 92f5090c6..b57b160fc 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_quota_client.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha1/fake/fake_quota_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/quota/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/quota/v1alpha1" ) type FakeQuotaV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha1/quota_client.go b/pkg/client/clientset/versioned/typed/quota/v1alpha1/quota_client.go index 33ab2a19a..18e90e464 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha1/quota_client.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha1/quota_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type QuotaV1alpha1Interface interface { diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/device.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/device.go index 3ba5b0584..88e0c747f 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/device.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/device.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // DevicesGetter has a method to return a DeviceInterface. diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_device.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_device.go index f9bda741a..ebc07ab82 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_device.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_device.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // FakeDevices implements DeviceInterface diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podmigrationjob.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podmigrationjob.go index e50d6caaa..91b1014e2 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podmigrationjob.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_podmigrationjob.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // FakePodMigrationJobs implements PodMigrationJobInterface diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_reservation.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_reservation.go index cd2552266..4d02082cb 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_reservation.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_reservation.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // FakeReservations implements ReservationInterface diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go index 81aaac8b1..29fe43618 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" ) type FakeSchedulingV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podmigrationjob.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podmigrationjob.go index c3389ca24..85e752af9 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podmigrationjob.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/podmigrationjob.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // PodMigrationJobsGetter has a method to return a PodMigrationJobInterface. diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/reservation.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/reservation.go index 32e3f37e8..87f7bd69e 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/reservation.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/reservation.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // ReservationsGetter has a method to return a ReservationInterface. diff --git a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go index 662b33161..876ce47bf 100644 --- a/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go +++ b/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type SchedulingV1alpha1Interface interface { diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodemetric.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodemetric.go index 1fe831c86..5f6e023dc 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodemetric.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodemetric.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) // FakeNodeMetrics implements NodeMetricInterface diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodeslo.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodeslo.go index 5b503ac8f..e34877d86 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodeslo.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_nodeslo.go @@ -21,13 +21,14 @@ package fake import ( "context" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) // FakeNodeSLOs implements NodeSLOInterface diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_slo_client.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_slo_client.go index d7594d792..90c0265a1 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_slo_client.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/fake/fake_slo_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/slo/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/typed/slo/v1alpha1" ) type FakeSloV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodemetric.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodemetric.go index 8329be48d..7e7ef3583 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodemetric.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodemetric.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // NodeMetricsGetter has a method to return a NodeMetricInterface. diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodeslo.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodeslo.go index 1bb4308e4..99061ee28 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodeslo.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/nodeslo.go @@ -22,12 +22,13 @@ import ( "context" "time" - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" + scheme "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" ) // NodeSLOsGetter has a method to return a NodeSLOInterface. diff --git a/pkg/client/clientset/versioned/typed/slo/v1alpha1/slo_client.go b/pkg/client/clientset/versioned/typed/slo/v1alpha1/slo_client.go index cb0181f50..e394b43d5 100644 --- a/pkg/client/clientset/versioned/typed/slo/v1alpha1/slo_client.go +++ b/pkg/client/clientset/versioned/typed/slo/v1alpha1/slo_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type SloV1alpha1Interface interface { diff --git a/pkg/client/informers/externalversions/config/v1alpha1/clustercolocationprofile.go b/pkg/client/informers/externalversions/config/v1alpha1/clustercolocationprofile.go index 77e7d4ee4..17c4de9ca 100644 --- a/pkg/client/informers/externalversions/config/v1alpha1/clustercolocationprofile.go +++ b/pkg/client/informers/externalversions/config/v1alpha1/clustercolocationprofile.go @@ -22,14 +22,15 @@ import ( "context" time "time" - configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + configv1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/config/v1alpha1" ) // ClusterColocationProfileInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index b814041a5..89e57a8dc 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,16 +23,17 @@ import ( sync "sync" time "time" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" config "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/config" internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" quota "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/quota" scheduling "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/scheduling" slo "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/slo" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 0f8c22878..7653b7b14 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,12 +21,13 @@ package externalversions import ( "fmt" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" + v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 9d5f76c47..9f80cd8bd 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,10 +21,11 @@ package internalinterfaces import ( time "time" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/pkg/client/informers/externalversions/quota/v1alpha1/elasticquotaprofile.go b/pkg/client/informers/externalversions/quota/v1alpha1/elasticquotaprofile.go index de8cab940..c85709b64 100644 --- a/pkg/client/informers/externalversions/quota/v1alpha1/elasticquotaprofile.go +++ b/pkg/client/informers/externalversions/quota/v1alpha1/elasticquotaprofile.go @@ -22,14 +22,15 @@ import ( "context" time "time" - quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/quota/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + quotav1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/quota/v1alpha1" ) // ElasticQuotaProfileInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/device.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/device.go index 257d333f2..96749b58d 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/device.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/device.go @@ -22,14 +22,15 @@ import ( "context" time "time" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" ) // DeviceInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/podmigrationjob.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/podmigrationjob.go index 64dadc106..de2e9dd20 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/podmigrationjob.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/podmigrationjob.go @@ -22,14 +22,15 @@ import ( "context" time "time" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" ) // PodMigrationJobInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/scheduling/v1alpha1/reservation.go b/pkg/client/informers/externalversions/scheduling/v1alpha1/reservation.go index d64529e67..b4c505b77 100644 --- a/pkg/client/informers/externalversions/scheduling/v1alpha1/reservation.go +++ b/pkg/client/informers/externalversions/scheduling/v1alpha1/reservation.go @@ -22,14 +22,15 @@ import ( "context" time "time" - schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/scheduling/v1alpha1" ) // ReservationInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/slo/v1alpha1/nodemetric.go b/pkg/client/informers/externalversions/slo/v1alpha1/nodemetric.go index 407d18ff1..ff97282ef 100644 --- a/pkg/client/informers/externalversions/slo/v1alpha1/nodemetric.go +++ b/pkg/client/informers/externalversions/slo/v1alpha1/nodemetric.go @@ -22,14 +22,15 @@ import ( "context" time "time" - slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/slo/v1alpha1" ) // NodeMetricInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/slo/v1alpha1/nodeslo.go b/pkg/client/informers/externalversions/slo/v1alpha1/nodeslo.go index c64b99807..e8557f15a 100644 --- a/pkg/client/informers/externalversions/slo/v1alpha1/nodeslo.go +++ b/pkg/client/informers/externalversions/slo/v1alpha1/nodeslo.go @@ -22,14 +22,15 @@ import ( "context" time "time" - slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" - versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" - internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/slo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + slov1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" + versioned "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned" + internalinterfaces "github.com/koordinator-sh/koordinator/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/koordinator-sh/koordinator/pkg/client/listers/slo/v1alpha1" ) // NodeSLOInformer provides access to a shared informer and lister for diff --git a/pkg/client/listers/config/v1alpha1/clustercolocationprofile.go b/pkg/client/listers/config/v1alpha1/clustercolocationprofile.go index 5fc8eab8d..d294d96a0 100644 --- a/pkg/client/listers/config/v1alpha1/clustercolocationprofile.go +++ b/pkg/client/listers/config/v1alpha1/clustercolocationprofile.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/config/v1alpha1" ) // ClusterColocationProfileLister helps list ClusterColocationProfiles. diff --git a/pkg/client/listers/quota/v1alpha1/elasticquotaprofile.go b/pkg/client/listers/quota/v1alpha1/elasticquotaprofile.go index 3d4e5e88a..2e7c0fc16 100644 --- a/pkg/client/listers/quota/v1alpha1/elasticquotaprofile.go +++ b/pkg/client/listers/quota/v1alpha1/elasticquotaprofile.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/quota/v1alpha1" ) // ElasticQuotaProfileLister helps list ElasticQuotaProfiles. diff --git a/pkg/client/listers/scheduling/v1alpha1/device.go b/pkg/client/listers/scheduling/v1alpha1/device.go index f9b67caf2..0f7ad1b01 100644 --- a/pkg/client/listers/scheduling/v1alpha1/device.go +++ b/pkg/client/listers/scheduling/v1alpha1/device.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // DeviceLister helps list Devices. diff --git a/pkg/client/listers/scheduling/v1alpha1/podmigrationjob.go b/pkg/client/listers/scheduling/v1alpha1/podmigrationjob.go index d979ce7b1..e4b27da3c 100644 --- a/pkg/client/listers/scheduling/v1alpha1/podmigrationjob.go +++ b/pkg/client/listers/scheduling/v1alpha1/podmigrationjob.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // PodMigrationJobLister helps list PodMigrationJobs. diff --git a/pkg/client/listers/scheduling/v1alpha1/reservation.go b/pkg/client/listers/scheduling/v1alpha1/reservation.go index b07e042b5..bd88d4cdf 100644 --- a/pkg/client/listers/scheduling/v1alpha1/reservation.go +++ b/pkg/client/listers/scheduling/v1alpha1/reservation.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" ) // ReservationLister helps list Reservations. diff --git a/pkg/client/listers/slo/v1alpha1/nodemetric.go b/pkg/client/listers/slo/v1alpha1/nodemetric.go index 6f9ba553a..27a7f661e 100644 --- a/pkg/client/listers/slo/v1alpha1/nodemetric.go +++ b/pkg/client/listers/slo/v1alpha1/nodemetric.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) // NodeMetricLister helps list NodeMetrics. diff --git a/pkg/client/listers/slo/v1alpha1/nodeslo.go b/pkg/client/listers/slo/v1alpha1/nodeslo.go index aede4b7db..4aadc8df2 100644 --- a/pkg/client/listers/slo/v1alpha1/nodeslo.go +++ b/pkg/client/listers/slo/v1alpha1/nodeslo.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/koordinator-sh/koordinator/apis/slo/v1alpha1" ) // NodeSLOLister helps list NodeSLOs. diff --git a/pkg/descheduler/apis/config/v1alpha2/zz_generated.conversion.go b/pkg/descheduler/apis/config/v1alpha2/zz_generated.conversion.go index 7b8297d07..79f748a80 100644 --- a/pkg/descheduler/apis/config/v1alpha2/zz_generated.conversion.go +++ b/pkg/descheduler/apis/config/v1alpha2/zz_generated.conversion.go @@ -24,13 +24,14 @@ package v1alpha2 import ( unsafe "unsafe" - config "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" v1alpha1 "k8s.io/component-base/config/v1alpha1" + + config "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" ) func init() { diff --git a/pkg/descheduler/apis/config/v1alpha2/zz_generated.deepcopy.go b/pkg/descheduler/apis/config/v1alpha2/zz_generated.deepcopy.go index 58ce772be..9a3157cd9 100644 --- a/pkg/descheduler/apis/config/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/descheduler/apis/config/v1alpha2/zz_generated.deepcopy.go @@ -22,11 +22,12 @@ limitations under the License. package v1alpha2 import ( - config "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" + + config "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/descheduler/apis/config/validation/validation_loadaware_test.go b/pkg/descheduler/apis/config/validation/validation_loadaware_test.go index 30bfbf591..82920c279 100644 --- a/pkg/descheduler/apis/config/validation/validation_loadaware_test.go +++ b/pkg/descheduler/apis/config/validation/validation_loadaware_test.go @@ -19,8 +19,9 @@ package validation import ( "testing" - deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" "github.com/stretchr/testify/assert" + + deschedulerconfig "github.com/koordinator-sh/koordinator/pkg/descheduler/apis/config" ) func TestValidateLowLoadUtilizationArgs_NumerOfNodes(t *testing.T) { diff --git a/pkg/descheduler/test/test_utils.go b/pkg/descheduler/test/test_utils.go index 02c685b8c..cf1dc1291 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" - "k8s.io/client-go/informers/core/v1" + 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 ed1b6b09b..1d956e6b7 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock.go @@ -26,6 +26,7 @@ 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 dbed36ba3..628a8546a 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go @@ -26,8 +26,9 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" storage "github.com/prometheus/prometheus/storage" + + metriccache "github.com/koordinator-sh/koordinator/pkg/koordlet/metriccache" ) // 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 51973e8ba..66c6a3d8d 100644 --- a/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go +++ b/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go @@ -26,6 +26,7 @@ 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 9d1b73103..00be2d8e8 100644 --- a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go +++ b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go @@ -26,10 +26,11 @@ 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 29ece0586..b419b054e 100644 --- a/pkg/koordlet/util/testutil/mock_utils.go +++ b/pkg/koordlet/util/testutil/mock_utils.go @@ -20,13 +20,14 @@ 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/pkg/scheduler/apis/config/v1beta2/zz_generated.conversion.go b/pkg/scheduler/apis/config/v1beta2/zz_generated.conversion.go index e96fd50b5..7648fb6bb 100644 --- a/pkg/scheduler/apis/config/v1beta2/zz_generated.conversion.go +++ b/pkg/scheduler/apis/config/v1beta2/zz_generated.conversion.go @@ -24,14 +24,15 @@ package v1beta2 import ( unsafe "unsafe" - extension "github.com/koordinator-sh/koordinator/apis/extension" - config "github.com/koordinator-sh/koordinator/pkg/scheduler/apis/config" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" configv1beta2 "k8s.io/kube-scheduler/config/v1beta2" apisconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" + + extension "github.com/koordinator-sh/koordinator/apis/extension" + config "github.com/koordinator-sh/koordinator/pkg/scheduler/apis/config" ) func init() { diff --git a/pkg/scheduler/frameworkext/topologymanager/policy_test.go b/pkg/scheduler/frameworkext/topologymanager/policy_test.go index 62b646468..2a55da896 100644 --- a/pkg/scheduler/frameworkext/topologymanager/policy_test.go +++ b/pkg/scheduler/frameworkext/topologymanager/policy_test.go @@ -22,12 +22,13 @@ import ( "reflect" "testing" - "github.com/koordinator-sh/koordinator/apis/extension" - apiext "github.com/koordinator-sh/koordinator/apis/extension" - "github.com/koordinator-sh/koordinator/pkg/util/bitmask" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/scheduler/framework" + + "github.com/koordinator-sh/koordinator/apis/extension" + apiext "github.com/koordinator-sh/koordinator/apis/extension" + "github.com/koordinator-sh/koordinator/pkg/util/bitmask" ) var _ NUMATopologyHintProvider = &mockNUMATopologyHintProvider{} diff --git a/pkg/scheduler/plugins/nodenumaresource/util.go b/pkg/scheduler/plugins/nodenumaresource/util.go index c850bf572..8bba59ad7 100644 --- a/pkg/scheduler/plugins/nodenumaresource/util.go +++ b/pkg/scheduler/plugins/nodenumaresource/util.go @@ -56,7 +56,7 @@ func mergeTopologyPolicy(nodePolicy, podPolicy extension.NUMATopologyPolicy) (ex return "", errors.New(ErrNotMatchNUMATopology) } if podPolicy != "" { - nodePolicy = extension.NUMATopologyPolicy(podPolicy) + nodePolicy = podPolicy } return nodePolicy, nil } diff --git a/pkg/scheduler/plugins/nodenumaresource/util_test.go b/pkg/scheduler/plugins/nodenumaresource/util_test.go index 480abf782..b0eaf2864 100644 --- a/pkg/scheduler/plugins/nodenumaresource/util_test.go +++ b/pkg/scheduler/plugins/nodenumaresource/util_test.go @@ -23,11 +23,12 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/koordinator-sh/koordinator/apis/extension" - schedulingconfig "github.com/koordinator-sh/koordinator/pkg/scheduler/apis/config" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/koordinator-sh/koordinator/apis/extension" + schedulingconfig "github.com/koordinator-sh/koordinator/pkg/scheduler/apis/config" ) func Test_getCPUBindPolicy(t *testing.T) { diff --git a/test/e2e/framework/exec_util.go b/test/e2e/framework/exec_util.go index 4d96fb37b..ebe3bac67 100644 --- a/test/e2e/framework/exec_util.go +++ b/test/e2e/framework/exec_util.go @@ -23,7 +23,7 @@ import ( "net/url" "strings" - "k8s.io/api/core/v1" + 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 7de1784d0..5c08bb3d0 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" - "k8s.io/api/core/v1" + 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 986cec981..10f96ecd6 100644 --- a/test/e2e/framework/provider.go +++ b/test/e2e/framework/provider.go @@ -21,7 +21,7 @@ import ( "os" "sync" - "k8s.io/api/core/v1" + 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 3adcf8c87..d35cf3442 100644 --- a/test/e2e/quota/multi_tree.go +++ b/test/e2e/quota/multi_tree.go @@ -29,13 +29,14 @@ 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 215cbfad8..3d98b8268 100644 --- a/test/e2e/quota/quota.go +++ b/test/e2e/quota/quota.go @@ -28,12 +28,13 @@ 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 f5c1247e9..d206b0208 100644 --- a/test/e2e/quota/quota_guaranteed.go +++ b/test/e2e/quota/quota_guaranteed.go @@ -31,12 +31,13 @@ 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 9f7eeaf18..80d7d3f98 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" - "github.com/koordinator-sh/koordinator/test/e2e/testing-manifests" + 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.