1
0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00

refactor(node_taint_test): inline p10

This commit is contained in:
Jan Chaloupka
2025-12-15 18:08:43 +01:00
parent 7e40aae2dc
commit c1ad532c46

View File

@@ -154,7 +154,6 @@ func withKubeSystemCriticalPod(pod *v1.Pod) {
}
func TestDeletePodsViolatingNodeTaints(t *testing.T) {
p10 := buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation)
p11 := buildTestPodWithNormalOwnerRef("p11", nodeName2, nil)
p12 := buildTestPodWithNormalOwnerRef("p11", nodeName2, func(pod *v1.Pod) {
pod.Spec.NodeSelector = map[string]string{
@@ -281,7 +280,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
buildTestPodWithNormalOwnerRef("p7", nodeName2, withKubeSystemCriticalPod),
buildTestPod("p8", nodeName2, test.SetDSOwnerRef),
buildTestPodWithNormalOwnerRef("p9", nodeName2, withLocalStorageVolume),
p10,
buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation),
},
nodes: []*v1.Node{
buildTestNode(nodeName2, withTestingTaint1),
@@ -294,7 +293,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
buildTestPodWithNormalOwnerRef("p7", nodeName2, withKubeSystemCriticalPod),
buildTestPod("p8", nodeName2, test.SetDSOwnerRef),
buildTestPodWithNormalOwnerRef("p9", nodeName2, withLocalStorageVolume),
p10,
buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation),
},
nodes: []*v1.Node{
buildTestNode(nodeName2, withTestingTaint1),
@@ -307,7 +306,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
pods: []*v1.Pod{
buildTestPodWithNormalOwnerRef("p7", nodeName2, withKubeSystemCriticalPod),
buildTestPod("p8", nodeName2, test.SetDSOwnerRef),
p10,
buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation),
p11,
},
nodes: []*v1.Node{
@@ -321,7 +320,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
buildTestPodWithNormalOwnerRef("p2", nodeName1, nil),
buildTestPodWithNormalOwnerRef("p7", nodeName2, withKubeSystemCriticalPod),
buildTestPodWithNormalOwnerRef("p9", nodeName2, withLocalStorageVolume),
p10,
buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation),
},
nodes: []*v1.Node{
buildTestNode(nodeName1, withTestTaint1),
@@ -428,7 +427,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
buildTestPodWithNormalOwnerRef("p2", nodeName1, nil),
buildTestPodWithNormalOwnerRef("p7", nodeName2, withKubeSystemCriticalPod),
buildTestPodWithNormalOwnerRef("p9", nodeName2, withLocalStorageVolume),
p10,
buildTestPodWithNormalOwnerRef("p10", nodeName2, test.SetMirrorPodAnnotation),
},
nodes: []*v1.Node{
buildTestNode(nodeName1, withTestTaint1),