diff --git a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go index f88b75986..f7fffbcc7 100644 --- a/pkg/framework/plugins/defaultevictor/defaultevictor_test.go +++ b/pkg/framework/plugins/defaultevictor/defaultevictor_test.go @@ -512,7 +512,7 @@ func TestDefaultEvictorFilter(t *testing.T) { pods: []*v1.Pod{ buildTestPod("p14", n1.Name, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) - pod.Spec.Priority = &highPriority + test.SetPodPriority(pod, highPriority) }), }, priorityThreshold: &lowPriority, @@ -523,7 +523,7 @@ func TestDefaultEvictorFilter(t *testing.T) { buildTestPod("p15", n1.Name, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) setPodEvictAnnotation(pod) - pod.Spec.Priority = &highPriority + test.SetPodPriority(pod, highPriority) }), }, priorityThreshold: &lowPriority, @@ -557,7 +557,7 @@ func TestDefaultEvictorFilter(t *testing.T) { pods: []*v1.Pod{ buildTestPod("p17", n1.Name, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) - pod.Spec.Priority = &highPriority + test.SetPodPriority(pod, highPriority) }), }, evictSystemCriticalPods: true, @@ -570,7 +570,7 @@ func TestDefaultEvictorFilter(t *testing.T) { buildTestPod("p17", n1.Name, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) setPodEvictAnnotation(pod) - pod.Spec.Priority = &highPriority + test.SetPodPriority(pod, highPriority) }), }, evictSystemCriticalPods: true, diff --git a/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go b/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go index 1e7297f2e..e117d617f 100644 --- a/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go +++ b/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go @@ -115,8 +115,7 @@ func TestHighNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), // These won't be evicted. test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetDSOwnerRef), @@ -168,8 +167,7 @@ func TestHighNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), // These won't be evicted. test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef), diff --git a/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go b/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go index 4cfd10240..233c718e2 100644 --- a/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go +++ b/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go @@ -109,8 +109,7 @@ func TestLowNodeUtilization(t *testing.T) { test.BuildTestPod("p6", 400, 0, n1NodeName, func(pod *v1.Pod) { // A Critical Pod. pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -172,8 +171,7 @@ func TestLowNodeUtilization(t *testing.T) { test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) { // A Critical Pod. pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -250,8 +248,7 @@ func TestLowNodeUtilization(t *testing.T) { test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) { // A Critical Pod. pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -328,8 +325,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -397,8 +393,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -480,8 +475,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -561,8 +555,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -651,8 +644,7 @@ func TestLowNodeUtilization(t *testing.T) { test.SetNormalOwnerRef(pod) test.SetPodExtendedResourceRequest(pod, extendedResource, 1) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 0, 0, n2NodeName, func(pod *v1.Pod) { test.SetRSOwnerRef(pod) @@ -813,8 +805,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), }, nodemetricses: []*v1beta1.NodeMetrics{ @@ -890,8 +881,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), }, nodemetricses: []*v1beta1.NodeMetrics{ @@ -993,8 +983,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 0, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -1055,8 +1044,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -1124,8 +1112,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 3000, n2NodeName, test.SetRSOwnerRef), }, @@ -1236,8 +1223,7 @@ func TestLowNodeUtilization(t *testing.T) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 0, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -1299,8 +1285,7 @@ func TestLowNodeUtilization(t *testing.T) { test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) { // A Critical Pod. pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef), }, @@ -1594,8 +1579,7 @@ func withCriticalPod(pod *v1.Pod) { // A Critical Pod. test.SetNormalOwnerRef(pod) pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) } func TestLowNodeUtilizationWithPrometheusMetrics(t *testing.T) { diff --git a/pkg/framework/plugins/removeduplicates/removeduplicates_test.go b/pkg/framework/plugins/removeduplicates/removeduplicates_test.go index 95c229088..7bcc3af40 100644 --- a/pkg/framework/plugins/removeduplicates/removeduplicates_test.go +++ b/pkg/framework/plugins/removeduplicates/removeduplicates_test.go @@ -167,8 +167,7 @@ func TestFindDuplicatePods(t *testing.T) { }), buildTestPodForNode("p7", nodeName1, func(pod *v1.Pod) { pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), }, nodes: []*v1.Node{ @@ -205,8 +204,7 @@ func TestFindDuplicatePods(t *testing.T) { }), buildTestPodForNode("p7", nodeName1, func(pod *v1.Pod) { pod.Namespace = "kube-system" - priority := utils.SystemCriticalPriority - pod.Spec.Priority = &priority + test.SetPodPriority(pod, utils.SystemCriticalPriority) }), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p8", "test", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p9", "test", nil), diff --git a/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity_test.go b/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity_test.go index 2dbc0a7d4..66f35ab67 100644 --- a/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity_test.go +++ b/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity/pod_antiaffinity_test.go @@ -96,7 +96,7 @@ func buildTestPodP2ForNode1() *v1.Pod { func buildTestPodNonEvictableForNode1() *v1.Pod { criticalPriority := utils.SystemCriticalPriority return buildTestPodForNode1("non-evict", func(pod *v1.Pod) { - pod.Spec.Priority = &criticalPriority + test.SetPodPriority(pod, criticalPriority) setLabelsFooBar(pod) }) }