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

RemoveFailedPods defaulting + moving arguments to its corresponding plugin

This commit is contained in:
vlc刘诚
2022-09-19 11:43:01 +08:00
parent e31f4aac00
commit 8d471baf3e
12 changed files with 166 additions and 93 deletions

View File

@@ -13,7 +13,6 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/utils/pointer"
"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
"sigs.k8s.io/descheduler/pkg/framework"
frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
@@ -39,27 +38,27 @@ func TestFailedPods(t *testing.T) {
defer clientSet.CoreV1().Namespaces().Delete(ctx, testNamespace.Name, metav1.DeleteOptions{})
testCases := map[string]struct {
expectedEvictedCount uint
args *componentconfig.RemoveFailedPodsArgs
args *removefailedpods.RemoveFailedPodsArgs
}{
"test-failed-pods-default-args": {
expectedEvictedCount: 1,
args: &componentconfig.RemoveFailedPodsArgs{},
args: &removefailedpods.RemoveFailedPodsArgs{},
},
"test-failed-pods-reason-unmatched": {
expectedEvictedCount: 0,
args: &componentconfig.RemoveFailedPodsArgs{
args: &removefailedpods.RemoveFailedPodsArgs{
Reasons: []string{"ReasonDoesNotMatch"},
},
},
"test-failed-pods-min-age-unmet": {
expectedEvictedCount: 0,
args: &componentconfig.RemoveFailedPodsArgs{
args: &removefailedpods.RemoveFailedPodsArgs{
MinPodLifetimeSeconds: &oneHourPodLifetimeSeconds,
},
},
"test-failed-pods-exclude-job-kind": {
expectedEvictedCount: 0,
args: &componentconfig.RemoveFailedPodsArgs{
args: &removefailedpods.RemoveFailedPodsArgs{
ExcludeOwnerKinds: []string{"Job"},
},
},
@@ -100,7 +99,7 @@ func TestFailedPods(t *testing.T) {
t.Logf("Running RemoveFailedPods strategy for %s", name)
plugin, err := removefailedpods.New(&componentconfig.RemoveFailedPodsArgs{
plugin, err := removefailedpods.New(&removefailedpods.RemoveFailedPodsArgs{
Reasons: tc.args.Reasons,
MinPodLifetimeSeconds: tc.args.MinPodLifetimeSeconds,
IncludingInitContainers: tc.args.IncludingInitContainers,