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

refactor: inline single-statement apply functions in BuildTestPod calls

Browse Source
This commit is contained in:
Jan Chaloupka
2025-12-21 21:41:59 +01:00
parent 988e0b8868
commit 7ef3673d4c
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/framework/plugins/nodeutilization/highnodeutilization_test.go
View File

@@ -236,9 +236,7 @@ func TestHighNodeUtilization(t *testing.T) {
test.SetRSOwnerRef(pod) test.SetRSOwnerRef(pod)
test.MakeBestEffortPod(pod) test.MakeBestEffortPod(pod)
}), }),
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) { test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef),
test.SetRSOwnerRef(pod)
}),
// These won't be evicted. // These won't be evicted.
test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef), test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef),
test.BuildTestPod("p4", 400, 0, n2NodeName, test.SetRSOwnerRef), test.BuildTestPod("p4", 400, 0, n2NodeName, test.SetRSOwnerRef),
@@ -453,9 +451,7 @@ func TestHighNodeUtilization(t *testing.T) {
// pods in the other nodes must not be evicted // pods in the other nodes must not be evicted
// because they do not have the extended // because they do not have the extended
// resource defined in their requests. // resource defined in their requests.
test.BuildTestPod("p3", 500, 0, n2NodeName, func(pod *v1.Pod) { test.BuildTestPod("p3", 500, 0, n2NodeName, test.SetRSOwnerRef),
test.SetRSOwnerRef(pod)
}),
test.BuildTestPod("p4", 500, 0, n2NodeName, func(pod *v1.Pod) { test.BuildTestPod("p4", 500, 0, n2NodeName, func(pod *v1.Pod) {
test.SetRSOwnerRef(pod) test.SetRSOwnerRef(pod)
}), }),

16
pkg/framework/plugins/nodeutilization/lownodeutilization_test.go
View File

@@ -458,9 +458,7 @@ func TestLowNodeUtilization(t *testing.T) {
test.SetRSOwnerRef(pod) test.SetRSOwnerRef(pod)
test.MakeBestEffortPod(pod) test.MakeBestEffortPod(pod)
}), }),
test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) { test.BuildTestPod("p3", 400, 0, n1NodeName, test.SetRSOwnerRef),
test.SetRSOwnerRef(pod)
}),
test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) { test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
test.SetRSOwnerRef(pod) test.SetRSOwnerRef(pod)
test.MakeBestEffortPod(pod) test.MakeBestEffortPod(pod)
@@ -470,9 +468,7 @@ func TestLowNodeUtilization(t *testing.T) {
test.MakeBestEffortPod(pod) test.MakeBestEffortPod(pod)
}), }),
// These won't be evicted. // These won't be evicted.
test.BuildTestPod("p6", 400, 0, n1NodeName, func(pod *v1.Pod) { test.BuildTestPod("p6", 400, 0, n1NodeName, test.SetDSOwnerRef),
test.SetDSOwnerRef(pod)
}),
test.BuildTestPod("p7", 400, 0, n1NodeName, func(pod *v1.Pod) { test.BuildTestPod("p7", 400, 0, n1NodeName, func(pod *v1.Pod) {
// A pod with local storage. // A pod with local storage.
test.SetNormalOwnerRef(pod) test.SetNormalOwnerRef(pod)
@@ -658,12 +654,8 @@ func TestLowNodeUtilization(t *testing.T) {
test.SetRSOwnerRef(pod) test.SetRSOwnerRef(pod)
test.SetPodExtendedResourceRequest(pod, extendedResource, 7) test.SetPodExtendedResourceRequest(pod, extendedResource, 7)
}), }),
test.BuildTestPod("p3", 0, 0, n2NodeName, func(pod *v1.Pod) { test.BuildTestPod("p3", 0, 0, n2NodeName, test.SetRSOwnerRef),
test.SetRSOwnerRef(pod) test.BuildTestPod("p8", 0, 0, n3NodeName, test.SetRSOwnerRef),
}),
test.BuildTestPod("p8", 0, 0, n3NodeName, func(pod *v1.Pod) {
test.SetRSOwnerRef(pod)
}),
test.BuildTestPod("p9", 0, 0, n3NodeName, test.SetRSOwnerRef), test.BuildTestPod("p9", 0, 0, n3NodeName, test.SetRSOwnerRef),
}, },
nodemetricses: []*v1beta1.NodeMetrics{ nodemetricses: []*v1beta1.NodeMetrics{

8
pkg/framework/plugins/removeduplicates/removeduplicates_test.go
View File

@@ -144,9 +144,7 @@ func TestFindDuplicatePods(t *testing.T) {
{ {
description: "Pods are: part of DaemonSet, with local storage, mirror pod annotation, critical pod annotation - none should be evicted.", description: "Pods are: part of DaemonSet, with local storage, mirror pod annotation, critical pod annotation - none should be evicted.",
pods: []*v1.Pod{ pods: []*v1.Pod{
buildTestPodForNode("p4", nodeName1, func(pod *v1.Pod) { buildTestPodForNode("p4", nodeName1, test.SetDSOwnerRef),
test.SetDSOwnerRef(pod)
}),
buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) { buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) {
test.SetNormalOwnerRef(pod) test.SetNormalOwnerRef(pod)
test.SetHostPathEmptyDirVolumeSource(pod) test.SetHostPathEmptyDirVolumeSource(pod)
@@ -171,9 +169,7 @@ func TestFindDuplicatePods(t *testing.T) {
buildTestPodWithRSOwnerRefWithNamespaceForNode1("p1", "dev", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p1", "dev", nil),
buildTestPodWithRSOwnerRefWithNamespaceForNode1("p2", "dev", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p2", "dev", nil),
buildTestPodWithRSOwnerRefWithNamespaceForNode1("p3", "dev", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p3", "dev", nil),
buildTestPodForNode("p4", nodeName1, func(pod *v1.Pod) { buildTestPodForNode("p4", nodeName1, test.SetDSOwnerRef),
test.SetDSOwnerRef(pod)
}),
buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) { buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) {
test.SetNormalOwnerRef(pod) test.SetNormalOwnerRef(pod)
test.SetHostPathEmptyDirVolumeSource(pod) test.SetHostPathEmptyDirVolumeSource(pod)