1
0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 06:29:29 +01:00

refactor(node_taint_test): create dedicated functions for taint configurations

This commit is contained in:
Jan Chaloupka
2025-12-15 17:11:54 +01:00
parent f65209d4fa
commit e5d5cf2229

View File

@@ -68,6 +68,25 @@ func createPreferNoScheduleTaint(key, value string, index int) v1.Taint {
} }
} }
func withTestTaint1(node *v1.Node) {
node.Spec.Taints = []v1.Taint{
createNoScheduleTaint("testTaint", "test", 1),
}
}
func withTestingTaint1(node *v1.Node) {
node.Spec.Taints = []v1.Taint{
createNoScheduleTaint("testingTaint", "testing", 1),
}
}
func withBothTaints1(node *v1.Node) {
node.Spec.Taints = []v1.Taint{
createNoScheduleTaint("testTaint", "test", 1),
createNoScheduleTaint("testingTaint", "testing", 1),
}
}
func addTolerationToPod(pod *v1.Pod, key, value string, index int, effect v1.TaintEffect) *v1.Pod { func addTolerationToPod(pod *v1.Pod, key, value string, index int, effect v1.TaintEffect) *v1.Pod {
if pod.Annotations == nil { if pod.Annotations == nil {
pod.Annotations = map[string]string{} pod.Annotations = map[string]string{}
@@ -79,16 +98,8 @@ func addTolerationToPod(pod *v1.Pod, key, value string, index int, effect v1.Tai
} }
func TestDeletePodsViolatingNodeTaints(t *testing.T) { func TestDeletePodsViolatingNodeTaints(t *testing.T) {
node1 := buildTestNode(nodeName1, func(node *v1.Node) { node1 := buildTestNode(nodeName1, withTestTaint1)
node.Spec.Taints = []v1.Taint{ node2 := buildTestNode(nodeName2, withTestingTaint1)
createNoScheduleTaint("testTaint", "test", 1),
}
})
node2 := buildTestNode(nodeName2, func(node *v1.Node) {
node.Spec.Taints = []v1.Taint{
createNoScheduleTaint("testingTaint", "testing", 1),
}
})
node3 := buildTestNode(nodeName3, func(node *v1.Node) { node3 := buildTestNode(nodeName3, func(node *v1.Node) {
node.ObjectMeta.Labels = map[string]string{ node.ObjectMeta.Labels = map[string]string{
@@ -113,12 +124,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
} }
}) })
node7 := buildTestNode(nodeName7, func(node *v1.Node) { node7 := buildTestNode(nodeName7, withBothTaints1)
node.Spec.Taints = []v1.Taint{
createNoScheduleTaint("testTaint", "test", 1),
createNoScheduleTaint("testingTaint", "testing", 1),
}
})
p1 := buildTestPod("p1", nodeName1, func(pod *v1.Pod) { p1 := buildTestPod("p1", nodeName1, func(pod *v1.Pod) {
test.SetNormalOwnerRef(pod) test.SetNormalOwnerRef(pod)