mirror of
https://github.com/kubernetes-sigs/descheduler.git
synced 2026-01-26 05:14:13 +01:00
fix(unit-test): add necessary ownerRef to the pod.
This commit is contained in:
@@ -115,6 +115,7 @@ func TestHighNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -167,6 +168,7 @@ func TestHighNodeUtilization(t *testing.T) {
|
|||||||
// These won't be evicted.
|
// These won't be evicted.
|
||||||
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
|
|||||||
@@ -175,18 +175,23 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
},
|
},
|
||||||
pods: []*v1.Pod{
|
pods: []*v1.Pod{
|
||||||
test.BuildTestPod("p1", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p1", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "namespace1"
|
pod.Namespace = "namespace1"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "namespace1"
|
pod.Namespace = "namespace1"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "namespace1"
|
pod.Namespace = "namespace1"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "namespace1"
|
pod.Namespace = "namespace1"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "namespace1"
|
pod.Namespace = "namespace1"
|
||||||
}),
|
}),
|
||||||
// These won't be evicted.
|
// These won't be evicted.
|
||||||
@@ -242,12 +247,15 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
test.BuildTestPod("p1", 400, 0, n1NodeName, test.SetRSOwnerRef),
|
test.BuildTestPod("p1", 400, 0, n1NodeName, test.SetRSOwnerRef),
|
||||||
test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef),
|
test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef),
|
||||||
test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
// TODO(zhifei92): add ownerRef for pod
|
||||||
pod.Namespace = "namespace3"
|
pod.Namespace = "namespace3"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
// TODO(zhifei92): add ownerRef for pod
|
||||||
pod.Namespace = "namespace4"
|
pod.Namespace = "namespace4"
|
||||||
}),
|
}),
|
||||||
test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
|
// TODO(zhifei92): add ownerRef for pod
|
||||||
pod.Namespace = "namespace5"
|
pod.Namespace = "namespace5"
|
||||||
}),
|
}),
|
||||||
// These won't be evicted.
|
// These won't be evicted.
|
||||||
@@ -271,6 +279,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -326,6 +335,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 300, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 300, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -396,6 +406,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -463,6 +474,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -538,6 +550,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 0, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 0, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
test.SetPodExtendedResourceRequest(pod, extendedResource, 1)
|
test.SetPodExtendedResourceRequest(pod, extendedResource, 1)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
@@ -620,6 +633,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -684,6 +698,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -776,6 +791,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
@@ -827,6 +843,7 @@ func TestLowNodeUtilization(t *testing.T) {
|
|||||||
}),
|
}),
|
||||||
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
|
||||||
// A Critical Pod.
|
// A Critical Pod.
|
||||||
|
test.SetNormalOwnerRef(pod)
|
||||||
pod.Namespace = "kube-system"
|
pod.Namespace = "kube-system"
|
||||||
priority := utils.SystemCriticalPriority
|
priority := utils.SystemCriticalPriority
|
||||||
pod.Spec.Priority = &priority
|
pod.Spec.Priority = &priority
|
||||||
|
|||||||
@@ -312,8 +312,8 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
|
|||||||
t.Run(tc.description, func(t *testing.T) {
|
t.Run(tc.description, func(t *testing.T) {
|
||||||
pods := append(
|
pods := append(
|
||||||
initPods(node1),
|
initPods(node1),
|
||||||
test.BuildTestPod("CPU-consumer-1", 150, 100, node4.Name, nil),
|
test.BuildTestPod("CPU-consumer-1", 150, 100, node4.Name, test.SetNormalOwnerRef),
|
||||||
test.BuildTestPod("CPU-consumer-2", 150, 100, node5.Name, nil),
|
test.BuildTestPod("CPU-consumer-2", 150, 100, node5.Name, test.SetNormalOwnerRef),
|
||||||
)
|
)
|
||||||
if tc.applyFunc != nil {
|
if tc.applyFunc != nil {
|
||||||
tc.applyFunc(pods)
|
tc.applyFunc(pods)
|
||||||
|
|||||||
@@ -110,6 +110,12 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
|
|||||||
p4 := test.BuildTestPod("p4", 100, 0, node1.Name, nil)
|
p4 := test.BuildTestPod("p4", 100, 0, node1.Name, nil)
|
||||||
p5 := test.BuildTestPod("p5", 100, 0, node1.Name, nil)
|
p5 := test.BuildTestPod("p5", 100, 0, node1.Name, nil)
|
||||||
p6 := test.BuildTestPod("p6", 100, 0, node1.Name, nil)
|
p6 := test.BuildTestPod("p6", 100, 0, node1.Name, nil)
|
||||||
|
p7 := test.BuildTestPod("p7", 100, 0, node2.Name, nil)
|
||||||
|
p8 := test.BuildTestPod("p8", 100, 0, node2.Name, nil)
|
||||||
|
p9 := test.BuildTestPod("p9", 100, 0, node2.Name, nil)
|
||||||
|
p10 := test.BuildTestPod("p10", 100, 0, node2.Name, nil)
|
||||||
|
p11 := test.BuildTestPod("p11", 100, 0, node2.Name, nil)
|
||||||
|
p12 := test.BuildTestPod("p11", 100, 0, node2.Name, nil)
|
||||||
|
|
||||||
p1.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p1.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p2.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p2.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
@@ -117,13 +123,11 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
|
|||||||
p4.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p4.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p5.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p5.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p6.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p6.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p7 := test.BuildTestPod("p7", 100, 0, node2.Name, nil)
|
p7.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p8 := test.BuildTestPod("p8", 100, 0, node2.Name, nil)
|
p8.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p9 := test.BuildTestPod("p9", 100, 0, node2.Name, nil)
|
p9.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p10 := test.BuildTestPod("p10", 100, 0, node2.Name, nil)
|
p10.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p11 := test.BuildTestPod("p11", 100, 0, node2.Name, nil)
|
|
||||||
p11.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p11.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
p12 := test.BuildTestPod("p11", 100, 0, node2.Name, nil)
|
|
||||||
p12.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
p12.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
|
||||||
|
|
||||||
// The following 4 pods won't get evicted.
|
// The following 4 pods won't get evicted.
|
||||||
|
|||||||
Reference in New Issue
Block a user