From 9dc0489c1ae3540453d94348efcc536585c31805 Mon Sep 17 00:00:00 2001 From: sanposhiho <44139130+sanposhiho@users.noreply.github.com> Date: Thu, 21 Oct 2021 02:35:12 +0900 Subject: [PATCH] Fix: move parallelize package to non-internal file --- pkg/scheduler/framework/interface.go | 2 +- .../{internal => framework}/parallelize/error_channel.go | 0 .../{internal => framework}/parallelize/error_channel_test.go | 0 .../{internal => framework}/parallelize/parallelism.go | 0 .../{internal => framework}/parallelize/parallelism_test.go | 0 .../plugins/defaultpreemption/default_preemption_test.go | 2 +- pkg/scheduler/framework/plugins/interpodaffinity/plugin.go | 2 +- pkg/scheduler/framework/plugins/podtopologyspread/plugin.go | 2 +- .../plugins/selectorspread/selector_spread_perf_test.go | 2 +- .../framework/plugins/volumerestrictions/volume_restrictions.go | 2 +- pkg/scheduler/framework/preemption/preemption_test.go | 2 +- pkg/scheduler/framework/runtime/framework.go | 2 +- pkg/scheduler/generic_scheduler.go | 2 +- pkg/scheduler/scheduler.go | 2 +- 14 files changed, 10 insertions(+), 10 deletions(-) rename pkg/scheduler/{internal => framework}/parallelize/error_channel.go (100%) rename pkg/scheduler/{internal => framework}/parallelize/error_channel_test.go (100%) rename pkg/scheduler/{internal => framework}/parallelize/parallelism.go (100%) rename pkg/scheduler/{internal => framework}/parallelize/parallelism_test.go (100%) diff --git a/pkg/scheduler/framework/interface.go b/pkg/scheduler/framework/interface.go index 0ea75576314..a72daab2db8 100644 --- a/pkg/scheduler/framework/interface.go +++ b/pkg/scheduler/framework/interface.go @@ -35,7 +35,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/events" "k8s.io/kubernetes/pkg/scheduler/apis/config" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" ) // NodeScoreList declares a list of nodes and their scores. diff --git a/pkg/scheduler/internal/parallelize/error_channel.go b/pkg/scheduler/framework/parallelize/error_channel.go similarity index 100% rename from pkg/scheduler/internal/parallelize/error_channel.go rename to pkg/scheduler/framework/parallelize/error_channel.go diff --git a/pkg/scheduler/internal/parallelize/error_channel_test.go b/pkg/scheduler/framework/parallelize/error_channel_test.go similarity index 100% rename from pkg/scheduler/internal/parallelize/error_channel_test.go rename to pkg/scheduler/framework/parallelize/error_channel_test.go diff --git a/pkg/scheduler/internal/parallelize/parallelism.go b/pkg/scheduler/framework/parallelize/parallelism.go similarity index 100% rename from pkg/scheduler/internal/parallelize/parallelism.go rename to pkg/scheduler/framework/parallelize/parallelism.go diff --git a/pkg/scheduler/internal/parallelize/parallelism_test.go b/pkg/scheduler/framework/parallelize/parallelism_test.go similarity index 100% rename from pkg/scheduler/internal/parallelize/parallelism_test.go rename to pkg/scheduler/framework/parallelize/parallelism_test.go diff --git a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go index 751214672a2..5e947c0f242 100644 --- a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go +++ b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go @@ -40,6 +40,7 @@ import ( "k8s.io/kubernetes/pkg/scheduler/apis/config" configv1beta1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" @@ -51,7 +52,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/preemption" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/plugin.go b/pkg/scheduler/framework/plugins/interpodaffinity/plugin.go index 184ff5c3eed..da6b35b5e68 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/plugin.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/plugin.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/validation" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/names" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" ) const ( diff --git a/pkg/scheduler/framework/plugins/podtopologyspread/plugin.go b/pkg/scheduler/framework/plugins/podtopologyspread/plugin.go index 31eb457fc43..568c1cc77ea 100644 --- a/pkg/scheduler/framework/plugins/podtopologyspread/plugin.go +++ b/pkg/scheduler/framework/plugins/podtopologyspread/plugin.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/validation" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/names" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" ) const ( diff --git a/pkg/scheduler/framework/plugins/selectorspread/selector_spread_perf_test.go b/pkg/scheduler/framework/plugins/selectorspread/selector_spread_perf_test.go index b5ea1dd8c69..0b661624fbc 100644 --- a/pkg/scheduler/framework/plugins/selectorspread/selector_spread_perf_test.go +++ b/pkg/scheduler/framework/plugins/selectorspread/selector_spread_perf_test.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go b/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go index 53856c26eda..4bc94fcdd25 100644 --- a/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go +++ b/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions.go @@ -27,9 +27,9 @@ import ( corelisters "k8s.io/client-go/listers/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/names" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" ) // VolumeRestrictions is a plugin that checks volume restrictions. diff --git a/pkg/scheduler/framework/preemption/preemption_test.go b/pkg/scheduler/framework/preemption/preemption_test.go index 326e64c02ea..572d55086f5 100644 --- a/pkg/scheduler/framework/preemption/preemption_test.go +++ b/pkg/scheduler/framework/preemption/preemption_test.go @@ -31,6 +31,7 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" extenderv1 "k8s.io/kube-scheduler/extender/v1" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity" @@ -45,7 +46,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumezone" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go index 65707eeeb27..3d93aa9260b 100644 --- a/pkg/scheduler/framework/runtime/framework.go +++ b/pkg/scheduler/framework/runtime/framework.go @@ -35,7 +35,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/framework" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/metrics" ) diff --git a/pkg/scheduler/generic_scheduler.go b/pkg/scheduler/generic_scheduler.go index 4fd591c24ef..5d7a6c69442 100644 --- a/pkg/scheduler/generic_scheduler.go +++ b/pkg/scheduler/generic_scheduler.go @@ -32,9 +32,9 @@ import ( extenderv1 "k8s.io/kube-scheduler/extender/v1" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" "k8s.io/kubernetes/pkg/scheduler/metrics" utiltrace "k8s.io/utils/trace" ) diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 4cf15c0f3a9..54bc11bc90d 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -45,10 +45,10 @@ import ( schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" "k8s.io/kubernetes/pkg/scheduler/framework" + "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" frameworkplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/parallelize" internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/scheduler/profile"