From b2159b5d6637afea96ad68368bea5cef307254aa Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 9 Jan 2020 17:27:15 -0800 Subject: [PATCH] Remove scheduler/algorithm/priorities/util package --- pkg/scheduler/algorithm/BUILD | 1 - pkg/scheduler/algorithm/priorities/BUILD | 17 ------ pkg/scheduler/algorithm/priorities/util/BUILD | 53 ------------------- pkg/scheduler/core/BUILD | 1 - pkg/scheduler/core/generic_scheduler_test.go | 38 ++++++------- .../framework/plugins/interpodaffinity/BUILD | 1 - .../plugins/interpodaffinity/filtering.go | 13 +++-- .../plugins/interpodaffinity/scoring.go | 5 +- .../framework/plugins/noderesources/BUILD | 2 +- .../noderesources/resource_allocation.go | 4 +- pkg/scheduler/internal/cache/BUILD | 2 +- pkg/scheduler/internal/cache/cache_test.go | 10 ++-- pkg/scheduler/internal/queue/BUILD | 1 - .../internal/queue/scheduling_queue.go | 5 +- pkg/scheduler/nodeinfo/BUILD | 2 +- pkg/scheduler/nodeinfo/node_info.go | 4 +- pkg/scheduler/util/BUILD | 12 +++++ .../priorities => }/util/non_zero.go | 0 .../priorities => }/util/non_zero_test.go | 0 .../priorities => }/util/topologies.go | 0 .../priorities => }/util/topologies_test.go | 0 test/e2e/scheduling/BUILD | 2 +- test/e2e/scheduling/priorities.go | 4 +- 23 files changed, 56 insertions(+), 121 deletions(-) delete mode 100644 pkg/scheduler/algorithm/priorities/BUILD delete mode 100644 pkg/scheduler/algorithm/priorities/util/BUILD rename pkg/scheduler/{algorithm/priorities => }/util/non_zero.go (100%) rename pkg/scheduler/{algorithm/priorities => }/util/non_zero_test.go (100%) rename pkg/scheduler/{algorithm/priorities => }/util/topologies.go (100%) rename pkg/scheduler/{algorithm/priorities => }/util/topologies_test.go (100%) diff --git a/pkg/scheduler/algorithm/BUILD b/pkg/scheduler/algorithm/BUILD index df6cdf227b0..a9b274ae904 100644 --- a/pkg/scheduler/algorithm/BUILD +++ b/pkg/scheduler/algorithm/BUILD @@ -27,7 +27,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/scheduler/algorithm/predicates:all-srcs", - "//pkg/scheduler/algorithm/priorities:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/scheduler/algorithm/priorities/BUILD b/pkg/scheduler/algorithm/priorities/BUILD deleted file mode 100644 index 786a035a8db..00000000000 --- a/pkg/scheduler/algorithm/priorities/BUILD +++ /dev/null @@ -1,17 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/scheduler/algorithm/priorities/util:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/scheduler/algorithm/priorities/util/BUILD b/pkg/scheduler/algorithm/priorities/util/BUILD deleted file mode 100644 index b3b8aa2edf1..00000000000 --- a/pkg/scheduler/algorithm/priorities/util/BUILD +++ /dev/null @@ -1,53 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "non_zero_test.go", - "topologies_test.go", - ], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/github.com/stretchr/testify/assert:go_default_library", - ], -) - -go_library( - name = "go_default_library", - srcs = [ - "non_zero.go", - "topologies.go", - ], - importpath = "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", - deps = [ - "//pkg/apis/core/v1/helper:go_default_library", - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/scheduler/core/BUILD b/pkg/scheduler/core/BUILD index 394a138fcea..ac99d65c311 100644 --- a/pkg/scheduler/core/BUILD +++ b/pkg/scheduler/core/BUILD @@ -48,7 +48,6 @@ go_test( "//pkg/api/v1/pod:go_default_library", "//pkg/scheduler/algorithm:go_default_library", "//pkg/scheduler/algorithm/predicates:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/extender/v1:go_default_library", "//pkg/scheduler/framework/plugins/defaultpodtopologyspread:go_default_library", diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go index 6f80cc89511..601f12fda99 100644 --- a/pkg/scheduler/core/generic_scheduler_test.go +++ b/pkg/scheduler/core/generic_scheduler_test.go @@ -38,7 +38,6 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/scheduler/algorithm" algorithmpredicates "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" extenderv1 "k8s.io/kubernetes/pkg/scheduler/apis/extender/v1" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpodtopologyspread" @@ -59,6 +58,7 @@ import ( schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot" st "k8s.io/kubernetes/pkg/scheduler/testing" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) var ( @@ -1024,9 +1024,9 @@ func TestZeroRequest(t *testing.T) { Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceCPU: resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest, 10) + "m"), v1.ResourceMemory: resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest, 10)), }, }, }, @@ -1041,9 +1041,9 @@ func TestZeroRequest(t *testing.T) { Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceCPU: resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest*3, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest*3, 10) + "m"), v1.ResourceMemory: resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest*3, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest*3, 10)), }, }, }, @@ -1065,7 +1065,7 @@ func TestZeroRequest(t *testing.T) { // and when the zero-request pod is the one being scheduled. { pod: &v1.Pod{Spec: noResources}, - nodes: []*v1.Node{makeNode("machine1", 1000, priorityutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, priorityutil.DefaultMemoryRequest*10)}, + nodes: []*v1.Node{makeNode("machine1", 1000, schedutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, schedutil.DefaultMemoryRequest*10)}, name: "test priority of zero-request pod with machine with zero-request pod", pods: []*v1.Pod{ {Spec: large1}, {Spec: noResources1}, @@ -1075,7 +1075,7 @@ func TestZeroRequest(t *testing.T) { }, { pod: &v1.Pod{Spec: small}, - nodes: []*v1.Node{makeNode("machine1", 1000, priorityutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, priorityutil.DefaultMemoryRequest*10)}, + nodes: []*v1.Node{makeNode("machine1", 1000, schedutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, schedutil.DefaultMemoryRequest*10)}, name: "test priority of nonzero-request pod with machine with zero-request pod", pods: []*v1.Pod{ {Spec: large1}, {Spec: noResources1}, @@ -1086,7 +1086,7 @@ func TestZeroRequest(t *testing.T) { // The point of this test is to verify that we're not just getting the same score no matter what we schedule. { pod: &v1.Pod{Spec: large}, - nodes: []*v1.Node{makeNode("machine1", 1000, priorityutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, priorityutil.DefaultMemoryRequest*10)}, + nodes: []*v1.Node{makeNode("machine1", 1000, schedutil.DefaultMemoryRequest*10), makeNode("machine2", 1000, schedutil.DefaultMemoryRequest*10)}, name: "test priority of larger pod with machine with zero-request pod", pods: []*v1.Pod{ {Spec: large1}, {Spec: noResources1}, @@ -1215,9 +1215,9 @@ var smallContainers = []v1.Container{ Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ "cpu": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest, 10) + "m"), "memory": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest, 10)), }, }, }, @@ -1227,9 +1227,9 @@ var mediumContainers = []v1.Container{ Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ "cpu": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest*2, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest*2, 10) + "m"), "memory": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest*2, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest*2, 10)), }, }, }, @@ -1239,9 +1239,9 @@ var largeContainers = []v1.Container{ Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ "cpu": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest*3, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest*3, 10) + "m"), "memory": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest*3, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest*3, 10)), }, }, }, @@ -1251,9 +1251,9 @@ var veryLargeContainers = []v1.Container{ Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ "cpu": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMilliCPURequest*5, 10) + "m"), + strconv.FormatInt(schedutil.DefaultMilliCPURequest*5, 10) + "m"), "memory": resource.MustParse( - strconv.FormatInt(priorityutil.DefaultMemoryRequest*5, 10)), + strconv.FormatInt(schedutil.DefaultMemoryRequest*5, 10)), }, }, }, @@ -1542,7 +1542,7 @@ func TestSelectNodesForPreemption(t *testing.T) { var nodes []*v1.Node for _, n := range test.nodes { - node := makeNode(n, 1000*5, priorityutil.DefaultMemoryRequest*5) + node := makeNode(n, 1000*5, schedutil.DefaultMemoryRequest*5) // if possible, split node name by '/' to form labels in a format of // {"hostname": node.Name[0], "zone": node.Name[1], "region": node.Name[2]} node.ObjectMeta.Labels = make(map[string]string) @@ -1815,7 +1815,7 @@ func TestPickOneNodeForPreemption(t *testing.T) { t.Run(test.name, func(t *testing.T) { var nodes []*v1.Node for _, n := range test.nodes { - nodes = append(nodes, makeNode(n, priorityutil.DefaultMilliCPURequest*5, priorityutil.DefaultMemoryRequest*5)) + nodes = append(nodes, makeNode(n, schedutil.DefaultMilliCPURequest*5, schedutil.DefaultMemoryRequest*5)) } snapshot := nodeinfosnapshot.NewSnapshot(nodeinfosnapshot.CreateNodeInfoMap(test.pods, nodes)) registry := framework.Registry{} @@ -2276,7 +2276,7 @@ func TestPreempt(t *testing.T) { } var nodes []*v1.Node for i, name := range nodeNames { - node := makeNode(name, 1000*5, priorityutil.DefaultMemoryRequest*5) + node := makeNode(name, 1000*5, schedutil.DefaultMemoryRequest*5) // if possible, split node name by '/' to form labels in a format of // {"hostname": node.Name[0], "zone": node.Name[1], "region": node.Name[2]} node.ObjectMeta.Labels = make(map[string]string) diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/BUILD b/pkg/scheduler/framework/plugins/interpodaffinity/BUILD index 34ca500bc46..02bb2dc9079 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/BUILD +++ b/pkg/scheduler/framework/plugins/interpodaffinity/BUILD @@ -10,7 +10,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity", visibility = ["//visibility:public"], deps = [ - "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/listers:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/filtering.go b/pkg/scheduler/framework/plugins/interpodaffinity/filtering.go index 4d7af918ccf..0a6ffe5749f 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/filtering.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/filtering.go @@ -27,7 +27,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/kubernetes/pkg/scheduler/nodeinfo" schedutil "k8s.io/kubernetes/pkg/scheduler/util" @@ -154,7 +153,7 @@ func (m topologyToMatchedTermCount) updateWithAffinityTerms(targetPod *v1.Pod, t func (m topologyToMatchedTermCount) updateWithAntiAffinityTerms(targetPod *v1.Pod, targetPodNode *v1.Node, antiAffinityTerms []*affinityTerm, value int64) { // Check anti-affinity terms. for _, a := range antiAffinityTerms { - if priorityutil.PodMatchesTermsNamespaceAndSelector(targetPod, a.namespaces, a.selector) { + if schedutil.PodMatchesTermsNamespaceAndSelector(targetPod, a.namespaces, a.selector) { if topologyValue, ok := targetPodNode.Labels[a.topologyKey]; ok { pair := topologyPair{key: a.topologyKey, value: topologyValue} m[pair] += value @@ -184,7 +183,7 @@ func getAffinityTerms(pod *v1.Pod, v1Terms []v1.PodAffinityTerm) ([]*affinityTer var terms []*affinityTerm for _, term := range v1Terms { - namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, &term) + namespaces := schedutil.GetNamespacesFromPodAffinityTerm(pod, &term) selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector) if err != nil { return nil, err @@ -200,7 +199,7 @@ func podMatchesAllAffinityTerms(pod *v1.Pod, terms []*affinityTerm) bool { return false } for _, term := range terms { - if !priorityutil.PodMatchesTermsNamespaceAndSelector(pod, term.namespaces, term.selector) { + if !schedutil.PodMatchesTermsNamespaceAndSelector(pod, term.namespaces, term.selector) { return false } } @@ -487,7 +486,7 @@ func (pl *InterPodAffinity) podMatchesPodAffinityTerms(pod, targetPod *v1.Pod, n if len(term.TopologyKey) == 0 { return false, false, fmt.Errorf("empty topologyKey is not allowed except for PreferredDuringScheduling pod anti-affinity") } - if !priorityutil.NodesHaveSameTopologyKey(nodeInfo.Node(), targetPodNodeInfo.Node(), term.TopologyKey) { + if !schedutil.NodesHaveSameTopologyKey(nodeInfo.Node(), targetPodNodeInfo.Node(), term.TopologyKey) { return false, true, nil } } @@ -509,8 +508,8 @@ func getMatchingAntiAffinityTopologyPairsOfPod(newPod *v1.Pod, existingPod *v1.P if err != nil { return nil, err } - namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(existingPod, &term) - if priorityutil.PodMatchesTermsNamespaceAndSelector(newPod, namespaces, selector) { + namespaces := schedutil.GetNamespacesFromPodAffinityTerm(existingPod, &term) + if schedutil.PodMatchesTermsNamespaceAndSelector(newPod, namespaces, selector) { if topologyValue, ok := node.Labels[term.TopologyKey]; ok { pair := topologyPair{key: term.TopologyKey, value: topologyValue} topologyMap[pair]++ diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/scoring.go b/pkg/scheduler/framework/plugins/interpodaffinity/scoring.go index b790d13de98..ac0630e0f49 100644 --- a/pkg/scheduler/framework/plugins/interpodaffinity/scoring.go +++ b/pkg/scheduler/framework/plugins/interpodaffinity/scoring.go @@ -24,7 +24,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "k8s.io/klog" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/kubernetes/pkg/scheduler/nodeinfo" schedutil "k8s.io/kubernetes/pkg/scheduler/util" @@ -53,7 +52,7 @@ type weightedAffinityTerm struct { } func newWeightedAffinityTerm(pod *v1.Pod, term *v1.PodAffinityTerm, weight int32) (*weightedAffinityTerm, error) { - namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, term) + namespaces := schedutil.GetNamespacesFromPodAffinityTerm(pod, term) selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector) if err != nil { return nil, err @@ -88,7 +87,7 @@ func (pl *InterPodAffinity) processTerm( return } - match := priorityutil.PodMatchesTermsNamespaceAndSelector(podToCheck, term.namespaces, term.selector) + match := schedutil.PodMatchesTermsNamespaceAndSelector(podToCheck, term.namespaces, term.selector) tpValue, tpValueExist := fixedNode.Labels[term.topologyKey] if match && tpValueExist { pl.Lock() diff --git a/pkg/scheduler/framework/plugins/noderesources/BUILD b/pkg/scheduler/framework/plugins/noderesources/BUILD index c58d90e38d9..2edfd378aad 100644 --- a/pkg/scheduler/framework/plugins/noderesources/BUILD +++ b/pkg/scheduler/framework/plugins/noderesources/BUILD @@ -18,11 +18,11 @@ go_library( "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", "//pkg/scheduler/algorithm/predicates:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/framework/plugins/migration:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", + "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/scheduler/framework/plugins/noderesources/resource_allocation.go b/pkg/scheduler/framework/plugins/noderesources/resource_allocation.go index 80e9b58145c..f091ddfc632 100644 --- a/pkg/scheduler/framework/plugins/noderesources/resource_allocation.go +++ b/pkg/scheduler/framework/plugins/noderesources/resource_allocation.go @@ -22,9 +22,9 @@ import ( "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) // resourceToWeightMap contains resource name and weight. @@ -121,7 +121,7 @@ func calculatePodResourceRequest(pod *v1.Pod, resource v1.ResourceName) int64 { var podRequest int64 for i := range pod.Spec.Containers { container := &pod.Spec.Containers[i] - value := priorityutil.GetNonzeroRequestForResource(resource, &container.Resources.Requests) + value := schedutil.GetNonzeroRequestForResource(resource, &container.Resources.Requests) podRequest += value } diff --git a/pkg/scheduler/internal/cache/BUILD b/pkg/scheduler/internal/cache/BUILD index 67e0dad1bfe..bb3d8466299 100644 --- a/pkg/scheduler/internal/cache/BUILD +++ b/pkg/scheduler/internal/cache/BUILD @@ -34,9 +34,9 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/features:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library", "//pkg/scheduler/nodeinfo/snapshot:go_default_library", + "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/scheduler/internal/cache/cache_test.go b/pkg/scheduler/internal/cache/cache_test.go index 25e922f68de..c6630b4ce3a 100644 --- a/pkg/scheduler/internal/cache/cache_test.go +++ b/pkg/scheduler/internal/cache/cache_test.go @@ -31,9 +31,9 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/features" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) func deepEqualWithoutGeneration(actual *nodeInfoListItem, expected *schedulernodeinfo.NodeInfo) error { @@ -152,8 +152,8 @@ func TestAssumePodScheduled(t *testing.T) { Memory: 0, }, &schedulernodeinfo.Resource{ - MilliCPU: priorityutil.DefaultMilliCPURequest, - Memory: priorityutil.DefaultMemoryRequest, + MilliCPU: schedutil.DefaultMilliCPURequest, + Memory: schedutil.DefaultMemoryRequest, }, []*v1.Pod{testPods[3]}, newHostPortInfoBuilder().add("TCP", "127.0.0.1", 80).build(), @@ -779,8 +779,8 @@ func TestEphemeralStorageResource(t *testing.T) { EphemeralStorage: 500, }, &schedulernodeinfo.Resource{ - MilliCPU: priorityutil.DefaultMilliCPURequest, - Memory: priorityutil.DefaultMemoryRequest, + MilliCPU: schedutil.DefaultMilliCPURequest, + Memory: schedutil.DefaultMemoryRequest, }, []*v1.Pod{podE}, schedulernodeinfo.HostPortInfo{}, diff --git a/pkg/scheduler/internal/queue/BUILD b/pkg/scheduler/internal/queue/BUILD index ed3723c4297..86ebbc60561 100644 --- a/pkg/scheduler/internal/queue/BUILD +++ b/pkg/scheduler/internal/queue/BUILD @@ -11,7 +11,6 @@ go_library( visibility = ["//pkg/scheduler:__subpackages__"], deps = [ "//pkg/api/v1/pod:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", "//pkg/scheduler/framework/v1alpha1:go_default_library", "//pkg/scheduler/internal/heap:go_default_library", "//pkg/scheduler/metrics:go_default_library", diff --git a/pkg/scheduler/internal/queue/scheduling_queue.go b/pkg/scheduler/internal/queue/scheduling_queue.go index 2426702a83f..52cbdfd7445 100644 --- a/pkg/scheduler/internal/queue/scheduling_queue.go +++ b/pkg/scheduler/internal/queue/scheduling_queue.go @@ -37,7 +37,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1/pod" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" "k8s.io/kubernetes/pkg/scheduler/internal/heap" "k8s.io/kubernetes/pkg/scheduler/metrics" @@ -588,12 +587,12 @@ func (p *PriorityQueue) getUnschedulablePodsWithMatchingAffinityTerm(pod *v1.Pod if affinity != nil && affinity.PodAffinity != nil { terms := util.GetPodAffinityTerms(affinity.PodAffinity) for _, term := range terms { - namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(up, &term) + namespaces := util.GetNamespacesFromPodAffinityTerm(up, &term) selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector) if err != nil { klog.Errorf("Error getting label selectors for pod: %v.", up.Name) } - if priorityutil.PodMatchesTermsNamespaceAndSelector(pod, namespaces, selector) { + if util.PodMatchesTermsNamespaceAndSelector(pod, namespaces, selector) { podsToMove = append(podsToMove, pInfo) break } diff --git a/pkg/scheduler/nodeinfo/BUILD b/pkg/scheduler/nodeinfo/BUILD index a33c84cdee3..7e8951b3d30 100644 --- a/pkg/scheduler/nodeinfo/BUILD +++ b/pkg/scheduler/nodeinfo/BUILD @@ -11,7 +11,7 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", diff --git a/pkg/scheduler/nodeinfo/node_info.go b/pkg/scheduler/nodeinfo/node_info.go index c2291ccb78f..b8d14adf852 100644 --- a/pkg/scheduler/nodeinfo/node_info.go +++ b/pkg/scheduler/nodeinfo/node_info.go @@ -28,7 +28,7 @@ import ( "k8s.io/klog" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" ) var ( @@ -570,7 +570,7 @@ func calculateResource(pod *v1.Pod) (res Resource, non0CPU int64, non0Mem int64) for _, c := range pod.Spec.Containers { resPtr.Add(c.Resources.Requests) - non0CPUReq, non0MemReq := priorityutil.GetNonzeroRequests(&c.Resources.Requests) + non0CPUReq, non0MemReq := schedutil.GetNonzeroRequests(&c.Resources.Requests) non0CPU += non0CPUReq non0Mem += non0MemReq // No non-zero resources for GPUs or opaque resources. diff --git a/pkg/scheduler/util/BUILD b/pkg/scheduler/util/BUILD index 4518ec6c45e..dd7f9b9fe90 100644 --- a/pkg/scheduler/util/BUILD +++ b/pkg/scheduler/util/BUILD @@ -10,14 +10,21 @@ go_test( name = "go_default_test", srcs = [ "error_channel_test.go", + "non_zero_test.go", + "topologies_test.go", "utils_test.go", ], embed = [":go_default_library"], deps = [ "//pkg/scheduler/apis/extender/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//vendor/github.com/stretchr/testify/assert:go_default_library", ], ) @@ -26,14 +33,19 @@ go_library( srcs = [ "clock.go", "error_channel.go", + "non_zero.go", + "topologies.go", "utils.go", ], importpath = "k8s.io/kubernetes/pkg/scheduler/util", deps = [ "//pkg/api/v1/pod:go_default_library", + "//pkg/apis/core/v1/helper:go_default_library", "//pkg/scheduler/apis/extender/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/pkg/scheduler/algorithm/priorities/util/non_zero.go b/pkg/scheduler/util/non_zero.go similarity index 100% rename from pkg/scheduler/algorithm/priorities/util/non_zero.go rename to pkg/scheduler/util/non_zero.go diff --git a/pkg/scheduler/algorithm/priorities/util/non_zero_test.go b/pkg/scheduler/util/non_zero_test.go similarity index 100% rename from pkg/scheduler/algorithm/priorities/util/non_zero_test.go rename to pkg/scheduler/util/non_zero_test.go diff --git a/pkg/scheduler/algorithm/priorities/util/topologies.go b/pkg/scheduler/util/topologies.go similarity index 100% rename from pkg/scheduler/algorithm/priorities/util/topologies.go rename to pkg/scheduler/util/topologies.go diff --git a/pkg/scheduler/algorithm/priorities/util/topologies_test.go b/pkg/scheduler/util/topologies_test.go similarity index 100% rename from pkg/scheduler/algorithm/priorities/util/topologies_test.go rename to pkg/scheduler/util/topologies_test.go diff --git a/test/e2e/scheduling/BUILD b/test/e2e/scheduling/BUILD index fdf9e013255..875febe9df1 100644 --- a/test/e2e/scheduling/BUILD +++ b/test/e2e/scheduling/BUILD @@ -21,7 +21,7 @@ go_library( "//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/scheduling:go_default_library", - "//pkg/scheduler/algorithm/priorities/util:go_default_library", + "//pkg/scheduler/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/scheduling/v1:go_default_library", diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go index 5d7b0173d33..363f8839b30 100644 --- a/test/e2e/scheduling/priorities.go +++ b/test/e2e/scheduling/priorities.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" - priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util" + schedutil "k8s.io/kubernetes/pkg/scheduler/util" "k8s.io/kubernetes/test/e2e/framework" e2eevents "k8s.io/kubernetes/test/e2e/framework/events" e2enode "k8s.io/kubernetes/test/e2e/framework/node" @@ -445,7 +445,7 @@ func getNonZeroRequests(pod *v1.Pod) Resource { result := Resource{} for i := range pod.Spec.Containers { container := &pod.Spec.Containers[i] - cpu, memory := priorityutil.GetNonzeroRequests(&container.Resources.Requests) + cpu, memory := schedutil.GetNonzeroRequests(&container.Resources.Requests) result.MilliCPU += cpu result.Memory += memory }