[WIP] Reorganize RemoveFailedPods plugin

hack/update-generated-conversions.sh

@@ -5,5 +5,5 @@ go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/con
 
 ${OS_OUTPUT_BINPATH}/conversion-gen \
 		--go-header-file "hack/boilerplate/boilerplate.go.txt" \
-		--input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
+		--input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1,${PRJ_PREFIX}/pkg/framework/plugins/removefailedpods" \
 		--output-file-base zz_generated.conversion

hack/update-generated-deep-copies.sh

@@ -5,6 +5,6 @@ go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepc
 
 ${OS_OUTPUT_BINPATH}/deepcopy-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig,${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api,${PRJ_PREFIX}/pkg/api/v1alpha1" \
+                --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig,${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api,${PRJ_PREFIX}/pkg/api/v1alpha1,${PRJ_PREFIX}/pkg/framework/plugins/removefailedpods" \
                 --output-file-base zz_generated.deepcopy
 

pkg/apis/componentconfig/types_pluginargs.go

@@ -32,17 +32,3 @@ 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

@@ -29,11 +29,6 @@ func ValidateRemovePodsViolatingNodeTaintsArgs(args *componentconfig.RemovePodsV
 	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 namespaces != nil && len(namespaces.Include) > 0 && len(namespaces.Exclude) > 0 {

pkg/descheduler/strategy_migration.go

@@ -60,15 +60,15 @@ var pluginsMap = map[string]func(ctx context.Context, nodes []*v1.Node, params *
 		if failedPodsParams == nil {
 			failedPodsParams = &api.FailedPods{}
 		}
-		args := &componentconfig.RemoveFailedPodsArgs{
+		args := &removefailedpods.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 {
+		if err := removefailedpods.ValidateRemoveFailedPodsArgs(args); err != nil {
 			klog.V(1).ErrorS(err, "unable to validate plugin arguments", "pluginName", removefailedpods.PluginName)
 			return
 		}

pkg/framework/plugins/removefailedpods/failedpods.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 
-	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/framework"
@@ -38,7 +37,7 @@ const PluginName = "RemoveFailedPods"
 // RemoveFailedPods evicts pods on the node which violate NoSchedule Taints on nodes
 type RemoveFailedPods struct {
 	handle    framework.Handle
-	args      *componentconfig.RemoveFailedPodsArgs
+	args      *RemoveFailedPodsArgs
 	podFilter podutil.FilterFunc
 }
 
@@ -47,7 +46,7 @@ var _ framework.DeschedulePlugin = &RemoveFailedPods{}
 
 // New builds plugin from its arguments while passing a handle
 func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	failedPodsArgs, ok := args.(*componentconfig.RemoveFailedPodsArgs)
+	failedPodsArgs, ok := args.(*RemoveFailedPodsArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type RemoveFailedPodsArgs, got %T", args)
 	}
@@ -114,7 +113,7 @@ func (d *RemoveFailedPods) Deschedule(ctx context.Context, nodes []*v1.Node) *fr
 }
 
 // validateCanEvict looks at failedPodArgs to see if pod can be evicted given the args.
-func validateCanEvict(pod *v1.Pod, failedPodArgs *componentconfig.RemoveFailedPodsArgs) error {
+func validateCanEvict(pod *v1.Pod, failedPodArgs *RemoveFailedPodsArgs) error {
 	var errs []error
 
 	if failedPodArgs.MinPodLifetimeSeconds != nil {

pkg/framework/plugins/removefailedpods/failedpods_test.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/events"
-	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/framework"
 
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
@@ -44,8 +43,8 @@ func TestRemoveFailedPods(t *testing.T) {
 	createRemoveFailedPodsArgs := func(
 		includingInitContainers bool,
 		reasons, excludeKinds []string,
-		minAgeSeconds *uint) componentconfig.RemoveFailedPodsArgs {
-		return componentconfig.RemoveFailedPodsArgs{
+		minAgeSeconds *uint) RemoveFailedPodsArgs {
+		return RemoveFailedPodsArgs{
 			IncludingInitContainers: includingInitContainers,
 			Reasons:                 reasons,
 			MinPodLifetimeSeconds:   minAgeSeconds,
@@ -56,14 +55,14 @@ func TestRemoveFailedPods(t *testing.T) {
 	tests := []struct {
 		description             string
 		nodes                   []*v1.Node
-		args                    componentconfig.RemoveFailedPodsArgs
+		args                    RemoveFailedPodsArgs
 		expectedEvictedPodCount uint
 		pods                    []*v1.Pod
 		nodeFit                 bool
 	}{
 		{
 			description:             "default empty args, 0 failures, 0 evictions",
-			args:                    componentconfig.RemoveFailedPodsArgs{},
+			args:                    RemoveFailedPodsArgs{},
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods:                    []*v1.Pod{}, // no pods come back with field selector phase=Failed
@@ -311,7 +310,7 @@ func TestRemoveFailedPods(t *testing.T) {
 				evictions.WithNodeFit(tc.nodeFit),
 			)
 
-			plugin, err := New(&componentconfig.RemoveFailedPodsArgs{
+			plugin, err := New(&RemoveFailedPodsArgs{
 				Reasons:                 tc.args.Reasons,
 				MinPodLifetimeSeconds:   tc.args.MinPodLifetimeSeconds,
 				IncludingInitContainers: tc.args.IncludingInitContainers,

pkg/framework/plugins/removefailedpods/types.go

@@ -0,0 +1,37 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package removefailedpods
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/descheduler/pkg/api"
+)
+
+// +k8s:deepcopy-gen=true
+// +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/framework/plugins/removefailedpods/validation.go

@@ -0,0 +1,39 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package removefailedpods
+
+import (
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// ValidateRemoveFailedPodsArgs validates RemoveFailedPods arguments
+func ValidateRemoveFailedPodsArgs(args *RemoveFailedPodsArgs) error {
+	// At most one of include/exclude can be set
+	if args.Namespaces != nil && len(args.Namespaces.Include) > 0 && len(args.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+
+	if args.LabelSelector != nil {
+		if _, err := metav1.LabelSelectorAsSelector(args.LabelSelector); err != nil {
+			return fmt.Errorf("failed to get label selectors from strategy's params: %+v", err)
+		}
+	}
+
+	return nil
+}