mirror of
https://github.com/kubernetes-sigs/descheduler.git
synced 2026-01-28 14:41:10 +01:00
refactor(TestPodLifeTime): extract generic filtering tests
This commit is contained in:
@@ -143,26 +143,6 @@ func runPodLifeTimeTest(t *testing.T, tc podLifeTimeTestCase) {
|
|||||||
func TestPodLifeTime(t *testing.T) {
|
func TestPodLifeTime(t *testing.T) {
|
||||||
var maxLifeTime uint = 600
|
var maxLifeTime uint = 600
|
||||||
testCases := []podLifeTimeTestCase{
|
testCases := []podLifeTimeTestCase{
|
||||||
{
|
|
||||||
description: "1 pod matching label selector should be evicted",
|
|
||||||
args: &PodLifeTimeArgs{
|
|
||||||
MaxPodLifeTimeSeconds: &maxLifeTime,
|
|
||||||
LabelSelector: &metav1.LabelSelector{
|
|
||||||
MatchLabels: map[string]string{"foo": "bar"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
pods: []*v1.Pod{
|
|
||||||
buildTestPodWithRSOwnerRefForNode1("p12", olderPodCreationTime, func(pod *v1.Pod) {
|
|
||||||
pod.ObjectMeta.Labels = map[string]string{"foo": "bar"}
|
|
||||||
}),
|
|
||||||
buildTestPodWithRSOwnerRefForNode1("p13", olderPodCreationTime, func(pod *v1.Pod) {
|
|
||||||
pod.ObjectMeta.Labels = map[string]string{"foo": "bar1"}
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
nodes: []*v1.Node{buildTestNode1()},
|
|
||||||
expectedEvictedPodCount: 1,
|
|
||||||
expectedEvictedPods: []string{"p12"},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
description: "No pod should be evicted since pod terminating",
|
description: "No pod should be evicted since pod terminating",
|
||||||
args: &PodLifeTimeArgs{
|
args: &PodLifeTimeArgs{
|
||||||
@@ -242,6 +222,38 @@ func TestPodLifeTime_EvictorConfiguration(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPodLifeTime_GenericFiltering(t *testing.T) {
|
||||||
|
var maxLifeTime uint = 600
|
||||||
|
testCases := []podLifeTimeTestCase{
|
||||||
|
{
|
||||||
|
description: "1 pod matching label selector should be evicted",
|
||||||
|
args: &PodLifeTimeArgs{
|
||||||
|
MaxPodLifeTimeSeconds: &maxLifeTime,
|
||||||
|
LabelSelector: &metav1.LabelSelector{
|
||||||
|
MatchLabels: map[string]string{"foo": "bar"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
pods: []*v1.Pod{
|
||||||
|
buildTestPodWithRSOwnerRefForNode1("p12", olderPodCreationTime, func(pod *v1.Pod) {
|
||||||
|
pod.ObjectMeta.Labels = map[string]string{"foo": "bar"}
|
||||||
|
}),
|
||||||
|
buildTestPodWithRSOwnerRefForNode1("p13", olderPodCreationTime, func(pod *v1.Pod) {
|
||||||
|
pod.ObjectMeta.Labels = map[string]string{"foo": "bar1"}
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
nodes: []*v1.Node{buildTestNode1()},
|
||||||
|
expectedEvictedPodCount: 1,
|
||||||
|
expectedEvictedPods: []string{"p12"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range testCases {
|
||||||
|
t.Run(tc.description, func(t *testing.T) {
|
||||||
|
runPodLifeTimeTest(t, tc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestPodLifeTime_EvictionLimits(t *testing.T) {
|
func TestPodLifeTime_EvictionLimits(t *testing.T) {
|
||||||
var maxLifeTime uint = 600
|
var maxLifeTime uint = 600
|
||||||
testCases := []podLifeTimeTestCase{
|
testCases := []podLifeTimeTestCase{
|
||||||
|
|||||||
Reference in New Issue
Block a user