From b8765bd8ee5b73b48e1e4147c995faa1aee88c53 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Sat, 20 Dec 2025 13:54:50 +0100 Subject: [PATCH] refactor(TestDefaultEvictor): add setNodeTaint helper function --- .../defaultevictor/defaultevictor_test.go | 81 ++++++------------- 1 file changed, 25 insertions(+), 56 deletions(-) diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go index 8be0e5ba5..3b84d89d2 100644 --- a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go +++ b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go @@ -77,6 +77,16 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) { nodeLabelKey := "datacenter" nodeLabelValue := "east" + setNodeTaint := func(node *v1.Node) { + node.Spec.Taints = []v1.Taint{ + { + Key: nodeTaintKey, + Value: nodeTaintValue, + Effect: v1.TaintEffectNoSchedule, + }, + } + } + testCases := []testCase{ { description: "Pod with no tolerations running on normal node, all other nodes tainted", @@ -86,24 +96,8 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) { }), }, nodes: []*v1.Node{ - buildTestNode("node2", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), - buildTestNode("node3", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), + buildTestNode("node2", setNodeTaint), + buildTestNode("node3", setNodeTaint), }, nodeFit: true, }, { @@ -121,24 +115,8 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) { }), }, nodes: []*v1.Node{ - buildTestNode("node2", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), - buildTestNode("node3", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), + buildTestNode("node2", setNodeTaint), + buildTestNode("node3", setNodeTaint), }, nodeFit: true, result: true, @@ -330,8 +308,15 @@ func TestDefaultEvictorFilter(t *testing.T) { minPodAge := metav1.Duration{Duration: 50 * time.Minute} - nodeTaintKey := "hardware" - nodeTaintValue := "gpu" + setNodeTaint := func(node *v1.Node) { + node.Spec.Taints = []v1.Taint{ + { + Key: "hardware", + Value: "gpu", + Effect: v1.TaintEffectNoSchedule, + }, + } + } ownerRefUUID := uuid.NewUUID() @@ -645,24 +630,8 @@ func TestDefaultEvictorFilter(t *testing.T) { }), }, nodes: []*v1.Node{ - buildTestNode("node2", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), - buildTestNode("node3", func(node *v1.Node) { - node.Spec.Taints = []v1.Taint{ - { - Key: nodeTaintKey, - Value: nodeTaintValue, - Effect: v1.TaintEffectNoSchedule, - }, - } - }), + buildTestNode("node2", setNodeTaint), + buildTestNode("node3", setNodeTaint), }, nodeFit: true, result: true,