goimports -w -local github.com/koordinator-sh/koordinator ./

Signed-off-by: KunWuLuan <kunwuluan@gmail.com>
koordinator-sh · Mar 6, 2024 · 81554b6 · 81554b6
1 parent 6de91a0
commit 81554b6
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 22 deletions.
diff --git a/apis/runtime/v1alpha1/api.pb.go b/apis/runtime/v1alpha1/api.pb.go
diff --git a/apis/runtime/v1alpha1/api_grpc.pb.go b/apis/runtime/v1alpha1/api_grpc.pb.go
diff --git 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/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
@@ -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
diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go b/pkg/koordlet/metriccache/mockmetriccache/mock_metric_result.go
diff --git a/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go b/pkg/koordlet/metriccache/mockmetriccache/mock_tsdb_storage.go
diff --git a/pkg/koordlet/statesinformer/mockstatesinformer/mock.go b/pkg/koordlet/statesinformer/mockstatesinformer/mock.go
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.