From a55af2d35ad6af62460063bc0bbb9a5bdf74b145 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Fri, 17 Sep 2021 14:13:15 -0700 Subject: [PATCH] cleanup duplicated import of "k8s.io/apimachinery/pkg/runtime" --- pkg/scheduler/generic_scheduler_test.go | 11 +++++------ pkg/scheduler/scheduler_test.go | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/scheduler/generic_scheduler_test.go b/pkg/scheduler/generic_scheduler_test.go index cec69875bfe..07ed33bac11 100644 --- a/pkg/scheduler/generic_scheduler_test.go +++ b/pkg/scheduler/generic_scheduler_test.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - apiruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" @@ -606,7 +605,7 @@ func TestGenericScheduler(t *testing.T) { // Pod with existing PVC registerPlugins: []st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New), - st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return volumebinding.New(plArgs, fh, feature.Features{}) }), st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin), @@ -641,7 +640,7 @@ func TestGenericScheduler(t *testing.T) { // Pod with non existing PVC registerPlugins: []st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New), - st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return volumebinding.New(plArgs, fh, feature.Features{}) }), st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin), @@ -692,7 +691,7 @@ func TestGenericScheduler(t *testing.T) { // Pod with deleting PVC registerPlugins: []st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New), - st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + st.RegisterPreFilterPlugin(volumebinding.Name, func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return volumebinding.New(plArgs, fh, feature.Features{}) }), st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin), @@ -1319,11 +1318,11 @@ func TestZeroRequest(t *testing.T) { pluginRegistrations := []st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New), st.RegisterScorePlugin(noderesources.FitName, - func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return noderesources.NewFit(plArgs, fh, feature.Features{}) }, 1), - st.RegisterScorePlugin(noderesources.BalancedAllocationName, func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + st.RegisterScorePlugin(noderesources.BalancedAllocationName, func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return noderesources.NewBalancedAllocation(plArgs, fh, feature.Features{}) }, 1), st.RegisterScorePlugin(selectorspread.Name, selectorspread.New, 1), diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 06be14085fb..c1c0f0b1ce6 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -37,7 +37,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - apiruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" @@ -867,7 +866,7 @@ func TestSchedulerFailedSchedulingReasons(t *testing.T) { fns := []st.RegisterPluginFunc{ st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New), st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New), - st.RegisterPluginAsExtensions(noderesources.FitName, func(plArgs apiruntime.Object, fh framework.Handle) (framework.Plugin, error) { + st.RegisterPluginAsExtensions(noderesources.FitName, func(plArgs runtime.Object, fh framework.Handle) (framework.Plugin, error) { return noderesources.NewFit(plArgs, fh, feature.Features{}) }, "Filter", "PreFilter"), }