Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 06:29:29 +01:00
Code Packages Releases Activity

refactor(TestRemovePodsViolatingNodeAffinity): inline nodeWithLabels

Browse Source
This commit is contained in:
Jan Chaloupka
2025-12-15 15:37:04 +01:00
parent 42d255fd95
commit 9f7629136f
1 changed files with 102 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
pkg/framework/plugins/removepodsviolatingnodeaffinity/node_affinity_test.go
View File

@@ -36,27 +36,27 @@ const (
nodeWithLabelsName = "nodeWithLabels" nodeWithLabelsName = "nodeWithLabels"
nodeWithoutLabelsName = "nodeWithoutLabels" nodeWithoutLabelsName = "nodeWithoutLabels"
unschedulableNodeWithLabelsName = "unschedulableNodeWithLabels" unschedulableNodeWithLabelsName = "unschedulableNodeWithLabels"
nodeLabelKey = "kubernetes.io/desiredNode"
nodeLabelValue = "yes"
) )
func buildTestNode(name string, apply func(*v1.Node)) *v1.Node { func buildTestNode(name string, apply func(*v1.Node)) *v1.Node {
return test.BuildTestNode(name, 2000, 3000, 10, apply) return test.BuildTestNode(name, 2000, 3000, 10, apply)
} }
func setNodeDesiredNodeLabel(node *v1.Node) {
node.Labels[nodeLabelKey] = nodeLabelValue
}
func buildTestPod(name string, nodeName string, apply func(*v1.Pod)) *v1.Pod { func buildTestPod(name string, nodeName string, apply func(*v1.Pod)) *v1.Pod {
return test.BuildTestPod(name, 100, 0, nodeName, apply) return test.BuildTestPod(name, 100, 0, nodeName, apply)
} }
func TestRemovePodsViolatingNodeAffinity(t *testing.T) { func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
nodeLabelKey := "kubernetes.io/desiredNode"
nodeLabelValue := "yes"
nodeWithLabels := buildTestNode(nodeWithLabelsName, func(node *v1.Node) {
node.Labels[nodeLabelKey] = nodeLabelValue
})
nodeWithoutLabels := buildTestNode(nodeWithoutLabelsName, nil) nodeWithoutLabels := buildTestNode(nodeWithoutLabelsName, nil)
unschedulableNodeWithLabels := buildTestNode(unschedulableNodeWithLabelsName, func(node *v1.Node) { unschedulableNodeWithLabels := buildTestNode(unschedulableNodeWithLabelsName, func(node *v1.Node) {
node.Labels[nodeLabelKey] = nodeLabelValue setNodeDesiredNodeLabel(node)
node.Spec.Unschedulable = true node.Spec.Unschedulable = true
}) })
@@ -145,7 +145,10 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
}, },
expectedEvictedPodCount: 0, expectedEvictedPodCount: 0,
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingRequiredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingRequiredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
}, },
{ {
description: "Pod is correctly scheduled on node, no eviction expected [required affinity]", description: "Pod is correctly scheduled on node, no eviction expected [required affinity]",
@@ -154,7 +157,9 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
}, },
expectedEvictedPodCount: 0, expectedEvictedPodCount: 0,
pods: addPodsToNode(nodeWithLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithLabels}, nodes: []*v1.Node{
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
}, },
{ {
description: "Pod is correctly scheduled on node, no eviction expected [preferred affinity]", description: "Pod is correctly scheduled on node, no eviction expected [preferred affinity]",
@@ -163,7 +168,9 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
}, },
expectedEvictedPodCount: 0, expectedEvictedPodCount: 0,
pods: addPodsToNode(nodeWithLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithLabels}, nodes: []*v1.Node{
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
}, },
{ {
description: "Pod is scheduled on node without matching labels, another schedulable node available, should be evicted", description: "Pod is scheduled on node without matching labels, another schedulable node available, should be evicted",
@@ -171,8 +178,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
}, },
{ {
description: "Pod is scheduled on node without matching labels, another schedulable node available with better fit, should be evicted", description: "Pod is scheduled on node without matching labels, another schedulable node available with better fit, should be evicted",
@@ -180,8 +190,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
}, },
{ {
description: "Pod is scheduled on node without matching labels, another schedulable node available, maxPodsToEvictPerNode set to 1, should be evicted [required affinity]", description: "Pod is scheduled on node without matching labels, another schedulable node available, maxPodsToEvictPerNode set to 1, should be evicted [required affinity]",
@@ -189,8 +202,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
}, },
{ {
@@ -199,8 +215,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
}, },
{ {
@@ -209,8 +228,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint0, maxPodsToEvictPerNode: &uint0,
}, },
{ {
@@ -219,8 +241,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint0, maxPodsToEvictPerNode: &uint0,
}, },
{ {
@@ -229,8 +254,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
}, },
{ {
@@ -239,8 +267,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
}, },
{ {
@@ -249,8 +280,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint1, maxNoOfPodsToEvictPerNamespace: &uint1,
}, },
{ {
@@ -259,8 +293,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint1, maxNoOfPodsToEvictPerNamespace: &uint1,
maxNoOfPodsToEvictTotal: &uint0, maxNoOfPodsToEvictTotal: &uint0,
}, },
@@ -270,8 +307,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint1, maxNoOfPodsToEvictPerNamespace: &uint1,
}, },
{ {
@@ -280,8 +320,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint0, maxNoOfPodsToEvictPerNamespace: &uint0,
}, },
{ {
@@ -290,8 +333,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint0, maxNoOfPodsToEvictPerNamespace: &uint0,
}, },
{ {
@@ -300,8 +346,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint1, maxNoOfPodsToEvictPerNamespace: &uint1,
}, },
{ {
@@ -310,8 +359,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, &metav1.Time{}, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels}, nodes: []*v1.Node{
nodeWithoutLabels,
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
},
maxNoOfPodsToEvictPerNamespace: &uint1, maxNoOfPodsToEvictPerNamespace: &uint1,
}, },
{ {
@@ -340,8 +392,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "requiredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithLabels, unschedulableNodeWithLabels}, nodes: []*v1.Node{
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
unschedulableNodeWithLabels,
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
nodefit: true, nodefit: true,
}, },
@@ -351,8 +406,11 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
args: RemovePodsViolatingNodeAffinityArgs{ args: RemovePodsViolatingNodeAffinityArgs{
NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"}, NodeAffinityType: []string{"preferredDuringSchedulingIgnoredDuringExecution"},
}, },
pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"), pods: addPodsToNode(nodeWithoutLabelsName, nil, "preferredDuringSchedulingIgnoredDuringExecution"),
nodes: []*v1.Node{nodeWithLabels, unschedulableNodeWithLabels}, nodes: []*v1.Node{
buildTestNode(nodeWithLabelsName, setNodeDesiredNodeLabel),
unschedulableNodeWithLabels,
},
maxPodsToEvictPerNode: &uint1, maxPodsToEvictPerNode: &uint1,
nodefit: true, nodefit: true,
}, },