add new preevectionfilter plugin with args

kubernetes-sigs · Sep 2, 2022 · f199d2a · f199d2a
1 parent 1eade5b
commit f199d2a
Show file tree

Hide file tree

Showing 24 changed files with 1,169 additions and 956 deletions.
diff --git a/pkg/apis/componentconfig/types_pluginargs.go b/pkg/apis/componentconfig/types_pluginargs.go
@@ -17,7 +17,9 @@ limitations under the License.
 package componentconfig
 
 import (
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/descheduler/pkg/api"
 )
 
@@ -131,3 +133,19 @@ type HighNodeUtilizationArgs struct {
 	Thresholds    api.ResourceThresholds
 	NumberOfNodes int
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// DefaultEvictorArgs holds arguments used to configure DefaultEvictorArgs plugin.
+type DefaultEvictorArgs struct {
+	metav1.TypeMeta
+
+	Nodes                   []*v1.Node
+	EvictLocalStoragePods   bool
+	EvictSystemCriticalPods bool
+	IgnorePvcPods           bool
+	EvictFailedBarePods     bool
+	PriorityThresholds      *int32
+	NodeFit                 bool
+	LabelSelector           labels.Selector
+}
diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go
diff --git a/pkg/descheduler/descheduler.go b/pkg/descheduler/descheduler.go
@@ -38,12 +38,14 @@ import (
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/metrics"
 	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/descheduler/client"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/framework"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
@@ -88,7 +90,7 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 	return runFn()
 }
 
-type strategyFunction func(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, evictorFilter *evictions.EvictorFilter, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc)
+type strategyFunction func(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, evictorFilter framework.EvictorPlugin, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc)
 
 func cachedClient(
 	realClient clientset.Interface,
@@ -170,7 +172,7 @@ func cachedClient(
 // can evict a pod without importing a specific pod evictor
 type evictorImpl struct {
 	podEvictor    *evictions.PodEvictor
-	evictorFilter *evictions.EvictorFilter
+	evictorFilter framework.EvictorPlugin
 }
 
 var _ framework.Evictor = &evictorImpl{}
@@ -376,16 +378,21 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 						continue
 					}
 
-					evictorFilter := evictions.NewEvictorFilter(
-						nodes,
+					defaultevictorArgs := &componentconfig.DefaultEvictorArgs{
+						Nodes:                   nodes,
+						EvictLocalStoragePods:   evictLocalStoragePods,
+						EvictSystemCriticalPods: evictSystemCriticalPods,
+						IgnorePvcPods:           ignorePvcPods,
+						EvictFailedBarePods:     evictBarePods,
+						NodeFit:                 nodeFit,
+						PriorityThresholds:      &thresholdPriority,
+					}
+
+					evictorFilter, _ := defaultevictor.New(
+						defaultevictorArgs,
 						getPodsAssignedToNode,
-						evictLocalStoragePods,
-						evictSystemCriticalPods,
-						ignorePvcPods,
-						evictBarePods,
-						evictions.WithNodeFit(nodeFit),
-						evictions.WithPriorityThreshold(thresholdPriority),
 					)
+
 					handle := &handleImpl{
 						clientSet:                 rs.Client,
 						getPodsAssignedToNodeFunc: getPodsAssignedToNode,