From 8519d3399f10be33a45da368a48ee763acbe3999 Mon Sep 17 00:00:00 2001 From: Kensei Nakada Date: Sun, 25 Aug 2024 13:10:29 +0900 Subject: [PATCH] chore: move the scheduler internal components out of internal dir --- pkg/scheduler/{internal => backend}/cache/cache.go | 0 pkg/scheduler/{internal => backend}/cache/cache_test.go | 0 .../{internal => backend}/cache/debugger/comparer.go | 6 +++--- .../{internal => backend}/cache/debugger/comparer_test.go | 0 .../{internal => backend}/cache/debugger/debugger.go | 4 ++-- .../{internal => backend}/cache/debugger/dumper.go | 6 +++--- .../{internal => backend}/cache/debugger/signal.go | 0 .../{internal => backend}/cache/debugger/signal_windows.go | 0 .../{internal => backend}/cache/fake/fake_cache.go | 2 +- pkg/scheduler/{internal => backend}/cache/interface.go | 0 pkg/scheduler/{internal => backend}/cache/node_tree.go | 0 pkg/scheduler/{internal => backend}/cache/node_tree_test.go | 0 pkg/scheduler/{internal => backend}/cache/snapshot.go | 0 pkg/scheduler/{internal => backend}/cache/snapshot_test.go | 0 pkg/scheduler/{internal => backend}/heap/heap.go | 0 pkg/scheduler/{internal => backend}/heap/heap_test.go | 0 pkg/scheduler/{internal => backend}/queue/active_queue.go | 2 +- pkg/scheduler/{internal => backend}/queue/nominator.go | 0 .../{internal => backend}/queue/scheduling_queue.go | 2 +- .../{internal => backend}/queue/scheduling_queue_test.go | 0 pkg/scheduler/{internal => backend}/queue/testing.go | 0 pkg/scheduler/eventhandlers.go | 2 +- pkg/scheduler/eventhandlers_test.go | 4 ++-- pkg/scheduler/extender_test.go | 4 ++-- .../plugins/defaultpreemption/default_preemption_test.go | 4 ++-- .../framework/plugins/imagelocality/image_locality_test.go | 2 +- .../framework/plugins/interpodaffinity/filtering_test.go | 2 +- .../framework/plugins/interpodaffinity/plugin_test.go | 2 +- .../framework/plugins/interpodaffinity/scoring_test.go | 2 +- .../framework/plugins/nodeaffinity/node_affinity_test.go | 2 +- .../plugins/noderesources/balanced_allocation_test.go | 2 +- pkg/scheduler/framework/plugins/noderesources/fit_test.go | 2 +- .../framework/plugins/noderesources/least_allocated_test.go | 2 +- .../framework/plugins/noderesources/most_allocated_test.go | 2 +- .../noderesources/requested_to_capacity_ratio_test.go | 2 +- .../framework/plugins/podtopologyspread/filtering_test.go | 2 +- .../framework/plugins/podtopologyspread/plugin_test.go | 2 +- .../framework/plugins/podtopologyspread/scoring_test.go | 2 +- .../plugins/tainttoleration/taint_toleration_test.go | 2 +- .../plugins/volumerestrictions/volume_restrictions_test.go | 2 +- .../framework/plugins/volumezone/volume_zone_test.go | 2 +- pkg/scheduler/framework/preemption/preemption_test.go | 4 ++-- pkg/scheduler/framework/runtime/framework_test.go | 2 +- pkg/scheduler/schedule_one_test.go | 6 +++--- pkg/scheduler/scheduler.go | 6 +++--- pkg/scheduler/scheduler_test.go | 4 ++-- 46 files changed, 45 insertions(+), 45 deletions(-) rename pkg/scheduler/{internal => backend}/cache/cache.go (100%) rename pkg/scheduler/{internal => backend}/cache/cache_test.go (100%) rename pkg/scheduler/{internal => backend}/cache/debugger/comparer.go (95%) rename pkg/scheduler/{internal => backend}/cache/debugger/comparer_test.go (100%) rename pkg/scheduler/{internal => backend}/cache/debugger/debugger.go (93%) rename pkg/scheduler/{internal => backend}/cache/debugger/dumper.go (95%) rename pkg/scheduler/{internal => backend}/cache/debugger/signal.go (100%) rename pkg/scheduler/{internal => backend}/cache/debugger/signal_windows.go (100%) rename pkg/scheduler/{internal => backend}/cache/fake/fake_cache.go (97%) rename pkg/scheduler/{internal => backend}/cache/interface.go (100%) rename pkg/scheduler/{internal => backend}/cache/node_tree.go (100%) rename pkg/scheduler/{internal => backend}/cache/node_tree_test.go (100%) rename pkg/scheduler/{internal => backend}/cache/snapshot.go (100%) rename pkg/scheduler/{internal => backend}/cache/snapshot_test.go (100%) rename pkg/scheduler/{internal => backend}/heap/heap.go (100%) rename pkg/scheduler/{internal => backend}/heap/heap_test.go (100%) rename pkg/scheduler/{internal => backend}/queue/active_queue.go (99%) rename pkg/scheduler/{internal => backend}/queue/nominator.go (100%) rename pkg/scheduler/{internal => backend}/queue/scheduling_queue.go (99%) rename pkg/scheduler/{internal => backend}/queue/scheduling_queue_test.go (100%) rename pkg/scheduler/{internal => backend}/queue/testing.go (100%) diff --git a/pkg/scheduler/internal/cache/cache.go b/pkg/scheduler/backend/cache/cache.go similarity index 100% rename from pkg/scheduler/internal/cache/cache.go rename to pkg/scheduler/backend/cache/cache.go diff --git a/pkg/scheduler/internal/cache/cache_test.go b/pkg/scheduler/backend/cache/cache_test.go similarity index 100% rename from pkg/scheduler/internal/cache/cache_test.go rename to pkg/scheduler/backend/cache/cache_test.go diff --git a/pkg/scheduler/internal/cache/debugger/comparer.go b/pkg/scheduler/backend/cache/debugger/comparer.go similarity index 95% rename from pkg/scheduler/internal/cache/debugger/comparer.go rename to pkg/scheduler/backend/cache/debugger/comparer.go index bc7648dce6b..cbba8865d9d 100644 --- a/pkg/scheduler/internal/cache/debugger/comparer.go +++ b/pkg/scheduler/backend/cache/debugger/comparer.go @@ -20,13 +20,13 @@ import ( "sort" "strings" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/klog/v2" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" ) // CacheComparer is an implementation of the Scheduler's cache comparer. diff --git a/pkg/scheduler/internal/cache/debugger/comparer_test.go b/pkg/scheduler/backend/cache/debugger/comparer_test.go similarity index 100% rename from pkg/scheduler/internal/cache/debugger/comparer_test.go rename to pkg/scheduler/backend/cache/debugger/comparer_test.go diff --git a/pkg/scheduler/internal/cache/debugger/debugger.go b/pkg/scheduler/backend/cache/debugger/debugger.go similarity index 93% rename from pkg/scheduler/internal/cache/debugger/debugger.go rename to pkg/scheduler/backend/cache/debugger/debugger.go index 8a1f80c88b4..5f0bc8a2c4a 100644 --- a/pkg/scheduler/internal/cache/debugger/debugger.go +++ b/pkg/scheduler/backend/cache/debugger/debugger.go @@ -23,8 +23,8 @@ import ( corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/klog/v2" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" ) // CacheDebugger provides ways to check and write cache information for debugging. diff --git a/pkg/scheduler/internal/cache/debugger/dumper.go b/pkg/scheduler/backend/cache/debugger/dumper.go similarity index 95% rename from pkg/scheduler/internal/cache/debugger/dumper.go rename to pkg/scheduler/backend/cache/debugger/dumper.go index 618be63d989..96288a501d1 100644 --- a/pkg/scheduler/internal/cache/debugger/dumper.go +++ b/pkg/scheduler/backend/cache/debugger/dumper.go @@ -22,10 +22,10 @@ import ( "k8s.io/klog/v2" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/queue" ) // CacheDumper writes some information from the scheduler cache and the scheduling queue to the diff --git a/pkg/scheduler/internal/cache/debugger/signal.go b/pkg/scheduler/backend/cache/debugger/signal.go similarity index 100% rename from pkg/scheduler/internal/cache/debugger/signal.go rename to pkg/scheduler/backend/cache/debugger/signal.go diff --git a/pkg/scheduler/internal/cache/debugger/signal_windows.go b/pkg/scheduler/backend/cache/debugger/signal_windows.go similarity index 100% rename from pkg/scheduler/internal/cache/debugger/signal_windows.go rename to pkg/scheduler/backend/cache/debugger/signal_windows.go diff --git a/pkg/scheduler/internal/cache/fake/fake_cache.go b/pkg/scheduler/backend/cache/fake/fake_cache.go similarity index 97% rename from pkg/scheduler/internal/cache/fake/fake_cache.go rename to pkg/scheduler/backend/cache/fake/fake_cache.go index 1a39f9cef51..50b44b8da10 100644 --- a/pkg/scheduler/internal/cache/fake/fake_cache.go +++ b/pkg/scheduler/backend/cache/fake/fake_cache.go @@ -19,8 +19,8 @@ package fake import ( v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" ) // Cache is used for testing diff --git a/pkg/scheduler/internal/cache/interface.go b/pkg/scheduler/backend/cache/interface.go similarity index 100% rename from pkg/scheduler/internal/cache/interface.go rename to pkg/scheduler/backend/cache/interface.go diff --git a/pkg/scheduler/internal/cache/node_tree.go b/pkg/scheduler/backend/cache/node_tree.go similarity index 100% rename from pkg/scheduler/internal/cache/node_tree.go rename to pkg/scheduler/backend/cache/node_tree.go diff --git a/pkg/scheduler/internal/cache/node_tree_test.go b/pkg/scheduler/backend/cache/node_tree_test.go similarity index 100% rename from pkg/scheduler/internal/cache/node_tree_test.go rename to pkg/scheduler/backend/cache/node_tree_test.go diff --git a/pkg/scheduler/internal/cache/snapshot.go b/pkg/scheduler/backend/cache/snapshot.go similarity index 100% rename from pkg/scheduler/internal/cache/snapshot.go rename to pkg/scheduler/backend/cache/snapshot.go diff --git a/pkg/scheduler/internal/cache/snapshot_test.go b/pkg/scheduler/backend/cache/snapshot_test.go similarity index 100% rename from pkg/scheduler/internal/cache/snapshot_test.go rename to pkg/scheduler/backend/cache/snapshot_test.go diff --git a/pkg/scheduler/internal/heap/heap.go b/pkg/scheduler/backend/heap/heap.go similarity index 100% rename from pkg/scheduler/internal/heap/heap.go rename to pkg/scheduler/backend/heap/heap.go diff --git a/pkg/scheduler/internal/heap/heap_test.go b/pkg/scheduler/backend/heap/heap_test.go similarity index 100% rename from pkg/scheduler/internal/heap/heap_test.go rename to pkg/scheduler/backend/heap/heap_test.go diff --git a/pkg/scheduler/internal/queue/active_queue.go b/pkg/scheduler/backend/queue/active_queue.go similarity index 99% rename from pkg/scheduler/internal/queue/active_queue.go rename to pkg/scheduler/backend/queue/active_queue.go index 223c7229cdd..68be798ab40 100644 --- a/pkg/scheduler/internal/queue/active_queue.go +++ b/pkg/scheduler/backend/queue/active_queue.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" + "k8s.io/kubernetes/pkg/scheduler/backend/heap" "k8s.io/kubernetes/pkg/scheduler/framework" - "k8s.io/kubernetes/pkg/scheduler/internal/heap" "k8s.io/kubernetes/pkg/scheduler/metrics" ) diff --git a/pkg/scheduler/internal/queue/nominator.go b/pkg/scheduler/backend/queue/nominator.go similarity index 100% rename from pkg/scheduler/internal/queue/nominator.go rename to pkg/scheduler/backend/queue/nominator.go diff --git a/pkg/scheduler/internal/queue/scheduling_queue.go b/pkg/scheduler/backend/queue/scheduling_queue.go similarity index 99% rename from pkg/scheduler/internal/queue/scheduling_queue.go rename to pkg/scheduler/backend/queue/scheduling_queue.go index 25b1e993842..56d4ec20bab 100644 --- a/pkg/scheduler/internal/queue/scheduling_queue.go +++ b/pkg/scheduler/backend/queue/scheduling_queue.go @@ -44,11 +44,11 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/pkg/scheduler/backend/heap" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/names" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/podtopologyspread" - "k8s.io/kubernetes/pkg/scheduler/internal/heap" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/scheduler/util" "k8s.io/utils/clock" diff --git a/pkg/scheduler/internal/queue/scheduling_queue_test.go b/pkg/scheduler/backend/queue/scheduling_queue_test.go similarity index 100% rename from pkg/scheduler/internal/queue/scheduling_queue_test.go rename to pkg/scheduler/backend/queue/scheduling_queue_test.go diff --git a/pkg/scheduler/internal/queue/testing.go b/pkg/scheduler/backend/queue/testing.go similarity index 100% rename from pkg/scheduler/internal/queue/testing.go rename to pkg/scheduler/backend/queue/testing.go diff --git a/pkg/scheduler/eventhandlers.go b/pkg/scheduler/eventhandlers.go index 8a31cc4baa5..73024e3cb36 100644 --- a/pkg/scheduler/eventhandlers.go +++ b/pkg/scheduler/eventhandlers.go @@ -35,12 +35,12 @@ import ( corev1nodeaffinity "k8s.io/component-helpers/scheduling/corev1/nodeaffinity" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources" - "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/scheduler/profile" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" diff --git a/pkg/scheduler/eventhandlers_test.go b/pkg/scheduler/eventhandlers_test.go index a053fa4bc55..a4e275bb7db 100644 --- a/pkg/scheduler/eventhandlers_test.go +++ b/pkg/scheduler/eventhandlers_test.go @@ -41,13 +41,13 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" + "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" - "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" ) diff --git a/pkg/scheduler/extender_test.go b/pkg/scheduler/extender_test.go index c474087757c..2d9710a9cdd 100644 --- a/pkg/scheduler/extender_test.go +++ b/pkg/scheduler/extender_test.go @@ -30,12 +30,12 @@ import ( "k8s.io/klog/v2/ktesting" extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go index 7563085e694..d2510f3f0ee 100644 --- a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go +++ b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go @@ -45,6 +45,8 @@ import ( apipod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/scheduler/apis/config" configv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" @@ -57,8 +59,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration" "k8s.io/kubernetes/pkg/scheduler/framework/preemption" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go b/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go index 44a5de2a9b3..94ac192dcab 100644 --- a/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go +++ b/pkg/scheduler/framework/plugins/imagelocality/image_locality_test.go @@ -26,9 +26,9 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2/ktesting" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" ) func TestImageLocalityPriority(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/filtering_test.go b/pkg/scheduler/framework/plugins/interpodaffinity/filtering_test.go index 29114d8e222..af661e01d1c 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/filtering_test.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/filtering_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/plugin_test.go b/pkg/scheduler/framework/plugins/interpodaffinity/plugin_test.go index 67184dd8257..74a364286a7 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/plugin_test.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/plugin_test.go @@ -25,9 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/scoring_test.go b/pkg/scheduler/framework/plugins/interpodaffinity/scoring_test.go index c3704433585..97e874edc23 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/scoring_test.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/scoring_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity_test.go b/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity_test.go index 1d945f3efb4..60a5e50d22f 100644 --- a/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity_test.go +++ b/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go index 47d9ec75ad7..301c7222ad3 100644 --- a/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go @@ -26,10 +26,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/fit_test.go b/pkg/scheduler/framework/plugins/noderesources/fit_test.go index 263e661abde..49701381a9a 100644 --- a/pkg/scheduler/framework/plugins/noderesources/fit_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/fit_test.go @@ -29,11 +29,11 @@ import ( "k8s.io/klog/v2/ktesting" _ "k8s.io/klog/v2/ktesting/init" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go b/pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go index 79e6c7dbe5b..09aef884f15 100644 --- a/pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/least_allocated_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go b/pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go index 4e8f135ad08..cf3c48c2427 100644 --- a/pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/most_allocated_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go b/pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go index 5af5ccd9ffd..396c878069b 100644 --- a/pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plfeature "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/podtopologyspread/filtering_test.go b/pkg/scheduler/framework/plugins/podtopologyspread/filtering_test.go index 28de09bc62b..63be7b13792 100644 --- a/pkg/scheduler/framework/plugins/podtopologyspread/filtering_test.go +++ b/pkg/scheduler/framework/plugins/podtopologyspread/filtering_test.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/framework/plugins/podtopologyspread/plugin_test.go b/pkg/scheduler/framework/plugins/podtopologyspread/plugin_test.go index 74c741c892a..f7a0e35c635 100644 --- a/pkg/scheduler/framework/plugins/podtopologyspread/plugin_test.go +++ b/pkg/scheduler/framework/plugins/podtopologyspread/plugin_test.go @@ -23,9 +23,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go b/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go index 4f42817a4e4..04ef75adaf0 100644 --- a/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go +++ b/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go @@ -31,11 +31,11 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" "k8s.io/utils/ptr" diff --git a/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration_test.go b/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration_test.go index ac542b94b46..f88ab88554e 100644 --- a/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration_test.go +++ b/pkg/scheduler/framework/plugins/tainttoleration/taint_toleration_test.go @@ -25,10 +25,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2/ktesting" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions_test.go b/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions_test.go index 6ea2144df33..99b1454558b 100644 --- a/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions_test.go +++ b/pkg/scheduler/framework/plugins/volumerestrictions/volume_restrictions_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" ) diff --git a/pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go b/pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go index 5c95dce69cc..7c48fc9ca54 100644 --- a/pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go +++ b/pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + "k8s.io/kubernetes/pkg/scheduler/backend/cache" "k8s.io/kubernetes/pkg/scheduler/framework" plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing" - "k8s.io/kubernetes/pkg/scheduler/internal/cache" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/preemption/preemption_test.go b/pkg/scheduler/framework/preemption/preemption_test.go index 04d8c92c50c..bfd1764b85e 100644 --- a/pkg/scheduler/framework/preemption/preemption_test.go +++ b/pkg/scheduler/framework/preemption/preemption_test.go @@ -29,13 +29,13 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" "k8s.io/klog/v2/ktesting" extenderv1 "k8s.io/kube-scheduler/extender/v1" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "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/queuesort" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" ) diff --git a/pkg/scheduler/framework/runtime/framework_test.go b/pkg/scheduler/framework/runtime/framework_test.go index 9208f8bd575..372d8ddf6df 100644 --- a/pkg/scheduler/framework/runtime/framework_test.go +++ b/pkg/scheduler/framework/runtime/framework_test.go @@ -36,8 +36,8 @@ import ( "k8s.io/component-base/metrics/testutil" "k8s.io/klog/v2/ktesting" "k8s.io/kubernetes/pkg/scheduler/apis/config" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/schedule_one_test.go b/pkg/scheduler/schedule_one_test.go index a762fba3d92..c548f6f710b 100644 --- a/pkg/scheduler/schedule_one_test.go +++ b/pkg/scheduler/schedule_one_test.go @@ -52,6 +52,9 @@ import ( "k8s.io/klog/v2/ktesting" extenderv1 "k8s.io/kube-scheduler/extender/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + fakecache "k8s.io/kubernetes/pkg/scheduler/backend/cache/fake" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" @@ -62,9 +65,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - fakecache "k8s.io/kubernetes/pkg/scheduler/internal/cache/fake" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/profile" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 3e249668998..e2e46064acd 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -38,14 +38,14 @@ import ( "k8s.io/kubernetes/pkg/features" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + cachedebugger "k8s.io/kubernetes/pkg/scheduler/backend/cache/debugger" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/parallelize" frameworkplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - cachedebugger "k8s.io/kubernetes/pkg/scheduler/internal/cache/debugger" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/scheduler/profile" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index e3986bf4193..5e01bb60c24 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -49,13 +49,13 @@ import ( "k8s.io/kubernetes/pkg/features" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults" + internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" + internalqueue "k8s.io/kubernetes/pkg/scheduler/backend/queue" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - internalcache "k8s.io/kubernetes/pkg/scheduler/internal/cache" - internalqueue "k8s.io/kubernetes/pkg/scheduler/internal/queue" "k8s.io/kubernetes/pkg/scheduler/profile" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework"