Migrate RemoveFailedPods to plugin

pkg/apis/componentconfig/types_pluginargs.go

@@ -32,3 +32,17 @@ type RemovePodsViolatingNodeTaintsArgs struct {
 	IncludePreferNoSchedule bool
 	ExcludedTaints          []string
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// RemoveFailedPodsArgs holds arguments used to configure RemoveFailedPodsArgs plugin.
+type RemoveFailedPodsArgs struct {
+	metav1.TypeMeta
+
+	Namespaces              *api.Namespaces
+	LabelSelector           *metav1.LabelSelector
+	ExcludeOwnerKinds       []string
+	MinPodLifetimeSeconds   *uint
+	Reasons                 []string
+	IncludingInitContainers bool
+}

pkg/apis/componentconfig/validation/validation_pluginargs.go

@@ -19,15 +19,32 @@ package validation
 import (
 	"fmt"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 )
 
 // ValidateRemovePodsViolatingNodeTaintsArgs validates RemovePodsViolatingNodeTaints arguments
 func ValidateRemovePodsViolatingNodeTaintsArgs(args *componentconfig.RemovePodsViolatingNodeTaintsArgs) error {
+	return validateCommonArgs(args.Namespaces, args.LabelSelector)
+}
+
+// ValidateRemoveFailedPodsArgs validates RemoveFailedPods arguments
+func ValidateRemoveFailedPodsArgs(args *componentconfig.RemoveFailedPodsArgs) error {
+	return validateCommonArgs(args.Namespaces, args.LabelSelector)
+}
+
+func validateCommonArgs(namespaces *api.Namespaces, labelSelector *metav1.LabelSelector) error {
 	// At most one of include/exclude can be set
-	if args.Namespaces != nil && len(args.Namespaces.Include) > 0 && len(args.Namespaces.Exclude) > 0 {
+	if namespaces != nil && len(namespaces.Include) > 0 && len(namespaces.Exclude) > 0 {
 		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
 	}
 
+	if labelSelector != nil {
+		if _, err := metav1.LabelSelectorAsSelector(labelSelector); err != nil {
+			return fmt.Errorf("failed to get label selectors from strategy's params: %+v", err)
+		}
+	}
+
 	return nil
 }

pkg/descheduler/descheduler.go

@@ -46,6 +46,7 @@ import (
 	"sigs.k8s.io/descheduler/pkg/descheduler/strategies"
 	"sigs.k8s.io/descheduler/pkg/descheduler/strategies/nodeutilization"
 	"sigs.k8s.io/descheduler/pkg/framework"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
@@ -245,11 +246,11 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 		"HighNodeUtilization":                         nodeutilization.HighNodeUtilization,
 		"RemovePodsViolatingInterPodAntiAffinity":     strategies.RemovePodsViolatingInterPodAntiAffinity,
 		"RemovePodsViolatingNodeAffinity":             strategies.RemovePodsViolatingNodeAffinity,
-		"RemovePodsViolatingNodeTaints":               nil,
+		removepodsviolatingnodetaints.PluginName:      nil,
 		"RemovePodsHavingTooManyRestarts":             strategies.RemovePodsHavingTooManyRestarts,
 		"PodLifeTime":                                 strategies.PodLifeTime,
 		"RemovePodsViolatingTopologySpreadConstraint": strategies.RemovePodsViolatingTopologySpreadConstraint,
-		"RemoveFailedPods":                            strategies.RemoveFailedPods,
+		removefailedpods.PluginName:                   nil,
 	}
 
 	var nodeSelector string
@@ -375,7 +376,7 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 					}
 
 					switch name {
-					case "RemovePodsViolatingNodeTaints":
+					case removepodsviolatingnodetaints.PluginName:
 						pg, err := RemovePodsViolatingNodeTaints2plugin(params, handle)
 						if err != nil {
 							klog.V(1).ErrorS(err, "unable to initialize a plugin", "pluginName", removepodsviolatingnodetaints.PluginName)
@@ -385,6 +386,16 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 						if status != nil && status.Err != nil {
 							klog.V(1).ErrorS(err, "plugin finished with error", "pluginName", removepodsviolatingnodetaints.PluginName)
 						}
+					case removefailedpods.PluginName:
+						pg, err := RemoveFailedPods2plugin(params, handle)
+						if err != nil {
+							klog.V(1).ErrorS(err, "unable to initialize a plugin", "pluginName", removefailedpods.PluginName)
+							continue
+						}
+						status := pg.Deschedule(ctx, nodes)
+						if status != nil && status.Err != nil {
+							klog.V(1).ErrorS(err, "plugin finished with error", "pluginName", removepodsviolatingnodetaints.PluginName)
+						}
 					default:
 						f(context.WithValue(ctx, "strategyName", string(name)), rs.Client, strategy, nodes, podEvictor, evictorFilter, getPodsAssignedToNode)
 					}

pkg/descheduler/strategy_migration.go

@@ -21,6 +21,7 @@ import (
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig/validation"
 	"sigs.k8s.io/descheduler/pkg/framework"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
 )
 
@@ -43,3 +44,26 @@ func RemovePodsViolatingNodeTaints2plugin(params *api.StrategyParameters, handle
 	}
 	return pg.(framework.DeschedulePlugin), nil
 }
+
+func RemoveFailedPods2plugin(params *api.StrategyParameters, handle *handleImpl) (framework.DeschedulePlugin, error) {
+	failedPodsParams := params.FailedPods
+	if failedPodsParams == nil {
+		failedPodsParams = &api.FailedPods{}
+	}
+	args := &componentconfig.RemoveFailedPodsArgs{
+		Namespaces:              params.Namespaces,
+		LabelSelector:           params.LabelSelector,
+		IncludingInitContainers: failedPodsParams.IncludingInitContainers,
+		MinPodLifetimeSeconds:   failedPodsParams.MinPodLifetimeSeconds,
+		ExcludeOwnerKinds:       failedPodsParams.ExcludeOwnerKinds,
+		Reasons:                 failedPodsParams.Reasons,
+	}
+	if err := validation.ValidateRemoveFailedPodsArgs(args); err != nil {
+		return nil, err
+	}
+	pg, err := removefailedpods.New(args, handle)
+	if err != nil {
+		return nil, err
+	}
+	return pg.(framework.DeschedulePlugin), nil
+}