mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-06 07:57:35 +00:00
Move scheduler testing utils to /scheduler/testing
Signed-off-by: kerthcet <kerthcet@gmail.com>
This commit is contained in:
kerthcet
@@ -56,6 +56,7 @@ import (
|
||||
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"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -228,9 +229,9 @@ func TestPostFilter(t *testing.T) {
|
||||
"node1": framework.NewStatus(framework.Unschedulable),
|
||||
"node2": framework.NewStatus(framework.Unschedulable),
|
||||
},
|
||||
extender: &st.FakeExtender{
|
||||
extender: &tf.FakeExtender{
|
||||
ExtenderName: "FakeExtender1",
|
||||
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.Node1PredicateExtender},
|
||||
},
|
||||
wantResult: framework.NewPostFilterResultWithNominatedNode("node1"),
|
||||
wantStatus: framework.NewStatus(framework.Success),
|
||||
@@ -342,11 +343,11 @@ func TestPostFilter(t *testing.T) {
|
||||
podInformer.GetStore().Add(tt.pods[i])
|
||||
}
|
||||
// Register NodeResourceFit as the Filter & PreFilter plugin.
|
||||
registeredPlugins := []st.RegisterPluginFunc{
|
||||
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
st.RegisterPluginAsExtensions("test-plugin", newTestPlugin, "PreFilter"),
|
||||
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
registeredPlugins := []tf.RegisterPluginFunc{
|
||||
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
tf.RegisterPluginAsExtensions("test-plugin", newTestPlugin, "PreFilter"),
|
||||
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
}
|
||||
var extenders []framework.Extender
|
||||
if tt.extender != nil {
|
||||
@@ -355,7 +356,7 @@ func TestPostFilter(t *testing.T) {
|
||||
logger, ctx := ktesting.NewTestContext(t)
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
defer cancel()
|
||||
f, err := st.NewFramework(ctx, registeredPlugins, "",
|
||||
f, err := tf.NewFramework(ctx, registeredPlugins, "",
|
||||
frameworkruntime.WithClientSet(cs),
|
||||
frameworkruntime.WithEventRecorder(&events.FakeRecorder{}),
|
||||
frameworkruntime.WithInformerFactory(informerFactory),
|
||||
@@ -410,7 +411,7 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
nodeNames []string
|
||||
testPods []*v1.Pod
|
||||
initPods []*v1.Pod
|
||||
registerPlugins []st.RegisterPluginFunc
|
||||
registerPlugins []tf.RegisterPluginFunc
|
||||
pdbs []*policy.PodDisruptionBudget
|
||||
fakeFilterRC framework.Code // return code for fake filter plugin
|
||||
disableParallelism bool
|
||||
@@ -419,8 +420,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
name: "a pod that does not fit on any node",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterFilterPlugin("FalseFilter", st.NewFalseFilterPlugin),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterFilterPlugin("FalseFilter", tf.NewFalseFilterPlugin),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -435,8 +436,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "a pod that fits with no preemption",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterFilterPlugin("TrueFilter", st.NewTrueFilterPlugin),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterFilterPlugin("TrueFilter", tf.NewTrueFilterPlugin),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -452,8 +453,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "a pod that fits on one node with no preemption",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterFilterPlugin("MatchFilter", st.NewMatchFilterPlugin),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterFilterPlugin("MatchFilter", tf.NewMatchFilterPlugin),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -470,8 +471,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "a pod that fits on both nodes when lower priority pods are preempted",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -501,8 +502,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "a pod that would fit on the nodes, but other pods running are higher priority, no preemption would happen",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -517,8 +518,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "medium priority pod is preempted, but lower priority one stays as it is small",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -549,8 +550,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "mixed priority pods are preempted",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -580,8 +581,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "mixed priority pods are preempted, pick later StartTime one when priorities are equal",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -611,9 +612,9 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "pod with anti-affinity is preempted",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
st.RegisterPluginAsExtensions(interpodaffinity.Name, interpodaffinity.New, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
tf.RegisterPluginAsExtensions(interpodaffinity.Name, interpodaffinity.New, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -643,8 +644,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "preemption to resolve pod topology spread filter failure",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(podtopologyspread.Name, podTopologySpreadFunc, "PreFilter", "Filter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(podtopologyspread.Name, podTopologySpreadFunc, "PreFilter", "Filter"),
|
||||
},
|
||||
nodeNames: []string{"node-a/zone1", "node-b/zone1", "node-x/zone2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -680,8 +681,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "get Unschedulable in the preemption phase when the filter plugins filtering the nodes",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -697,8 +698,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "preemption with violation of same pdb",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -732,8 +733,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "preemption with violation of the pdb with pod whose eviction was processed, the victim doesn't belong to DisruptedPods",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -767,8 +768,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "preemption with violation of the pdb with pod whose eviction was processed, the victim belongs to DisruptedPods",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -802,8 +803,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "preemption with violation of the pdb with pod whose eviction was processed, the victim which belongs to DisruptedPods is treated as 'nonViolating'",
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -840,8 +841,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
{
|
||||
name: "all nodes are possible candidates, but DefaultPreemptionArgs limits to 2",
|
||||
args: &config.DefaultPreemptionArgs{MinCandidateNodesPercentage: 40, MinCandidateNodesAbsolute: 1},
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3", "node4", "node5"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -877,8 +878,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
{
|
||||
name: "some nodes are not possible candidates, DefaultPreemptionArgs limits to 2",
|
||||
args: &config.DefaultPreemptionArgs{MinCandidateNodesPercentage: 40, MinCandidateNodesAbsolute: 1},
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3", "node4", "node5"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -914,8 +915,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
{
|
||||
name: "preemption offset across multiple scheduling cycles and wrap around",
|
||||
args: &config.DefaultPreemptionArgs{MinCandidateNodesPercentage: 40, MinCandidateNodesAbsolute: 1},
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3", "node4", "node5"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -983,8 +984,8 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
{
|
||||
name: "preemption looks past numCandidates until a non-PDB violating node is found",
|
||||
args: &config.DefaultPreemptionArgs{MinCandidateNodesPercentage: 40, MinCandidateNodesAbsolute: 2},
|
||||
registerPlugins: []st.RegisterPluginFunc{
|
||||
st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugins: []tf.RegisterPluginFunc{
|
||||
tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3", "node4", "node5"},
|
||||
testPods: []*v1.Pod{
|
||||
@@ -1059,18 +1060,18 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
snapshot := internalcache.NewSnapshot(tt.initPods, nodes)
|
||||
|
||||
// For each test, register a FakeFilterPlugin along with essential plugins and tt.registerPlugins.
|
||||
fakePlugin := st.FakeFilterPlugin{
|
||||
fakePlugin := tf.FakeFilterPlugin{
|
||||
FailedNodeReturnCodeMap: fakeFilterRCMap,
|
||||
}
|
||||
registeredPlugins := append([]st.RegisterPluginFunc{
|
||||
st.RegisterFilterPlugin(
|
||||
registeredPlugins := append([]tf.RegisterPluginFunc{
|
||||
tf.RegisterFilterPlugin(
|
||||
"FakeFilter",
|
||||
func(_ runtime.Object, fh framework.Handle) (framework.Plugin, error) {
|
||||
return &fakePlugin, nil
|
||||
},
|
||||
)},
|
||||
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
)
|
||||
registeredPlugins = append(registeredPlugins, tt.registerPlugins...)
|
||||
var objs []runtime.Object
|
||||
@@ -1092,7 +1093,7 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
logger, ctx := ktesting.NewTestContext(t)
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
defer cancel()
|
||||
fwk, err := st.NewFramework(
|
||||
fwk, err := tf.NewFramework(
|
||||
ctx,
|
||||
registeredPlugins, "",
|
||||
frameworkruntime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())),
|
||||
@@ -1176,7 +1177,7 @@ func TestDryRunPreemption(t *testing.T) {
|
||||
func TestSelectBestCandidate(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
registerPlugin st.RegisterPluginFunc
|
||||
registerPlugin tf.RegisterPluginFunc
|
||||
nodeNames []string
|
||||
pod *v1.Pod
|
||||
pods []*v1.Pod
|
||||
@@ -1184,7 +1185,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
name: "a pod that fits on both nodes when lower priority pods are preempted",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(largeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1195,7 +1196,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "node with min highest priority pod is picked",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1210,7 +1211,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "when highest priorities are the same, minimum sum of priorities is picked",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1225,7 +1226,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "when highest priority and sum are the same, minimum number of pods is picked",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1245,7 +1246,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
// pickOneNodeForPreemption adjusts pod priorities when finding the sum of the victims. This
|
||||
// test ensures that the logic works correctly.
|
||||
name: "sum of adjusted priorities is considered",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1262,7 +1263,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "non-overlapping lowest high priority, sum priorities, and number of pods",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3", "node4"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(veryHighPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1283,7 +1284,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "same priority, same number of victims, different start time for each node's pod",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1298,7 +1299,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "same priority, same number of victims, different start time for all pods",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1313,7 +1314,7 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "different priority, same number of victims, different start time for all pods",
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
pod: st.MakePod().Name("p").UID("p").Priority(highPriority).Req(veryLargeRes).Obj(),
|
||||
pods: []*v1.Pod{
|
||||
@@ -1346,12 +1347,12 @@ func TestSelectBestCandidate(t *testing.T) {
|
||||
logger, ctx := ktesting.NewTestContext(t)
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
defer cancel()
|
||||
fwk, err := st.NewFramework(
|
||||
fwk, err := tf.NewFramework(
|
||||
ctx,
|
||||
[]st.RegisterPluginFunc{
|
||||
[]tf.RegisterPluginFunc{
|
||||
tt.registerPlugin,
|
||||
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
},
|
||||
"",
|
||||
frameworkruntime.WithPodNominator(internalqueue.NewPodNominator(informerFactory.Core().V1().Pods().Lister())),
|
||||
@@ -1493,11 +1494,11 @@ func TestPodEligibleToPreemptOthers(t *testing.T) {
|
||||
for _, n := range test.nodes {
|
||||
nodes = append(nodes, st.MakeNode().Name(n).Obj())
|
||||
}
|
||||
registeredPlugins := []st.RegisterPluginFunc{
|
||||
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
registeredPlugins := []tf.RegisterPluginFunc{
|
||||
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
}
|
||||
f, err := st.NewFramework(ctx, registeredPlugins, "",
|
||||
f, err := tf.NewFramework(ctx, registeredPlugins, "",
|
||||
frameworkruntime.WithSnapshotSharedLister(internalcache.NewSnapshot(test.pods, nodes)),
|
||||
frameworkruntime.WithLogger(logger),
|
||||
)
|
||||
@@ -1516,9 +1517,9 @@ func TestPreempt(t *testing.T) {
|
||||
name string
|
||||
pod *v1.Pod
|
||||
pods []*v1.Pod
|
||||
extenders []*st.FakeExtender
|
||||
extenders []*tf.FakeExtender
|
||||
nodeNames []string
|
||||
registerPlugin st.RegisterPluginFunc
|
||||
registerPlugin tf.RegisterPluginFunc
|
||||
want *framework.PostFilterResult
|
||||
expectedPods []string // list of preempted pods
|
||||
}{
|
||||
@@ -1532,7 +1533,7 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p3.1").UID("p3.1").Node("node3").Priority(midPriority).Req(mediumRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node1"),
|
||||
expectedPods: []string{"p1.1", "p1.2"},
|
||||
},
|
||||
@@ -1550,7 +1551,7 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p-x2").UID("p-x2").Namespace(v1.NamespaceDefault).Node("node-x").Label("foo", "").Priority(highPriority).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node-a/zone1", "node-b/zone1", "node-x/zone2"},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(podtopologyspread.Name, podTopologySpreadFunc, "PreFilter", "Filter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(podtopologyspread.Name, podTopologySpreadFunc, "PreFilter", "Filter"),
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node-b"),
|
||||
expectedPods: []string{"p-b1"},
|
||||
},
|
||||
@@ -1563,17 +1564,17 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p2.1").UID("p2.1").Namespace(v1.NamespaceDefault).Node("node3").Priority(midPriority).Req(largeRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
extenders: []*st.FakeExtender{
|
||||
extenders: []*tf.FakeExtender{
|
||||
{
|
||||
ExtenderName: "FakeExtender1",
|
||||
Predicates: []st.FitPredicate{st.TruePredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.TruePredicateExtender},
|
||||
},
|
||||
{
|
||||
ExtenderName: "FakeExtender2",
|
||||
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.Node1PredicateExtender},
|
||||
},
|
||||
},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node1"),
|
||||
expectedPods: []string{"p1.1", "p1.2"},
|
||||
},
|
||||
@@ -1586,13 +1587,13 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p2.1").UID("p2.1").Namespace(v1.NamespaceDefault).Node("node2").Priority(midPriority).Req(largeRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
extenders: []*st.FakeExtender{
|
||||
extenders: []*tf.FakeExtender{
|
||||
{
|
||||
ExtenderName: "FakeExtender1",
|
||||
Predicates: []st.FitPredicate{st.FalsePredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.FalsePredicateExtender},
|
||||
},
|
||||
},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: nil,
|
||||
expectedPods: []string{},
|
||||
},
|
||||
@@ -1605,18 +1606,18 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p2.1").UID("p2.1").Namespace(v1.NamespaceDefault).Node("node2").Priority(midPriority).Req(largeRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
extenders: []*st.FakeExtender{
|
||||
extenders: []*tf.FakeExtender{
|
||||
{
|
||||
Predicates: []st.FitPredicate{st.ErrorPredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.ErrorPredicateExtender},
|
||||
Ignorable: true,
|
||||
ExtenderName: "FakeExtender1",
|
||||
},
|
||||
{
|
||||
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.Node1PredicateExtender},
|
||||
ExtenderName: "FakeExtender2",
|
||||
},
|
||||
},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node1"),
|
||||
expectedPods: []string{"p1.1", "p1.2"},
|
||||
},
|
||||
@@ -1629,18 +1630,18 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p2.1").UID("p2.1").Namespace(v1.NamespaceDefault).Node("node2").Priority(midPriority).Req(largeRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2"},
|
||||
extenders: []*st.FakeExtender{
|
||||
extenders: []*tf.FakeExtender{
|
||||
{
|
||||
ExtenderName: "FakeExtender1",
|
||||
Predicates: []st.FitPredicate{st.Node1PredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.Node1PredicateExtender},
|
||||
UnInterested: true,
|
||||
},
|
||||
{
|
||||
ExtenderName: "FakeExtender2",
|
||||
Predicates: []st.FitPredicate{st.TruePredicateExtender},
|
||||
Predicates: []tf.FitPredicate{tf.TruePredicateExtender},
|
||||
},
|
||||
},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
// sum of priorities of all victims on node1 is larger than node2, node2 is chosen.
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node2"),
|
||||
expectedPods: []string{"p2.1"},
|
||||
@@ -1655,7 +1656,7 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p3.1").UID("p3.1").Namespace(v1.NamespaceDefault).Node("node3").Priority(midPriority).Req(mediumRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: nil,
|
||||
expectedPods: nil,
|
||||
},
|
||||
@@ -1669,7 +1670,7 @@ func TestPreempt(t *testing.T) {
|
||||
st.MakePod().Name("p3.1").UID("p3.1").Namespace(v1.NamespaceDefault).Node("node3").Priority(midPriority).Req(mediumRes).Obj(),
|
||||
},
|
||||
nodeNames: []string{"node1", "node2", "node3"},
|
||||
registerPlugin: st.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
registerPlugin: tf.RegisterPluginAsExtensions(noderesources.Name, nodeResourcesFitFunc, "Filter", "PreFilter"),
|
||||
want: framework.NewPostFilterResultWithNominatedNode("node1"),
|
||||
expectedPods: []string{"p1.1", "p1.2"},
|
||||
},
|
||||
@@ -1730,12 +1731,12 @@ func TestPreempt(t *testing.T) {
|
||||
extender.CachedNodeNameToInfo = cachedNodeInfoMap
|
||||
extenders = append(extenders, extender)
|
||||
}
|
||||
fwk, err := st.NewFramework(
|
||||
fwk, err := tf.NewFramework(
|
||||
ctx,
|
||||
[]st.RegisterPluginFunc{
|
||||
[]tf.RegisterPluginFunc{
|
||||
test.registerPlugin,
|
||||
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
tf.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
|
||||
tf.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
|
||||
},
|
||||
"",
|
||||
frameworkruntime.WithClientSet(client),
|
||||
|
||||
Reference in New Issue
Block a user