Merge pull request #820 from damemi/1.24.1-updates

[release-1.24] Update helm chart for v0.24.1

.github/ci/ct.yaml

@@ -1,5 +0,0 @@
-chart-dirs:
-  - charts
-helm-extra-args: "--timeout=5m"
-check-version-increment: false
-target-branch: master

.github/workflows/helm.yaml

@@ -1,69 +0,0 @@
-name: Helm
-
-on:
-  push:
-    branches:
-      - master
-      - release-*
-    paths:
-      - 'charts/**'
-      - '.github/workflows/helm.yaml'
-      - '.github/ci/ct.yaml'
-  pull_request:
-    paths:
-      - 'charts/**'
-      - '.github/workflows/helm.yaml'
-      - '.github/ci/ct.yaml'
-
-jobs:
-  lint-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v2.1
-        with:
-          version: v3.9.2
-
-      - uses: actions/setup-python@v3.1.2
-        with:
-          python-version: 3.7
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.19.3'
-
-      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.1
-        with:
-          version: v3.7.0
-
-      - name: Run chart-testing (list-changed)
-        id: list-changed
-        run: |
-          changed=$(ct list-changed --config=.github/ci/ct.yaml)
-          if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
-          fi
-
-      - name: Run chart-testing (lint)
-        run: ct lint --config=.github/ci/ct.yaml --validate-maintainers=false
-
-      # Need a multi node cluster so descheduler runs until evictions
-      - name: Create multi node Kind cluster
-        run: make kind-multi-node
-
-      # helm-extra-set-args only available after ct 3.6.0
-      - name: Run chart-testing (install)
-        run: ct install --config=.github/ci/ct.yaml --helm-extra-set-args='--set=kind=Deployment'
-
-      - name: E2E after chart install
-        env:
-          KUBERNETES_VERSION: "v1.26.0"
-          KIND_E2E: true
-          SKIP_INSTALL: true
-        run: make test-e2e

.github/workflows/security.yaml

@@ -1,47 +0,0 @@
-name: "Security"
-
-on:
-  push:
-    branches:
-      - main
-      - master
-      - release-*
-  schedule:
-    - cron: '30 1 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Build image
-        run: |
-          IMAGE_REPO=${HELM_IMAGE_REPO:-descheduler}
-          IMAGE_TAG=${HELM_IMAGE_TAG:-security-test}
-          VERSION=security-test make image
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'descheduler:security-test'
-          format: 'sarif'
-          exit-code: '0'
-          severity: 'CRITICAL,HIGH'
-          output: 'trivy-results.sarif'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results.sarif'
-          exit-code: '0'

.gitignore

@@ -4,5 +4,4 @@ vendordiff.patch
 .idea/
 *.code-workspace
 .vscode/
-kind
-bin/
+kind

.golangci.yml

@@ -5,14 +5,11 @@ linters:
   disable-all: true
   enable:
     - gofmt
-    - gofumpt
     - gosimple
     - gocyclo
     - misspell
     - govet
 
 linters-settings:
-  gofumpt:
-    extra-rules: true
   goimports:
 local-prefixes: sigs.k8s.io/descheduler

Dockerfile

@@ -11,7 +11,7 @@
 # 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.
-FROM golang:1.19.3
+FROM golang:1.18.2
 
 WORKDIR /go/src/sigs.k8s.io/descheduler
 COPY . .

Makefile

@@ -14,10 +14,8 @@
 
 .PHONY: test
 
-export CONTAINER_ENGINE ?= docker
-
 # VERSION is based on a date stamp plus the last commit
-VERSION?=v$(shell date +%Y%m%d)-$(shell git describe --tags)
+VERSION?=v$(shell date +%Y%m%d)-$(shell git describe --tags --match "v*")
 BRANCH?=$(shell git branch --show-current)
 SHA1?=$(shell git rev-parse HEAD)
 BUILD=$(shell date +%FT%T%z)
@@ -26,12 +24,9 @@ ARCHS = amd64 arm arm64
 
 LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitbranch=${BRANCH} -X ${LDFLAG_LOCATION}.gitsha1=${SHA1}"
 
-GOLANGCI_VERSION := v1.49.0
+GOLANGCI_VERSION := v1.46.1
 HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null)
 
-GOFUMPT_VERSION := v0.4.0
-HAS_GOFUMPT := $(shell command -v gofumpt 2> /dev/null)
-
 # REGISTRY is the container registry to push
 # into. The default is to push to the staging
 # registry, not production.
@@ -65,36 +60,36 @@ build.arm64:
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build ${LDFLAGS} -o _output/bin/descheduler sigs.k8s.io/descheduler/cmd/descheduler
 
 dev-image: build
-	$(CONTAINER_ENGINE) build -f Dockerfile.dev -t $(IMAGE) .
+	docker build -f Dockerfile.dev -t $(IMAGE) .
 
 image:
-	$(CONTAINER_ENGINE) build --build-arg VERSION="$(VERSION)" --build-arg ARCH="amd64" -t $(IMAGE) .
+	docker build --build-arg VERSION="$(VERSION)" --build-arg ARCH="amd64" -t $(IMAGE) .
 
 image.amd64:
-	$(CONTAINER_ENGINE) build --build-arg VERSION="$(VERSION)" --build-arg ARCH="amd64" -t $(IMAGE)-amd64 .
+	docker build --build-arg VERSION="$(VERSION)" --build-arg ARCH="amd64" -t $(IMAGE)-amd64 .
 
 image.arm:
-	$(CONTAINER_ENGINE) build --build-arg VERSION="$(VERSION)" --build-arg ARCH="arm" -t $(IMAGE)-arm .
+	docker build --build-arg VERSION="$(VERSION)" --build-arg ARCH="arm" -t $(IMAGE)-arm .
 
 image.arm64:
-	$(CONTAINER_ENGINE) build --build-arg VERSION="$(VERSION)" --build-arg ARCH="arm64" -t $(IMAGE)-arm64 .
+	docker build --build-arg VERSION="$(VERSION)" --build-arg ARCH="arm64" -t $(IMAGE)-arm64 .
 
 push: image
 	gcloud auth configure-docker
-	$(CONTAINER_ENGINE) tag $(IMAGE) $(IMAGE_GCLOUD)
-	$(CONTAINER_ENGINE) push $(IMAGE_GCLOUD)
+	docker tag $(IMAGE) $(IMAGE_GCLOUD)
+	docker push $(IMAGE_GCLOUD)
 
 push-all: image.amd64 image.arm image.arm64
 	gcloud auth configure-docker
 	for arch in $(ARCHS); do \
-		$(CONTAINER_ENGINE) tag $(IMAGE)-$${arch} $(IMAGE_GCLOUD)-$${arch} ;\
-		$(CONTAINER_ENGINE) push $(IMAGE_GCLOUD)-$${arch} ;\
+		docker tag $(IMAGE)-$${arch} $(IMAGE_GCLOUD)-$${arch} ;\
+		docker push $(IMAGE_GCLOUD)-$${arch} ;\
 	done
-	DOCKER_CLI_EXPERIMENTAL=enabled $(CONTAINER_ENGINE) manifest create $(IMAGE_GCLOUD) $(addprefix --amend $(IMAGE_GCLOUD)-, $(ARCHS))
+	DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create $(IMAGE_GCLOUD) $(addprefix --amend $(IMAGE_GCLOUD)-, $(ARCHS))
 	for arch in $(ARCHS); do \
-		DOCKER_CLI_EXPERIMENTAL=enabled $(CONTAINER_ENGINE) manifest annotate --arch $${arch} $(IMAGE_GCLOUD) $(IMAGE_GCLOUD)-$${arch} ;\
+		DOCKER_CLI_EXPERIMENTAL=enabled docker manifest annotate --arch $${arch} $(IMAGE_GCLOUD) $(IMAGE_GCLOUD)-$${arch} ;\
 	done
-	DOCKER_CLI_EXPERIMENTAL=enabled $(CONTAINER_ENGINE) manifest push $(IMAGE_GCLOUD) ;\
+	DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push $(IMAGE_GCLOUD) ;\
 
 clean:
 	rm -rf _output
@@ -140,30 +135,13 @@ ifndef HAS_GOLANGCI
 endif
 	./_output/bin/golangci-lint run
 
-fmt:
-ifndef HAS_GOFUMPT
-	go install mvdan.cc/gofumpt@${GOFUMPT_VERSION}
-endif
-	gofumpt -w -extra .
+lint-chart: ensure-helm-install
+	helm lint ./charts/descheduler
 
-# helm
+test-helm: ensure-helm-install
+	./test/run-helm-tests.sh
 
 ensure-helm-install:
 ifndef HAS_HELM
 	curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && chmod 700 ./get_helm.sh && ./get_helm.sh
 endif
-
-lint-chart: ensure-helm-install
-	helm lint ./charts/descheduler
-
-build-helm:
-	helm package ./charts/descheduler --dependency-update --destination ./bin/chart
-
-test-helm: ensure-helm-install
-	./test/run-helm-tests.sh
-
-kind-multi-node:
-	kind create cluster --name kind --config ./hack/kind_config.yaml --wait 2m
-
-ct-helm:
-	./hack/verify-chart.sh

OWNERS

@@ -2,15 +2,16 @@ approvers:
 - damemi
 - ingvagabund
 - seanmalloy
-- a7i
 reviewers:
+- aveshagarwal
+- k82cn
+- ravisantoshgudimetla
 - damemi
 - seanmalloy
 - ingvagabund
 - lixiang233
 - a7i
 - janeliul
-- knelasevero
 emeritus_approvers:
 - aveshagarwal
 - k82cn

README.md

@@ -1,10 +1,6 @@
 [![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/descheduler)](https://goreportcard.com/report/sigs.k8s.io/descheduler)
 ![Release Charts](https://github.com/kubernetes-sigs/descheduler/workflows/Release%20Charts/badge.svg)
 
-<p align="center">
-    <img src="assets/logo/descheduler-stacked-color.png" width="40%" align="center" alt="descheduler">
-</p>
-
 # Descheduler for Kubernetes
 
 Scheduling in Kubernetes is the process of binding pending pods to nodes, and is performed by
@@ -105,21 +101,21 @@ The descheduler helm chart is also listed on the [artifact hub](https://artifact
 ### Install Using Kustomize
 
 You can use kustomize to install descheduler.
-See the [resources | Kustomize](https://kubectl.docs.kubernetes.io/references/kustomize/cmd/build/) for detailed instructions.
+See the [resources | Kustomize](https://kubectl.docs.kubernetes.io/references/kustomize/resource/) for detailed instructions.
 
 Run As A Job
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=v0.26.0' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=v0.24.1' | kubectl apply -f -
 ```
 
 Run As A CronJob
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.26.0' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.24.1' | kubectl apply -f -
 ```
 
 Run As A Deployment
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.26.0' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.24.1' | kubectl apply -f -
 ```
 
 ## User Guide
@@ -247,7 +243,6 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 |`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
 |`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
 |`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-|`Namespaces`|(see [namespace filtering](#namespace-filtering))|
 
 **Example:**
 
@@ -320,7 +315,6 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 |`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
 |`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
 |`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-|`Namespaces`|(see [namespace filtering](#namespace-filtering))|
 
 **Example:**
 
@@ -530,24 +524,19 @@ strategies:
 
 This strategy evicts pods that are older than `maxPodLifeTimeSeconds`.
 
-You can also specify `states` parameter to **only** evict pods matching the following conditions:
-  - [Pod Phase](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase) status of: `Running`, `Pending`
-  - [Container State Waiting](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-waiting) condition of: `PodInitializing`, `ContainerCreating`
-
-If a value for `states` or `podStatusPhases` is not specified,
-Pods in any state (even `Running`) are considered for eviction.
+You can also specify `podStatusPhases` to `only` evict pods with specific `StatusPhases`, currently this parameter is limited
+to `Running` and `Pending`.
 
 **Parameters:**
 
-|Name|Type|Notes|
-|---|---|---|
-|`maxPodLifeTimeSeconds`|int||
-|`podStatusPhases`|list(string)|Deprecated in v0.25+ Use `states` instead|
-|`states`|list(string)|Only supported in v0.25+|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))||
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))||
-|`namespaces`|(see [namespace filtering](#namespace-filtering))||
-|`labelSelector`|(see [label filtering](#label-filtering))||
+|Name|Type|
+|---|---|
+|`maxPodLifeTimeSeconds`|int|
+|`podStatusPhases`|list(string)|
+|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
+|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
+|`namespaces`|(see [namespace filtering](#namespace-filtering))|
+|`labelSelector`|(see [label filtering](#label-filtering))|
 
 **Example:**
 
@@ -560,9 +549,8 @@ strategies:
      params:
        podLifeTime:
          maxPodLifeTimeSeconds: 86400
-         states:
+         podStatusPhases:
          - "Pending"
-         - "PodInitializing"
 ```
 
 ### RemoveFailedPods
@@ -619,7 +607,6 @@ The following strategies accept a `namespaces` parameter which allows to specify
 * `RemoveDuplicates`
 * `RemovePodsViolatingTopologySpreadConstraint`
 * `RemoveFailedPods`
-* `LowNodeUtilization` and `HighNodeUtilization` (Only filtered right before eviction)
 
 For example:
 
@@ -702,7 +689,7 @@ does not exist, descheduler won't create it and will throw an error.
 
 ### Label filtering
 
-The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#labelselector-v1-meta)
+The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#labelselector-v1-meta)
 to filter pods by their labels:
 
 * `PodLifeTime`
@@ -764,7 +751,6 @@ strategies:
   "LowNodeUtilization":
     enabled: true
     params:
-      nodeFit: true
       nodeResourceUtilizationThresholds:
         thresholds:
           "cpu": 20
@@ -774,6 +760,7 @@ strategies:
           "cpu": 50
           "memory": 50
           "pods": 50
+        nodeFit: true
 ```
 
 Note that node fit filtering references the current pod spec, and not that of it's owner.
@@ -798,9 +785,6 @@ best effort pods are evicted before burstable and guaranteed pods.
 * All types of pods with the annotation `descheduler.alpha.kubernetes.io/evict` are eligible for eviction. This
   annotation is used to override checks which prevent eviction and users can select which pod is evicted.
   Users should know how and if the pod will be recreated.
-  The annotation only affects internal descheduler checks.
-  The anti-disruption protection provided by the [/eviction](https://kubernetes.io/docs/concepts/scheduling-eviction/api-eviction/)
-  subresource is still respected.
 * Pods with a non-nil DeletionTimestamp are not evicted by default.
 
 Setting `--v=4` or greater on the Descheduler will log all reasons why any pod is not evictable.
@@ -848,8 +832,6 @@ packages that it is compiled with.
 
 | Descheduler | Supported Kubernetes Version |
 |-------------|------------------------------|
-| v0.26       | v1.26                        |
-| v0.25       | v1.25                        |
 | v0.24       | v1.24                        |
 | v0.23       | v1.23                        |
 | v0.22       | v1.22                        |

charts/descheduler/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: descheduler
-version: 0.26.0
-appVersion: 0.26.0
+version: 0.24.1
+appVersion: 0.24.1
 description: Descheduler for Kubernetes is used to rebalance clusters by evicting pods that can potentially be scheduled on better nodes. In the current implementation, descheduler does not schedule replacement of evicted pods but relies on the default scheduler for that.
 keywords:
 - kubernetes

charts/descheduler/README.md

@@ -43,46 +43,46 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the _descheduler_ chart and their default values.
 
-| Parameter                           | Description                                                                                                           | Default                                   |
-| ----------------------------------- | --------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- |
-| `kind`                              | Use as CronJob or Deployment                                                                                          | `CronJob`                                 |
-| `image.repository`                  | Docker repository to use                                                                                              | `registry.k8s.io/descheduler/descheduler` |
-| `image.tag`                         | Docker tag to use                                                                                                     | `v[chart appVersion]`                     |
-| `image.pullPolicy`                  | Docker image pull policy                                                                                              | `IfNotPresent`                            |
-| `imagePullSecrets`                  | Docker repository secrets                                                                                             | `[]`                                      |
-| `nameOverride`                      | String to partially override `descheduler.fullname` template (will prepend the release name)                          | `""`                                      |
-| `fullnameOverride`                  | String to fully override `descheduler.fullname` template                                                              | `""`                                      |
-| `cronJobApiVersion`                 | CronJob API Group Version                                                                                             | `"batch/v1"`                              |
-| `schedule`                          | The cron schedule to run the _descheduler_ job on                                                                     | `"*/2 * * * *"`                           |
-| `startingDeadlineSeconds`           | If set, configure `startingDeadlineSeconds` for the _descheduler_ job                                                 | `nil`                                     |
-| `successfulJobsHistoryLimit`        | If set, configure `successfulJobsHistoryLimit` for the _descheduler_ job                                              | `3`                                       |
-| `failedJobsHistoryLimit`            | If set, configure `failedJobsHistoryLimit` for the _descheduler_ job                                                  | `1`                                       |
-| `ttlSecondsAfterFinished`           | If set, configure `ttlSecondsAfterFinished` for the _descheduler_ job                                                 | `nil`                                     |
-| `deschedulingInterval`              | If using kind:Deployment, sets time between consecutive descheduler executions.                                       | `5m`                                      |
-| `replicas`                          | The replica count for Deployment                                                                                      | `1`                                       |
-| `leaderElection`                    | The options for high availability when running replicated components                                                  | _see values.yaml_                         |
-| `cmdOptions`                        | The options to pass to the _descheduler_ command                                                                      | _see values.yaml_                         |
-| `deschedulerPolicy.strategies`      | The _descheduler_ strategies to apply                                                                                 | _see values.yaml_                         |
-| `priorityClassName`                 | The name of the priority class to add to pods                                                                         | `system-cluster-critical`                 |
-| `rbac.create`                       | If `true`, create & use RBAC resources                                                                                | `true`                                    |
-| `resources`                         | Descheduler container CPU and memory requests/limits                                                                  | _see values.yaml_                         |
-| `serviceAccount.create`             | If `true`, create a service account for the cron job                                                                  | `true`                                    |
-| `serviceAccount.name`               | The name of the service account to use, if not set and create is true a name is generated using the fullname template | `nil`                                     |
-| `serviceAccount.annotations`        | Specifies custom annotations for the serviceAccount                                                                   | `{}`                                      |
-| `podAnnotations`                    | Annotations to add to the descheduler Pods                                                                            | `{}`                                      |
-| `podLabels`                         | Labels to add to the descheduler Pods                                                                                 | `{}`                                      |
-| `nodeSelector`                      | Node selectors to run the descheduler cronjob/deployment on specific nodes                                            | `nil`                                     |
-| `service.enabled`                   | If `true`, create a service for deployment                                                                            | `false`                                   |
-| `serviceMonitor.enabled`            | If `true`, create a ServiceMonitor for deployment                                                                     | `false`                                   |
-| `serviceMonitor.namespace`          | The namespace where Prometheus expects to find service monitors                                                       | `nil`                                     |
-| `serviceMonitor.interval`           | The scrape interval. If not set, the Prometheus default scrape interval is used                                       | `nil`                                     |
-| `serviceMonitor.honorLabels`        | Keeps the scraped data's labels when labels are on collisions with target labels.                                     | `true`                                    |
-| `serviceMonitor.insecureSkipVerify` | Skip TLS certificate validation when scraping                                                                         | `true`                                    |
-| `serviceMonitor.serverName`         | Name of the server to use when validating TLS certificate                                                             | `nil`                                     |
-| `serviceMonitor.metricRelabelings`  | MetricRelabelConfigs to apply to samples after scraping, but before ingestion                                         | `[]`                                      |
-| `serviceMonitor.relabelings`        | RelabelConfigs to apply to samples before scraping                                                                    | `[]`                                      |
-| `affinity`                          | Node affinity to run the descheduler cronjob/deployment on specific nodes                                             | `nil`                                     |
-| `tolerations`                       | tolerations to run the descheduler cronjob/deployment on specific nodes                                               | `nil`                                     |
-| `suspend`                           | Set spec.suspend in descheduler cronjob                                                                               | `false`                                   |
-| `commonLabels`                      | Labels to apply to all resources                                                                                      | `{}`                                      |
-| `livenessProbe`                     | Liveness probe configuration for the descheduler container                                                            | _see values.yaml_                         |
+| Parameter                           | Description                                                                                                           | Default                              |
+|-------------------------------------|-----------------------------------------------------------------------------------------------------------------------|--------------------------------------|
+| `kind`                              | Use as CronJob or Deployment                                                                                          | `CronJob`                            |
+| `image.repository`                  | Docker repository to use                                                                                              | `k8s.gcr.io/descheduler/descheduler` |
+| `image.tag`                         | Docker tag to use                                                                                                     | `v[chart appVersion]`                |
+| `image.pullPolicy`                  | Docker image pull policy                                                                                              | `IfNotPresent`                       |
+| `imagePullSecrets`                  | Docker repository secrets                                                                                             | `[]`                                 |
+| `nameOverride`                      | String to partially override `descheduler.fullname` template (will prepend the release name)                          | `""`                                 |
+| `fullnameOverride`                  | String to fully override `descheduler.fullname` template                                                              | `""`                                 |
+| `cronJobApiVersion`                 | CronJob API Group Version                                                                                             | `"batch/v1"`                         |
+| `schedule`                          | The cron schedule to run the _descheduler_ job on                                                                     | `"*/2 * * * *"`                      |
+| `startingDeadlineSeconds`           | If set, configure `startingDeadlineSeconds` for the _descheduler_ job                                                 | `nil`                                |
+| `successfulJobsHistoryLimit`        | If set, configure `successfulJobsHistoryLimit` for the _descheduler_ job                                              | `nil`                                |
+| `failedJobsHistoryLimit`            | If set, configure `failedJobsHistoryLimit` for the _descheduler_ job                                                  | `nil`                                |
+| `deschedulingInterval`              | If using kind:Deployment, sets time between consecutive descheduler executions.                                       | `5m`                                 |
+| `replicas`                          | The replica count for Deployment                                                                                      | `1`                                  |
+| `leaderElection`                    | The options for high availability when running replicated components                                                  | _see values.yaml_                    |
+| `cmdOptions`                        | The options to pass to the _descheduler_ command                                                                      | _see values.yaml_                    |
+| `deschedulerPolicy.strategies`      | The _descheduler_ strategies to apply                                                                                 | _see values.yaml_                    |
+| `priorityClassName`                 | The name of the priority class to add to pods                                                                         | `system-cluster-critical`            |
+| `rbac.create`                       | If `true`, create & use RBAC resources                                                                                | `true`                               |
+| `podSecurityPolicy.create`          | If `true`, create PodSecurityPolicy                                                                                   | `true`                               |
+| `resources`                         | Descheduler container CPU and memory requests/limits                                                                  | _see values.yaml_                    |
+| `serviceAccount.create`             | If `true`, create a service account for the cron job                                                                  | `true`                               |
+| `serviceAccount.name`               | The name of the service account to use, if not set and create is true a name is generated using the fullname template | `nil`                                |
+| `serviceAccount.annotations`        | Specifies custom annotations for the serviceAccount                                                                   | `{}`                                 |
+| `podAnnotations`                    | Annotations to add to the descheduler Pods                                                                            | `{}`                                 |
+| `podLabels`                         | Labels to add to the descheduler Pods                                                                                 | `{}`                                 |
+| `nodeSelector`                      | Node selectors to run the descheduler cronjob/deployment on specific nodes                                            | `nil`                                |
+| `service.enabled`                   | If `true`, create a service for deployment                                                                            | `false`                              |
+| `serviceMonitor.enabled`            | If `true`, create a ServiceMonitor for deployment                                                                     | `false`                              |
+| `serviceMonitor.namespace`          | The namespace where Prometheus expects to find service monitors                                                       | `nil`                                |
+| `serviceMonitor.interval`           | The scrape interval. If not set, the Prometheus default scrape interval is used                                       | `nil`                                |
+| `serviceMonitor.honorLabels`        | Keeps the scraped data's labels when labels are on collisions with target labels.                                     | `true`                               |
+| `serviceMonitor.insecureSkipVerify` | Skip TLS certificate validation when scraping                                                                         | `true`                               |
+| `serviceMonitor.serverName`         | Name of the server to use when validating TLS certificate                                                             | `nil`                                |
+| `serviceMonitor.metricRelabelings`  | MetricRelabelConfigs to apply to samples after scraping, but before ingestion                                         | `[]`                                 |
+| `serviceMonitor.relabelings`        | RelabelConfigs to apply to samples before scraping                                                                    | `[]`                                 |
+| `affinity`                          | Node affinity to run the descheduler cronjob/deployment on specific nodes                                             | `nil`                                |
+| `tolerations`                       | tolerations to run the descheduler cronjob/deployment on specific nodes                                               | `nil`                                |
+| `suspend`                           | Set spec.suspend in descheduler cronjob                                                                               | `false`                              |
+| `commonLabels`                      | Labels to apply to all resources                                                                                      | `{}`                                 |
+| `livenessProbe`                     | Liveness probe configuration for the descheduler container                                                            | _see values.yaml_                    |

charts/descheduler/templates/NOTES.txt

@@ -4,9 +4,4 @@ Descheduler installed as a {{ .Values.kind }}.
 {{- if eq .Values.replicas 1.0}}
 WARNING: You set replica count as 1 and workload kind as Deployment however leaderElection is not enabled. Consider enabling Leader Election for HA mode.
 {{- end}}
-{{- if .Values.leaderElection }}
-{{- if and (hasKey .Values.cmdOptions "dry-run") (eq (get .Values.cmdOptions "dry-run") true) }}
-WARNING: You enabled DryRun mode, you can't use Leader Election.
-{{- end}}
-{{- end}}
 {{- end}}

charts/descheduler/templates/clusterrole.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
 rules:
-- apiGroups: ["events.k8s.io"]
+- apiGroups: [""]
   resources: ["events"]
   verbs: ["create", "update"]
 - apiGroups: [""]
@@ -30,7 +30,14 @@ rules:
   verbs: ["create", "update"]
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
-  resourceNames: ["{{ .Values.leaderElection.resourceName | default "descheduler" }}"]
+  resourceNames: ["descheduler"]
   verbs: ["get", "patch", "delete"]
 {{- end }}
+{{- if .Values.podSecurityPolicy.create }}
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ template "descheduler.fullname" . }}
+{{- end }}
 {{- end -}}

charts/descheduler/templates/cronjob.yaml

@@ -23,9 +23,6 @@ spec:
   {{- end }}
   jobTemplate:
     spec:
-      {{- if .Values.ttlSecondsAfterFinished }}
-      ttlSecondsAfterFinished: {{ .Values.ttlSecondsAfterFinished }}
-      {{- end }}
       template:
         metadata:
           name: {{ template "descheduler.fullname" . }}

charts/descheduler/templates/podsecuritypolicy.yaml

@@ -0,0 +1,39 @@
+{{- if .Values.podSecurityPolicy.create -}}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "descheduler.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default'
+    seccomp.security.alpha.kubernetes.io/defaultProfileName:  'runtime/default'
+spec:
+  privileged: false
+  allowPrivilegeEscalation: false
+  requiredDropCapabilities:
+    - ALL
+  volumes:
+    - 'configMap'
+    - 'secret'
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: true
+{{- end -}}

charts/descheduler/templates/tests/test-descheduler-pod.yaml

@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: Pod
+metadata:
+    name: descheduler-test-pod
+    namespace: {{ .Release.Namespace }}
+    annotations:
+      "helm.sh/hook": test
+spec:
+    restartPolicy: Never
+    serviceAccountName: descheduler-ci
+    containers:
+      - name: descheduler-test-container
+        image: alpine:latest
+        imagePullPolicy: IfNotPresent
+        securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - All
+            privileged: false
+            runAsNonRoot: false 
+        command: ["/bin/ash"]
+        args:
+          - -c
+          - >-
+            apk --no-cache add curl &&
+            curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl &&
+            chmod +x ./kubectl &&
+            mv ./kubectl /usr/local/bin/kubectl &&
+            /usr/local/bin/kubectl get pods --namespace {{ .Release.Namespace }} --token "$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" | grep "descheduler" | grep "Completed"

charts/descheduler/values.yaml

@@ -6,7 +6,7 @@
 kind: CronJob
 
 image:
-  repository: registry.k8s.io/descheduler/descheduler
+  repository: k8s.gcr.io/descheduler/descheduler
   # Overrides the image tag whose default is the chart version
   tag: ""
   pullPolicy: IfNotPresent
@@ -28,13 +28,12 @@ fullnameOverride: ""
 # labels that'll be applied to all resources
 commonLabels: {}
 
-cronJobApiVersion: "batch/v1"
+cronJobApiVersion: "batch/v1"  # Use "batch/v1beta1" for k8s version < 1.21.0. TODO(@7i) remove with 1.23 release
 schedule: "*/2 * * * *"
 suspend: false
-# startingDeadlineSeconds: 200
-# successfulJobsHistoryLimit: 3
-# failedJobsHistoryLimit: 1
-# ttlSecondsAfterFinished 600
+#startingDeadlineSeconds: 200
+#successfulJobsHistoryLimit: 1
+#failedJobsHistoryLimit: 1
 
 # Required when running as a Deployment
 deschedulingInterval: 5m
@@ -47,7 +46,6 @@ replicas: 1
 
 # Specifies whether Leader Election resources should be created
 # Required when running as a Deployment
-# NOTE: Leader election can't be activated if DryRun enabled
 leaderElection: {}
 #  enabled: true
 #  leaseDuration: 15s
@@ -69,12 +67,6 @@ deschedulerPolicy:
   strategies:
     RemoveDuplicates:
       enabled: true
-    RemovePodsHavingTooManyRestarts:
-      enabled: true
-      params:
-        podsHavingTooManyRestarts:
-          podRestartThreshold: 100
-          includingInitContainers: true
     RemovePodsViolatingNodeTaints:
       enabled: true
     RemovePodsViolatingNodeAffinity:
@@ -84,10 +76,6 @@ deschedulerPolicy:
         - requiredDuringSchedulingIgnoredDuringExecution
     RemovePodsViolatingInterPodAntiAffinity:
       enabled: true
-    RemovePodsViolatingTopologySpreadConstraint:
-      enabled: true
-      params:
-        includeSoftConstraints: false
     LowNodeUtilization:
       enabled: true
       params:
@@ -135,6 +123,10 @@ rbac:
   # Specifies whether RBAC resources should be created
   create: true
 
+podSecurityPolicy:
+  # Specifies whether PodSecurityPolicy should be created.
+  create: true
+
 serviceAccount:
   # Specifies whether a ServiceAccount should be created
   create: true

cloudbuild.yaml

@@ -1,7 +1,7 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 
 # this must be specified in seconds. If omitted, defaults to 600s (10 mins)
-timeout: 3600s
+timeout: 1200s
 # this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
 # or any new substitutions added in the future.
 options:

cmd/descheduler/app/options/options.go

@@ -18,8 +18,6 @@ limitations under the License.
 package options
 
 import (
-	"time"
-
 	"github.com/spf13/pflag"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apiserveroptions "k8s.io/apiserver/pkg/server/options"
@@ -29,6 +27,7 @@ import (
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig/v1alpha1"
 	deschedulerscheme "sigs.k8s.io/descheduler/pkg/descheduler/scheme"
+	"time"
 )
 
 const (
@@ -40,7 +39,6 @@ type DeschedulerServer struct {
 	componentconfig.DeschedulerConfiguration
 
 	Client         clientset.Interface
-	EventClient    clientset.Interface
 	SecureServing  *apiserveroptions.SecureServingOptionsWithLoopback
 	DisableMetrics bool
 }
@@ -83,7 +81,7 @@ func newDefaultComponentConfig() (*componentconfig.DeschedulerConfiguration, err
 
 // AddFlags adds flags for a specific SchedulerServer to the specified FlagSet
 func (rs *DeschedulerServer) AddFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&rs.Logging.Format, "logging-format", "text", `Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log_dir, --log_file, --log_file_max_size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning.`)
+	fs.StringVar(&rs.Logging.Format, "logging-format", "text", `Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log-dir, --log-file, --log-file-max-size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning.`)
 	fs.DurationVar(&rs.DeschedulingInterval, "descheduling-interval", rs.DeschedulingInterval, "Time interval between two consecutive descheduler executions. Setting this value instructs the descheduler to run in a continuous loop at the interval specified.")
 	fs.StringVar(&rs.KubeconfigFile, "kubeconfig", rs.KubeconfigFile, "File with  kube configuration.")
 	fs.StringVar(&rs.PolicyConfigFile, "policy-config-file", rs.PolicyConfigFile, "File with descheduler policy configuration.")

cmd/descheduler/app/server.go

@@ -20,7 +20,6 @@ package app
 import (
 	"context"
 	"io"
-	"os"
 	"os/signal"
 	"syscall"
 
@@ -34,9 +33,9 @@ import (
 	apiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/mux"
 	restclient "k8s.io/client-go/rest"
-	registry "k8s.io/component-base/logs/api/v1"
-	jsonLog "k8s.io/component-base/logs/json"
+	"k8s.io/component-base/config"
 	_ "k8s.io/component-base/logs/json/register"
+	"k8s.io/component-base/logs/registry"
 	"k8s.io/component-base/metrics/legacyregistry"
 	"k8s.io/klog/v2"
 )
@@ -44,6 +43,7 @@ import (
 // NewDeschedulerCommand creates a *cobra.Command object with default parameters
 func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 	s, err := options.NewDeschedulerServer()
+
 	if err != nil {
 		klog.ErrorS(err, "unable to initialize server")
 	}
@@ -62,19 +62,12 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 				klog.ErrorS(err, "failed to apply secure server configuration")
 				return
 			}
-			var factory registry.LogFormatFactory
-
-			if s.Logging.Format == "json" {
-				factory = jsonLog.Factory{}
-			}
 
+			factory, _ := registry.LogRegistry.Get(s.Logging.Format)
 			if factory == nil {
 				klog.ClearLogger()
 			} else {
-				log, logrFlush := factory.Create(registry.LoggingConfiguration{
-					Format:    s.Logging.Format,
-					Verbosity: s.Logging.Verbosity,
-				})
+				log, logrFlush := factory.Create(config.LoggingConfiguration{})
 				defer logrFlush()
 				klog.SetLogger(log)
 			}
@@ -113,8 +106,3 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 	return descheduler.Run(ctx, rs)
 }
-
-func SetupLogs() {
-	klog.SetOutput(os.Stdout)
-	klog.InitFlags(nil)
-}

cmd/descheduler/app/version.go

@@ -24,7 +24,7 @@ import (
 )
 
 func NewVersionCommand() *cobra.Command {
-	versionCmd := &cobra.Command{
+	var versionCmd = &cobra.Command{
 		Use:   "version",
 		Short: "Version of descheduler",
 		Long:  `Prints the version of descheduler.`,

cmd/descheduler/descheduler.go

@@ -20,13 +20,13 @@ import (
 	"os"
 
 	"k8s.io/component-base/cli"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/descheduler/cmd/descheduler/app"
-	"sigs.k8s.io/descheduler/pkg/descheduler"
 )
 
 func init() {
-	app.SetupLogs()
-	descheduler.SetupPlugins()
+	klog.SetOutput(os.Stdout)
+	klog.InitFlags(nil)
 }
 
 func main() {

docs/contributor-guide.md

@@ -31,7 +31,7 @@ View all CLI options.
 ## Run Tests
 ```
 GOOS=linux make dev-image
-make kind-multi-node
+kind create cluster --config hack/kind_config.yaml
 kind load docker-image <image name>
 kind get kubeconfig > /tmp/admin.conf
 export KUBECONFIG=/tmp/admin.conf
@@ -39,38 +39,17 @@ make test-unit
 make test-e2e
 ```
 
-## Format Code
-
-After making changes in the code base, ensure that the code is formatted correctly:
+## Run Helm Tests
+Run the helm test for a particular descheduler release by setting below variables,
+```
+HELM_IMAGE_REPO="descheduler"
+HELM_IMAGE_TAG="helm-test"
+HELM_CHART_LOCATION="./charts/descheduler"
+```
+The helm tests runs as part of descheduler CI. But, to run it manually from the descheduler root,
 
 ```
-make fmt
-```
-
-## Build Helm Package locally
-
-If you made some changes in the chart, and just want to check if templating is ok, or if the chart is buildable, you can run this command to have a package built from the `./charts` directory.
-
-```
-make build-helm
-```
-
-## Lint Helm Chart locally
-
-To check linting of your changes in the helm chart locally you can run:
-
-```
-make lint-chart
-```
-
-## Test helm changes locally with kind and ct
-
-You will need kind and docker (or equivalent) installed. We can use ct public image to avoid installing ct and all its dependencies.
-
-
-```
-make kind-multi-node
-make ct-helm
+make test-helm
 ```
 
 ### Miscellaneous

docs/release-guide.md

@@ -1,82 +1,36 @@
 # Release Guide
 
-The process for publishing each Descheduler release includes a mixture of manual and automatic steps. Over 
-time, it would be good to automate as much of this process as possible. However, due to current limitations there 
-is care that must be taken to perform each manual step precisely so that the automated steps execute properly.
+## Container Image
 
-## Pre-release Code Changes
+### Semi-automatic
 
-Before publishing each release, the following code updates must be made:
+1. Make sure your repo is clean by git's standards
+2. Create a release branch `git checkout -b release-1.18` (not required for patch releases)
+3. Push the release branch to the descheuler repo and ensure branch protection is enabled (not required for patch releases)
+4. Tag the repository from the `master` branch (from the `release-1.18` branch for a patch release) and push the tag `VERSION=v0.18.0 git tag -m $VERSION $VERSION; git push origin $VERSION`
+5. Publish a draft release using the tag you just created
+6. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io#image-promoter)
+7. Publish release
+8. Email `kubernetes-sig-scheduling@googlegroups.com` to announce the release
 
-- [ ] (Optional, but recommended) Bump `k8s.io` dependencies to the `-rc` tags. These tags are usually published around upstream code freeze. [Example](https://github.com/kubernetes-sigs/descheduler/pull/539)
-- [ ] Bump `k8s.io` dependencies to GA tags once they are published (following the upstream release). [Example](https://github.com/kubernetes-sigs/descheduler/pull/615)
-- [ ] Ensure that Go is updated to the same version as upstream. [Example](https://github.com/kubernetes-sigs/descheduler/pull/801)
-- [ ] Make CI changes in [github.com/kubernetes/test-infra](https://github.com/kubernetes/test-infra) to add the new version's tests (note, this may also include a Go bump). [Example](https://github.com/kubernetes/test-infra/pull/25833)
-- [ ] Update local CI versions for utils (such as golang-ci), kind, and go. [Example - e2e](https://github.com/kubernetes-sigs/descheduler/commit/ac4d576df8831c0c399ee8fff1e85469e90b8c44), [Example - helm](https://github.com/kubernetes-sigs/descheduler/pull/821)
-- [ ] Update version references in docs and Readme. [Example](https://github.com/kubernetes-sigs/descheduler/pull/617)
+### Manual
 
-## Release Process
+1. Make sure your repo is clean by git's standards
+2. Create a release branch `git checkout -b release-1.18` (not required for patch releases)
+3. Push the release branch to the descheuler repo and ensure branch protection is enabled (not required for patch releases)
+4. Tag the repository from the `master` branch (from the `release-1.18` branch for a patch release) and push the tag `VERSION=v0.18.0 git tag -m $VERSION $VERSION; git push origin $VERSION`
+5. Checkout the tag you just created and make sure your repo is clean by git's standards `git checkout $VERSION`
+6. Build and push the container image to the staging registry `VERSION=$VERSION make push-all`
+7. Publish a draft release using the tag you just created
+8. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io#image-promoter)
+9. Publish release
+10. Email `kubernetes-sig-scheduling@googlegroups.com` to announce the release
 
-When the above pre-release steps are complete and the release is ready to be cut, perform the following steps **in order** 
-(the flowchart below demonstrates these steps):
-
-**Version release**
-1. Create the `git tag` on `master` for the release, eg `v0.24.0`
-2. Merge Helm chart version update to `master` (see [Helm chart](#helm-chart) below). [Example](https://github.com/kubernetes-sigs/descheduler/pull/709)
-3. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io#image-promoter). [Example](https://github.com/kubernetes/k8s.io/pull/3344)
-4. Cut release branch from `master`, eg `release-1.24`
-5. Publish release using Github's release process from the git tag you created
-6. Email `kubernetes-sig-scheduling@googlegroups.com` to announce the release
-
-**Patch release**
-1. Pick relevant code change commits to the matching release branch, eg `release-1.24`
-2. Create the patch tag on the release branch, eg `v0.24.1` on `release-1.24`
-3. Merge Helm chart version update to release branch
-4. Perform the image promotion process for the patch version
-5. Publish release using Github's release process from the git tag you created
-6. Email `kubernetes-sig-scheduling@googlegroups.com` to announce the release
-
-### Flowchart
-
-![Flowchart for major and patch releases](release-process.png)
-
-### Image promotion process
-
-Every merge to any branch triggers an [image build and push](https://github.com/kubernetes/test-infra/blob/c36b8e5/config/jobs/image-pushing/k8s-staging-descheduler.yaml) to a `gcr.io` repository. 
-These automated image builds are snapshots of the code in place at the time of every PR merge and 
-tagged with the latest git SHA at the time of the build. To create a final release image, the desired 
-auto-built image SHA is added to a [file upstream](https://github.com/kubernetes/k8s.io/blob/e9e971c/k8s.gcr.io/images/k8s-staging-descheduler/images.yaml) which 
-copies that image to a public registry.
-
-Automatic builds can be monitored and re-triggered with the [`post-descheduler-push-images` job](https://prow.k8s.io/?job=post-descheduler-push-images) on prow.k8s.io.
-
-Note that images can also be manually built and pushed using `VERSION=$VERSION make push-all` by [users with access](https://github.com/kubernetes/k8s.io/blob/fbee8f67b70304241e613a672c625ad972998ad7/groups/sig-scheduling/groups.yaml#L33-L43).
-
-## Helm Chart
-We currently use the [chart-releaser-action GitHub Action](https://github.com/helm/chart-releaser-action) to automatically 
-publish [Helm chart releases](https://github.com/kubernetes-sigs/descheduler/blob/022e07c/.github/workflows/release.yaml). 
-This action is triggered when it detects any changes to [`Chart.yaml`](https://github.com/kubernetes-sigs/descheduler/blob/022e07c27853fade6d1304adc0a6ebe02642386c/charts/descheduler/Chart.yaml) on 
-a `release-*` branch.
-
-Helm chart releases are managed by a separate set of git tags that are prefixed with `descheduler-helm-chart-*`. Example git tag name is `descheduler-helm-chart-0.18.0`.
-Released versions of the helm charts are stored in the `gh-pages` branch of this repo.
-
-The major and minor version of the chart matches the descheduler major and minor versions. For example descheduler helm chart version helm-descheduler-chart-0.18.0 corresponds
-to descheduler version v0.18.0. The patch version of the descheduler helm chart and the patcher version of the descheduler will not necessarily match. The patch
-version of the descheduler helm chart is used to version changes specific to the helm chart.
-
-1. Merge all helm chart changes into the master branch before the release is tagged/cut
-   1. Ensure that `appVersion` in file `charts/descheduler/Chart.yaml` matches the descheduler version(no `v` prefix)
-   2. Ensure that `version` in file `charts/descheduler/Chart.yaml` has been incremented. This is the chart version.
-2. Make sure your repo is clean by git's standards
-3. Follow the release-branch or patch release tagging pattern from the above section.
-4. Verify the new helm artifact has been successfully pushed to the `gh-pages` branch
-
-## Notes
-The Helm releaser-action compares the changes in the action-triggering branch to the latest tag on that branch, so if you tag before creating the new branch there
-will be nothing to compare and it will fail. This is why it's necessary to tag, eg, `v0.24.0` *before* making the changes to the 
-Helm chart version, so that there is a new diff for the action to find. (Tagging *after* making the Helm chart changes would 
-also work, but then the code that gets built into the promoted image will be tagged as `descheduler-helm-chart-xxx` rather than `v0.xx.0`).
+### Notes
+It's important to create the tag on the master branch after creating the release-* branch so that the [Helm releaser-action](#helm-chart) can work.
+It compares the changes in the action-triggering branch to the latest tag on that branch, so if you tag before creating the new branch there
+will be nothing to compare and it will fail (creating a new release branch usually involves no code changes). For this same reason, you should
+also tag patch releases (on the release-* branch) *after* pushing changes (if those changes involve bumping the Helm chart version).
 
 See [post-descheduler-push-images dashboard](https://testgrid.k8s.io/sig-scheduling#post-descheduler-push-images) for staging registry image build job status.
 
@@ -102,3 +56,19 @@ Pull image from the staging registry.
 ```
 docker pull gcr.io/k8s-staging-descheduler/descheduler:v20200206-0.9.0-94-ge2a23f284
 ```
+
+## Helm Chart
+Helm chart releases are managed by a separate set of git tags that are prefixed with `descheduler-helm-chart-*`. Example git tag name is `descheduler-helm-chart-0.18.0`.
+Released versions of the helm charts are stored in the `gh-pages` branch of this repo. The [chart-releaser-action GitHub Action](https://github.com/helm/chart-releaser-action)
+is setup to build and push the helm charts to the `gh-pages` branch when changes are pushed to a `release-*` branch.
+
+The major and minor version of the chart matches the descheduler major and minor versions. For example descheduler helm chart version helm-descheduler-chart-0.18.0 corresponds
+to descheduler version v0.18.0. The patch version of the descheduler helm chart and the patcher version of the descheduler will not necessarily match. The patch
+version of the descheduler helm chart is used to version changes specific to the helm chart.
+
+1. Merge all helm chart changes into the master branch before the release is tagged/cut
+   1. Ensure that `appVersion` in file `charts/descheduler/Chart.yaml` matches the descheduler version(no `v` prefix)
+   2. Ensure that `version` in file `charts/descheduler/Chart.yaml` has been incremented. This is the chart version.
+2. Make sure your repo is clean by git's standards
+3. Follow the release-branch or patch release tagging pattern from the above section.
+4. Verify the new helm artifact has been successfully pushed to the `gh-pages` branch

docs/user-guide.md

@@ -2,27 +2,25 @@
 
 Starting with descheduler release v0.10.0 container images are available in the official k8s container registry.
 
-Descheduler Version | Container Image                                 | Architectures           |
-------------------- |-------------------------------------------------|-------------------------|
-v0.25.1             | registry.k8s.io/descheduler/descheduler:v0.25.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.25.0             | registry.k8s.io/descheduler/descheduler:v0.25.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.24.1             | registry.k8s.io/descheduler/descheduler:v0.24.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.24.0             | registry.k8s.io/descheduler/descheduler:v0.24.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.23.1             | registry.k8s.io/descheduler/descheduler:v0.23.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.22.0             | registry.k8s.io/descheduler/descheduler:v0.22.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.21.0             | registry.k8s.io/descheduler/descheduler:v0.21.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.20.0             | registry.k8s.io/descheduler/descheduler:v0.20.0 | AMD64<br>ARM64          |
-v0.19.0             | registry.k8s.io/descheduler/descheduler:v0.19.0 | AMD64                   |
-v0.18.0             | registry.k8s.io/descheduler/descheduler:v0.18.0 | AMD64                   |
-v0.10.0             | registry.k8s.io/descheduler/descheduler:v0.10.0 | AMD64                   |
+Descheduler Version | Container Image                            | Architectures           |
+------------------- |--------------------------------------------|-------------------------|
+v0.24.1             | k8s.gcr.io/descheduler/descheduler:v0.24.0 | AMD64<br>ARM64<br>ARMv7 |
+v0.24.0             | k8s.gcr.io/descheduler/descheduler:v0.24.0 | AMD64<br>ARM64<br>ARMv7 |
+v0.23.1             | k8s.gcr.io/descheduler/descheduler:v0.23.1 | AMD64<br>ARM64<br>ARMv7 |
+v0.22.0             | k8s.gcr.io/descheduler/descheduler:v0.22.0 | AMD64<br>ARM64<br>ARMv7 |
+v0.21.0             | k8s.gcr.io/descheduler/descheduler:v0.21.0 | AMD64<br>ARM64<br>ARMv7 |
+v0.20.0             | k8s.gcr.io/descheduler/descheduler:v0.20.0 | AMD64<br>ARM64          |
+v0.19.0             | k8s.gcr.io/descheduler/descheduler:v0.19.0 | AMD64                   |
+v0.18.0             | k8s.gcr.io/descheduler/descheduler:v0.18.0 | AMD64                   |
+v0.10.0             | k8s.gcr.io/descheduler/descheduler:v0.10.0 | AMD64                   |
 
 Note that multi-arch container images cannot be pulled by [kind](https://kind.sigs.k8s.io) from a registry. Therefore
 starting with descheduler release v0.20.0 use the below process to download the official descheduler
 image into a kind cluster.
 ```
 kind create cluster
-docker pull registry.k8s.io/descheduler/descheduler:v0.20.0
-kind load docker-image registry.k8s.io/descheduler/descheduler:v0.20.0
+docker pull k8s.gcr.io/descheduler/descheduler:v0.20.0
+kind load docker-image k8s.gcr.io/descheduler/descheduler:v0.20.0
 ```
 
 ## Policy Configuration Examples
@@ -62,11 +60,11 @@ Flags:
       --leader-elect-resource-namespace string   The namespace of resource object that is used for locking during leader election. (default "kube-system")
       --leader-elect-retry-period duration       The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s)
       --log-backtrace-at traceLocation           when logging hits line file:N, emit a stack trace (default :0) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
-      --log_dir string                           If non-empty, write log files in this directory (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
-      --log_file string                          If non-empty, use this log file (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
-      --log_file_max_size uint                   Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log-dir string                           If non-empty, write log files in this directory (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log-file string                          If non-empty, use this log file (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log-file-max-size uint                   Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
       --log-flush-frequency duration             Maximum number of seconds between log flushes (default 5s)
-      --logging-format string                    Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log_dir, --log_file, --log_file_max_size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning. (default "text")
+      --logging-format string                    Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log-dir, --log-file, --log-file-max-size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning. (default "text")
       --logtostderr                              log to standard error instead of files (default true) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
       --one-output                               If true, only write logs to their native severity level (vs also writing to each lower severity level) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
       --permit-address-sharing                   If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false]
@@ -160,7 +158,6 @@ strategies:
 ```
 
 ### Autoheal Node Problems
-
 Descheduler's `RemovePodsViolatingNodeTaints` strategy can be combined with
 [Node Problem Detector](https://github.com/kubernetes/node-problem-detector/) and
 [Cluster Autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler) to automatically remove
@@ -169,7 +166,6 @@ There is a feature called TaintNodeByCondition of the node controller that takes
 The Descheduler will then deschedule workloads from those Nodes. Finally, if the descheduled Node's resource
 allocation falls below the Cluster Autoscaler's scale down threshold, the Node will become a scale down candidate
 and can be removed by Cluster Autoscaler. These three components form an autohealing cycle for Node problems.
-
 ---
 **NOTE**
 

examples/pod-life-time.yml

@@ -6,6 +6,3 @@ strategies:
     params:
       podLifeTime:
         maxPodLifeTimeSeconds: 604800 # 7 days
-        states:
-        - "Pending"
-        - "PodInitializing"

examples/topology-spread-constraint.yaml

@@ -4,5 +4,4 @@ strategies:
   "RemovePodsViolatingTopologySpreadConstraint":
      enabled: true
      params:
-       nodeFit: true
        includeSoftConstraints: true # Include 'ScheduleAnyways' constraints

go.mod

@@ -1,110 +1,117 @@
 module sigs.k8s.io/descheduler
 
-go 1.19
+go 1.18
 
 require (
 	github.com/client9/misspell v0.3.4
-	github.com/google/go-cmp v0.5.9
-	github.com/spf13/cobra v1.6.0
+	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
-	k8s.io/api v0.26.0
-	k8s.io/apimachinery v0.26.0
-	k8s.io/apiserver v0.26.0
-	k8s.io/client-go v0.26.0
-	k8s.io/code-generator v0.26.0
-	k8s.io/component-base v0.26.0
-	k8s.io/component-helpers v0.26.0
-	k8s.io/klog/v2 v2.80.1
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
+	k8s.io/api v0.24.0
+	k8s.io/apimachinery v0.24.0
+	k8s.io/apiserver v0.24.0
+	k8s.io/client-go v0.24.0
+	k8s.io/code-generator v0.24.0
+	k8s.io/component-base v0.24.0
+	k8s.io/component-helpers v0.24.0
+	k8s.io/klog/v2 v2.60.1
+	k8s.io/kubectl v0.20.5
 	sigs.k8s.io/mdtoc v1.0.1
 )
 
 require (
+	cloud.google.com/go v0.81.0 // indirect
+	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+	github.com/Azure/go-autorest/logger v0.2.1 // indirect
+	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-logr/zapr v1.2.3 // indirect
+	github.com/felixge/httpsnoop v1.0.1 // indirect
+	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/go-logr/zapr v1.2.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 // indirect
-	github.com/google/cel-go v0.12.5 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/imdario/mergo v0.3.5 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/stoewer/go-strcase v1.2.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
-	go.opentelemetry.io/otel v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
-	go.opentelemetry.io/otel/metric v0.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.10.0 // indirect
-	go.opentelemetry.io/otel/trace v1.10.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.1 // indirect
+	go.opentelemetry.io/contrib v0.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
+	go.opentelemetry.io/otel v0.20.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
+	go.opentelemetry.io/otel/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
+	go.opentelemetry.io/otel/trace v0.20.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/term v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
-	google.golang.org/grpc v1.49.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
+	google.golang.org/grpc v1.40.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kms v0.26.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
+	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )

hack/lib/generator-help.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Utility command based on 'find' command. The pipeline is as following:
-#   1. find all the go files; (exclude specific path: vendor etc)
-#   2. find all the files containing specific tags in contents;
-#   3. extract related dirs;
-#   4. remove duplicated paths;
-#   5. merge all dirs in array with delimiter ,;
-#
-# Example:
-#   find_dirs_containing_comment_tags("+k8s:")
-# Return:
-#   sigs.k8s.io/descheduler/a,sigs.k8s.io/descheduler/b,sigs.k8s.io/descheduler/c
-function find_dirs_containing_comment_tags() {
-   array=()
-   while IFS='' read -r line; do array+=("$line"); done < <( \
-     find . -type f -name \*.go -not -path "./vendor/*" -not -path "./_tmp/*" -print0  \
-     | xargs -0 grep --color=never -l "$@" \
-     | xargs -n1 dirname \
-     | LC_ALL=C sort -u \
-     )
-
-   IFS=",";
-   printf '%s' "${array[*]}";
-}

hack/update-generated-conversions.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
-source "$(dirname "${BASH_SOURCE}")/lib/generator-help.sh"
 
 go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/conversion-gen"
 
 ${OS_OUTPUT_BINPATH}/conversion-gen \
 		--go-header-file "hack/boilerplate/boilerplate.go.txt" \
-		--input-dirs "$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")" \
+		--input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
 		--output-file-base zz_generated.conversion

hack/update-generated-deep-copies.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
-source "$(dirname "${BASH_SOURCE}")/lib/generator-help.sh"
 
 go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepcopy-gen"
 
 ${OS_OUTPUT_BINPATH}/deepcopy-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")" \
+                --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig,${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api,${PRJ_PREFIX}/pkg/api/v1alpha1" \
                 --output-file-base zz_generated.deepcopy
 

hack/update-generated-defaulters.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
-source "$(dirname "${BASH_SOURCE}")/lib/generator-help.sh"
 
 go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defaulter-gen"
 
 ${OS_OUTPUT_BINPATH}/defaulter-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")" \
+                --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
 		--extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
                 --output-file-base zz_generated.defaults

hack/update-gofmt.sh

@@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 GO_VERSION=($(go version))
 
-if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.17|go1.18|go1.19') ]]; then
+if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.17|go1.18') ]]; then
   echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
   exit 1
 fi

hack/verify-chart.sh

@@ -1 +0,0 @@
-${CONTAINER_ENGINE:-docker} run -it --rm --network host --workdir=/data --volume ~/.kube/config:/root/.kube/config:ro --volume $(pwd):/data quay.io/helmpack/chart-testing:v3.7.0 /bin/bash -c "git config --global --add safe.directory /data; ct install --config=.github/ci/ct.yaml --helm-extra-set-args=\"--set=kind=Deployment\""

hack/verify-conversions.sh

@@ -16,7 +16,12 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des
 _deschedulertmp="${_deschedulertmp}/descheduler"
 
 pushd "${_deschedulertmp}" > /dev/null 2>&1
-./hack/update-generated-conversions.sh
+go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/conversion-gen"
+
+${OS_OUTPUT_BINPATH}/conversion-gen \
+		--go-header-file "hack/boilerplate/boilerplate.go.txt" \
+		--input-dirs "./pkg/apis/componentconfig/v1alpha1,./pkg/api/v1alpha1" \
+		--output-file-base zz_generated.conversion
 popd > /dev/null 2>&1
 
 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1

hack/verify-deep-copies.sh

@@ -16,7 +16,12 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des
 _deschedulertmp="${_deschedulertmp}/descheduler"
 
 pushd "${_deschedulertmp}" > /dev/null 2>&1
-./hack/update-generated-deep-copies.sh
+go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepcopy-gen"
+
+${OS_OUTPUT_BINPATH}/deepcopy-gen \
+                --go-header-file "hack/boilerplate/boilerplate.go.txt" \
+                --input-dirs "./pkg/apis/componentconfig,./pkg/apis/componentconfig/v1alpha1,./pkg/api,./pkg/api/v1alpha1" \
+                --output-file-base zz_generated.deepcopy
 popd > /dev/null 2>&1
 
 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1

hack/verify-defaulters.sh

@@ -15,7 +15,13 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des
 _deschedulertmp="${_deschedulertmp}/descheduler"
 
 pushd "${_deschedulertmp}" > /dev/null 2>&1
-./hack/update-generated-defaulters.sh
+go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defaulter-gen"
+
+${OS_OUTPUT_BINPATH}/defaulter-gen \
+            --go-header-file "hack/boilerplate/boilerplate.go.txt" \
+            --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
+            --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
+            --output-file-base zz_generated.defaults
 popd > /dev/null 2>&1
 
 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1

hack/verify-gofmt.sh

@@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 GO_VERSION=($(go version))
 
-if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.17|go1.18|go1.19') ]]; then
+if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.17|go1.18') ]]; then
   echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
   exit 1
 fi

kubernetes/base/rbac.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: descheduler-cluster-role
 rules:
-- apiGroups: ["events.k8s.io"]
+- apiGroups: [""]
   resources: ["events"]
   verbs: ["create", "update"]
 - apiGroups: [""]

kubernetes/cronjob/cronjob.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: batch/v1
+apiVersion: batch/v1  # for k8s version < 1.21.0, use batch/v1beta1
 kind: CronJob
 metadata:
   name: descheduler-cronjob
@@ -16,7 +16,7 @@ spec:
           priorityClassName: system-cluster-critical
           containers:
           - name: descheduler
-            image: registry.k8s.io/descheduler/descheduler:v0.25.1
+            image: k8s.gcr.io/descheduler/descheduler:v0.24.1
             volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume

kubernetes/deployment/deployment.yaml

@@ -19,7 +19,7 @@ spec:
       serviceAccountName: descheduler-sa
       containers:
         - name: descheduler
-          image: registry.k8s.io/descheduler/descheduler:v0.25.1
+          image: k8s.gcr.io/descheduler/descheduler:v0.24.1
           imagePullPolicy: IfNotPresent
           command:
             - "/bin/descheduler"

kubernetes/job/job.yaml

@@ -14,7 +14,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: descheduler
-          image: registry.k8s.io/descheduler/descheduler:v0.25.1
+          image: k8s.gcr.io/descheduler/descheduler:v0.24.1
           volumeMounts:
           - mountPath: /policy-dir
             name: policy-volume

metrics/metrics.go

@@ -43,7 +43,7 @@ var (
 			Subsystem:      DeschedulerSubsystem,
 			Name:           "build_info",
 			Help:           "Build info about descheduler, including Go version, Descheduler version, Git SHA, Git branch",
-			ConstLabels:    map[string]string{"GoVersion": version.Get().GoVersion, "AppVersion": version.Get().Major + "." + version.Get().Minor, "DeschedulerVersion": version.Get().GitVersion, "GitBranch": version.Get().GitBranch, "GitSha1": version.Get().GitSha1},
+			ConstLabels:    map[string]string{"GoVersion": version.Get().GoVersion, "DeschedulerVersion": version.Get().GitVersion, "GitBranch": version.Get().GitBranch, "GitSha1": version.Get().GitSha1},
 			StabilityLevel: metrics.ALPHA,
 		},
 	)

pkg/api/sort.go

@@ -1,23 +0,0 @@
-/*
-Copyright 2017 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 api
-
-import "sort"
-
-func SortProfilesByName(profiles []Profile) []Profile {
-	sort.Slice(profiles, func(i, j int) bool {
-		return profiles[i].Name < profiles[j].Name
-	})
-	return profiles
-}

pkg/api/types.go

@@ -19,7 +19,6 @@ package api
 import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -27,12 +26,24 @@ import (
 type DeschedulerPolicy struct {
 	metav1.TypeMeta
 
-	// Profiles
-	Profiles []Profile
+	// Strategies
+	Strategies StrategyList
 
 	// NodeSelector for a set of nodes to operate over
 	NodeSelector *string
 
+	// EvictFailedBarePods allows pods without ownerReferences and in failed phase to be evicted.
+	EvictFailedBarePods *bool
+
+	// EvictLocalStoragePods allows pods using local storage to be evicted.
+	EvictLocalStoragePods *bool
+
+	// EvictSystemCriticalPods allows eviction of pods of any priority (including Kubernetes system pods)
+	EvictSystemCriticalPods *bool
+
+	// IgnorePVCPods prevents pods with PVCs from being evicted.
+	IgnorePVCPods *bool
+
 	// MaxNoOfPodsToEvictPerNode restricts maximum of pods to be evicted per node.
 	MaxNoOfPodsToEvictPerNode *uint
 
@@ -40,6 +51,20 @@ type DeschedulerPolicy struct {
 	MaxNoOfPodsToEvictPerNamespace *uint
 }
 
+type StrategyName string
+type StrategyList map[StrategyName]DeschedulerStrategy
+
+type DeschedulerStrategy struct {
+	// Enabled or disabled
+	Enabled bool
+
+	// Weight
+	Weight int
+
+	// Strategy parameters
+	Params *StrategyParameters
+}
+
 // Namespaces carries a list of included/excluded namespaces
 // for which a given strategy is applicable
 type Namespaces struct {
@@ -47,38 +72,53 @@ type Namespaces struct {
 	Exclude []string
 }
 
-type (
-	Percentage         float64
-	ResourceThresholds map[v1.ResourceName]Percentage
-)
-
-type PriorityThreshold struct {
-	Value *int32
-	Name  string
+// Besides Namespaces only one of its members may be specified
+// TODO(jchaloup): move Namespaces ThresholdPriority and ThresholdPriorityClassName to individual strategies
+//  once the policy version is bumped to v1alpha2
+type StrategyParameters struct {
+	NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds
+	NodeAffinityType                  []string
+	PodsHavingTooManyRestarts         *PodsHavingTooManyRestarts
+	PodLifeTime                       *PodLifeTime
+	RemoveDuplicates                  *RemoveDuplicates
+	FailedPods                        *FailedPods
+	IncludeSoftConstraints            bool
+	Namespaces                        *Namespaces
+	ThresholdPriority                 *int32
+	ThresholdPriorityClassName        string
+	LabelSelector                     *metav1.LabelSelector
+	NodeFit                           bool
+	IncludePreferNoSchedule           bool
+	ExcludedTaints                    []string
 }
 
-type Profile struct {
-	Name          string
-	PluginConfigs []PluginConfig
-	Plugins       Plugins
+type Percentage float64
+type ResourceThresholds map[v1.ResourceName]Percentage
+
+type NodeResourceUtilizationThresholds struct {
+	UseDeviationThresholds bool
+	Thresholds             ResourceThresholds
+	TargetThresholds       ResourceThresholds
+	NumberOfNodes          int
 }
 
-type PluginConfig struct {
-	Name string
-	Args runtime.Object
+type PodsHavingTooManyRestarts struct {
+	PodRestartThreshold     int32
+	IncludingInitContainers bool
 }
 
-type Plugins struct {
-	PreSort           PluginSet
-	Sort              PluginSet
-	Deschedule        PluginSet
-	Balance           PluginSet
-	Evict             PluginSet
-	Filter            PluginSet
-	PreEvictionFilter PluginSet
+type RemoveDuplicates struct {
+	ExcludeOwnerKinds []string
 }
 
-type PluginSet struct {
-	Enabled  []string
-	Disabled []string
+type PodLifeTime struct {
+	MaxPodLifeTimeSeconds *uint
+	PodStatusPhases       []string
+}
+
+type FailedPods struct {
+	ExcludeOwnerKinds       []string
+	MinPodLifetimeSeconds   *uint
+	Reasons                 []string
+	IncludingInitContainers bool
 }

pkg/api/v1alpha1/doc.go

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=sigs.k8s.io/descheduler/pkg/api
 // +k8s:defaulter-gen=TypeMeta
 
 // Package v1alpha1 is the v1alpha1 version of the descheduler API

pkg/api/v1alpha1/register.go

@@ -28,10 +28,8 @@ var (
 )
 
 // GroupName is the group name used in this package
-const (
-	GroupName    = "descheduler"
-	GroupVersion = "v1alpha1"
-)
+const GroupName = "descheduler"
+const GroupVersion = "v1alpha1"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion}

pkg/api/v1alpha1/types.go

@@ -45,16 +45,14 @@ type DeschedulerPolicy struct {
 	IgnorePVCPods *bool `json:"ignorePvcPods,omitempty"`
 
 	// MaxNoOfPodsToEvictPerNode restricts maximum of pods to be evicted per node.
-	MaxNoOfPodsToEvictPerNode *uint `json:"maxNoOfPodsToEvictPerNode,omitempty"`
+	MaxNoOfPodsToEvictPerNode *int `json:"maxNoOfPodsToEvictPerNode,omitempty"`
 
 	// MaxNoOfPodsToEvictPerNamespace restricts maximum of pods to be evicted per namespace.
-	MaxNoOfPodsToEvictPerNamespace *uint `json:"maxNoOfPodsToEvictPerNamespace,omitempty"`
+	MaxNoOfPodsToEvictPerNamespace *int `json:"maxNoOfPodsToEvictPerNamespace,omitempty"`
 }
 
-type (
-	StrategyName string
-	StrategyList map[StrategyName]DeschedulerStrategy
-)
+type StrategyName string
+type StrategyList map[StrategyName]DeschedulerStrategy
 
 type DeschedulerStrategy struct {
 	// Enabled or disabled
@@ -92,10 +90,8 @@ type StrategyParameters struct {
 	ExcludedTaints                    []string                           `json:"excludedTaints,omitempty"`
 }
 
-type (
-	Percentage         float64
-	ResourceThresholds map[v1.ResourceName]Percentage
-)
+type Percentage float64
+type ResourceThresholds map[v1.ResourceName]Percentage
 
 type NodeResourceUtilizationThresholds struct {
 	UseDeviationThresholds bool               `json:"useDeviationThresholds,omitempty"`
@@ -115,10 +111,7 @@ type RemoveDuplicates struct {
 
 type PodLifeTime struct {
 	MaxPodLifeTimeSeconds *uint    `json:"maxPodLifeTimeSeconds,omitempty"`
-	States                []string `json:"states,omitempty"`
-
-	// Deprecated: Use States instead.
-	PodStatusPhases []string `json:"podStatusPhases,omitempty"`
+	PodStatusPhases       []string `json:"podStatusPhases,omitempty"`
 }
 
 type FailedPods struct {

pkg/api/v1alpha1/zz_generated.conversion.go

@@ -0,0 +1,397 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+/*
+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.
+*/
+
+// Code generated by conversion-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	unsafe "unsafe"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	conversion "k8s.io/apimachinery/pkg/conversion"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	api "sigs.k8s.io/descheduler/pkg/api"
+)
+
+func init() {
+	localSchemeBuilder.Register(RegisterConversions)
+}
+
+// RegisterConversions adds conversion functions to the given scheme.
+// Public to allow building arbitrary schemes.
+func RegisterConversions(s *runtime.Scheme) error {
+	if err := s.AddGeneratedConversionFunc((*DeschedulerPolicy)(nil), (*api.DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(a.(*DeschedulerPolicy), b.(*api.DeschedulerPolicy), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.DeschedulerPolicy)(nil), (*DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_DeschedulerPolicy_To_v1alpha1_DeschedulerPolicy(a.(*api.DeschedulerPolicy), b.(*DeschedulerPolicy), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*DeschedulerStrategy)(nil), (*api.DeschedulerStrategy)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_DeschedulerStrategy_To_api_DeschedulerStrategy(a.(*DeschedulerStrategy), b.(*api.DeschedulerStrategy), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.DeschedulerStrategy)(nil), (*DeschedulerStrategy)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_DeschedulerStrategy_To_v1alpha1_DeschedulerStrategy(a.(*api.DeschedulerStrategy), b.(*DeschedulerStrategy), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*FailedPods)(nil), (*api.FailedPods)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_FailedPods_To_api_FailedPods(a.(*FailedPods), b.(*api.FailedPods), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.FailedPods)(nil), (*FailedPods)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_FailedPods_To_v1alpha1_FailedPods(a.(*api.FailedPods), b.(*FailedPods), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*Namespaces)(nil), (*api.Namespaces)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_Namespaces_To_api_Namespaces(a.(*Namespaces), b.(*api.Namespaces), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.Namespaces)(nil), (*Namespaces)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_Namespaces_To_v1alpha1_Namespaces(a.(*api.Namespaces), b.(*Namespaces), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*NodeResourceUtilizationThresholds)(nil), (*api.NodeResourceUtilizationThresholds)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_NodeResourceUtilizationThresholds_To_api_NodeResourceUtilizationThresholds(a.(*NodeResourceUtilizationThresholds), b.(*api.NodeResourceUtilizationThresholds), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.NodeResourceUtilizationThresholds)(nil), (*NodeResourceUtilizationThresholds)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_NodeResourceUtilizationThresholds_To_v1alpha1_NodeResourceUtilizationThresholds(a.(*api.NodeResourceUtilizationThresholds), b.(*NodeResourceUtilizationThresholds), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*PodLifeTime)(nil), (*api.PodLifeTime)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_PodLifeTime_To_api_PodLifeTime(a.(*PodLifeTime), b.(*api.PodLifeTime), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.PodLifeTime)(nil), (*PodLifeTime)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_PodLifeTime_To_v1alpha1_PodLifeTime(a.(*api.PodLifeTime), b.(*PodLifeTime), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*PodsHavingTooManyRestarts)(nil), (*api.PodsHavingTooManyRestarts)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_PodsHavingTooManyRestarts_To_api_PodsHavingTooManyRestarts(a.(*PodsHavingTooManyRestarts), b.(*api.PodsHavingTooManyRestarts), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.PodsHavingTooManyRestarts)(nil), (*PodsHavingTooManyRestarts)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_PodsHavingTooManyRestarts_To_v1alpha1_PodsHavingTooManyRestarts(a.(*api.PodsHavingTooManyRestarts), b.(*PodsHavingTooManyRestarts), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*RemoveDuplicates)(nil), (*api.RemoveDuplicates)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_RemoveDuplicates_To_api_RemoveDuplicates(a.(*RemoveDuplicates), b.(*api.RemoveDuplicates), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.RemoveDuplicates)(nil), (*RemoveDuplicates)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_RemoveDuplicates_To_v1alpha1_RemoveDuplicates(a.(*api.RemoveDuplicates), b.(*RemoveDuplicates), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*StrategyParameters)(nil), (*api.StrategyParameters)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_StrategyParameters_To_api_StrategyParameters(a.(*StrategyParameters), b.(*api.StrategyParameters), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*api.StrategyParameters)(nil), (*StrategyParameters)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_api_StrategyParameters_To_v1alpha1_StrategyParameters(a.(*api.StrategyParameters), b.(*StrategyParameters), scope)
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func autoConvert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
+	out.Strategies = *(*api.StrategyList)(unsafe.Pointer(&in.Strategies))
+	out.NodeSelector = (*string)(unsafe.Pointer(in.NodeSelector))
+	out.EvictFailedBarePods = (*bool)(unsafe.Pointer(in.EvictFailedBarePods))
+	out.EvictLocalStoragePods = (*bool)(unsafe.Pointer(in.EvictLocalStoragePods))
+	out.EvictSystemCriticalPods = (*bool)(unsafe.Pointer(in.EvictSystemCriticalPods))
+	out.IgnorePVCPods = (*bool)(unsafe.Pointer(in.IgnorePVCPods))
+	if in.MaxNoOfPodsToEvictPerNode != nil {
+		in, out := &in.MaxNoOfPodsToEvictPerNode, &out.MaxNoOfPodsToEvictPerNode
+		*out = new(uint)
+		**out = uint(**in)
+	} else {
+		out.MaxNoOfPodsToEvictPerNode = nil
+	}
+	if in.MaxNoOfPodsToEvictPerNamespace != nil {
+		in, out := &in.MaxNoOfPodsToEvictPerNamespace, &out.MaxNoOfPodsToEvictPerNamespace
+		*out = new(uint)
+		**out = uint(**in)
+	} else {
+		out.MaxNoOfPodsToEvictPerNamespace = nil
+	}
+	return nil
+}
+
+// Convert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy is an autogenerated conversion function.
+func Convert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
+	return autoConvert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(in, out, s)
+}
+
+func autoConvert_api_DeschedulerPolicy_To_v1alpha1_DeschedulerPolicy(in *api.DeschedulerPolicy, out *DeschedulerPolicy, s conversion.Scope) error {
+	out.Strategies = *(*StrategyList)(unsafe.Pointer(&in.Strategies))
+	out.NodeSelector = (*string)(unsafe.Pointer(in.NodeSelector))
+	out.EvictFailedBarePods = (*bool)(unsafe.Pointer(in.EvictFailedBarePods))
+	out.EvictLocalStoragePods = (*bool)(unsafe.Pointer(in.EvictLocalStoragePods))
+	out.EvictSystemCriticalPods = (*bool)(unsafe.Pointer(in.EvictSystemCriticalPods))
+	out.IgnorePVCPods = (*bool)(unsafe.Pointer(in.IgnorePVCPods))
+	if in.MaxNoOfPodsToEvictPerNode != nil {
+		in, out := &in.MaxNoOfPodsToEvictPerNode, &out.MaxNoOfPodsToEvictPerNode
+		*out = new(int)
+		**out = int(**in)
+	} else {
+		out.MaxNoOfPodsToEvictPerNode = nil
+	}
+	if in.MaxNoOfPodsToEvictPerNamespace != nil {
+		in, out := &in.MaxNoOfPodsToEvictPerNamespace, &out.MaxNoOfPodsToEvictPerNamespace
+		*out = new(int)
+		**out = int(**in)
+	} else {
+		out.MaxNoOfPodsToEvictPerNamespace = nil
+	}
+	return nil
+}
+
+// Convert_api_DeschedulerPolicy_To_v1alpha1_DeschedulerPolicy is an autogenerated conversion function.
+func Convert_api_DeschedulerPolicy_To_v1alpha1_DeschedulerPolicy(in *api.DeschedulerPolicy, out *DeschedulerPolicy, s conversion.Scope) error {
+	return autoConvert_api_DeschedulerPolicy_To_v1alpha1_DeschedulerPolicy(in, out, s)
+}
+
+func autoConvert_v1alpha1_DeschedulerStrategy_To_api_DeschedulerStrategy(in *DeschedulerStrategy, out *api.DeschedulerStrategy, s conversion.Scope) error {
+	out.Enabled = in.Enabled
+	out.Weight = in.Weight
+	out.Params = (*api.StrategyParameters)(unsafe.Pointer(in.Params))
+	return nil
+}
+
+// Convert_v1alpha1_DeschedulerStrategy_To_api_DeschedulerStrategy is an autogenerated conversion function.
+func Convert_v1alpha1_DeschedulerStrategy_To_api_DeschedulerStrategy(in *DeschedulerStrategy, out *api.DeschedulerStrategy, s conversion.Scope) error {
+	return autoConvert_v1alpha1_DeschedulerStrategy_To_api_DeschedulerStrategy(in, out, s)
+}
+
+func autoConvert_api_DeschedulerStrategy_To_v1alpha1_DeschedulerStrategy(in *api.DeschedulerStrategy, out *DeschedulerStrategy, s conversion.Scope) error {
+	out.Enabled = in.Enabled
+	out.Weight = in.Weight
+	out.Params = (*StrategyParameters)(unsafe.Pointer(in.Params))
+	return nil
+}
+
+// Convert_api_DeschedulerStrategy_To_v1alpha1_DeschedulerStrategy is an autogenerated conversion function.
+func Convert_api_DeschedulerStrategy_To_v1alpha1_DeschedulerStrategy(in *api.DeschedulerStrategy, out *DeschedulerStrategy, s conversion.Scope) error {
+	return autoConvert_api_DeschedulerStrategy_To_v1alpha1_DeschedulerStrategy(in, out, s)
+}
+
+func autoConvert_v1alpha1_FailedPods_To_api_FailedPods(in *FailedPods, out *api.FailedPods, s conversion.Scope) error {
+	out.ExcludeOwnerKinds = *(*[]string)(unsafe.Pointer(&in.ExcludeOwnerKinds))
+	out.MinPodLifetimeSeconds = (*uint)(unsafe.Pointer(in.MinPodLifetimeSeconds))
+	out.Reasons = *(*[]string)(unsafe.Pointer(&in.Reasons))
+	out.IncludingInitContainers = in.IncludingInitContainers
+	return nil
+}
+
+// Convert_v1alpha1_FailedPods_To_api_FailedPods is an autogenerated conversion function.
+func Convert_v1alpha1_FailedPods_To_api_FailedPods(in *FailedPods, out *api.FailedPods, s conversion.Scope) error {
+	return autoConvert_v1alpha1_FailedPods_To_api_FailedPods(in, out, s)
+}
+
+func autoConvert_api_FailedPods_To_v1alpha1_FailedPods(in *api.FailedPods, out *FailedPods, s conversion.Scope) error {
+	out.ExcludeOwnerKinds = *(*[]string)(unsafe.Pointer(&in.ExcludeOwnerKinds))
+	out.MinPodLifetimeSeconds = (*uint)(unsafe.Pointer(in.MinPodLifetimeSeconds))
+	out.Reasons = *(*[]string)(unsafe.Pointer(&in.Reasons))
+	out.IncludingInitContainers = in.IncludingInitContainers
+	return nil
+}
+
+// Convert_api_FailedPods_To_v1alpha1_FailedPods is an autogenerated conversion function.
+func Convert_api_FailedPods_To_v1alpha1_FailedPods(in *api.FailedPods, out *FailedPods, s conversion.Scope) error {
+	return autoConvert_api_FailedPods_To_v1alpha1_FailedPods(in, out, s)
+}
+
+func autoConvert_v1alpha1_Namespaces_To_api_Namespaces(in *Namespaces, out *api.Namespaces, s conversion.Scope) error {
+	out.Include = *(*[]string)(unsafe.Pointer(&in.Include))
+	out.Exclude = *(*[]string)(unsafe.Pointer(&in.Exclude))
+	return nil
+}
+
+// Convert_v1alpha1_Namespaces_To_api_Namespaces is an autogenerated conversion function.
+func Convert_v1alpha1_Namespaces_To_api_Namespaces(in *Namespaces, out *api.Namespaces, s conversion.Scope) error {
+	return autoConvert_v1alpha1_Namespaces_To_api_Namespaces(in, out, s)
+}
+
+func autoConvert_api_Namespaces_To_v1alpha1_Namespaces(in *api.Namespaces, out *Namespaces, s conversion.Scope) error {
+	out.Include = *(*[]string)(unsafe.Pointer(&in.Include))
+	out.Exclude = *(*[]string)(unsafe.Pointer(&in.Exclude))
+	return nil
+}
+
+// Convert_api_Namespaces_To_v1alpha1_Namespaces is an autogenerated conversion function.
+func Convert_api_Namespaces_To_v1alpha1_Namespaces(in *api.Namespaces, out *Namespaces, s conversion.Scope) error {
+	return autoConvert_api_Namespaces_To_v1alpha1_Namespaces(in, out, s)
+}
+
+func autoConvert_v1alpha1_NodeResourceUtilizationThresholds_To_api_NodeResourceUtilizationThresholds(in *NodeResourceUtilizationThresholds, out *api.NodeResourceUtilizationThresholds, s conversion.Scope) error {
+	out.UseDeviationThresholds = in.UseDeviationThresholds
+	out.Thresholds = *(*api.ResourceThresholds)(unsafe.Pointer(&in.Thresholds))
+	out.TargetThresholds = *(*api.ResourceThresholds)(unsafe.Pointer(&in.TargetThresholds))
+	out.NumberOfNodes = in.NumberOfNodes
+	return nil
+}
+
+// Convert_v1alpha1_NodeResourceUtilizationThresholds_To_api_NodeResourceUtilizationThresholds is an autogenerated conversion function.
+func Convert_v1alpha1_NodeResourceUtilizationThresholds_To_api_NodeResourceUtilizationThresholds(in *NodeResourceUtilizationThresholds, out *api.NodeResourceUtilizationThresholds, s conversion.Scope) error {
+	return autoConvert_v1alpha1_NodeResourceUtilizationThresholds_To_api_NodeResourceUtilizationThresholds(in, out, s)
+}
+
+func autoConvert_api_NodeResourceUtilizationThresholds_To_v1alpha1_NodeResourceUtilizationThresholds(in *api.NodeResourceUtilizationThresholds, out *NodeResourceUtilizationThresholds, s conversion.Scope) error {
+	out.UseDeviationThresholds = in.UseDeviationThresholds
+	out.Thresholds = *(*ResourceThresholds)(unsafe.Pointer(&in.Thresholds))
+	out.TargetThresholds = *(*ResourceThresholds)(unsafe.Pointer(&in.TargetThresholds))
+	out.NumberOfNodes = in.NumberOfNodes
+	return nil
+}
+
+// Convert_api_NodeResourceUtilizationThresholds_To_v1alpha1_NodeResourceUtilizationThresholds is an autogenerated conversion function.
+func Convert_api_NodeResourceUtilizationThresholds_To_v1alpha1_NodeResourceUtilizationThresholds(in *api.NodeResourceUtilizationThresholds, out *NodeResourceUtilizationThresholds, s conversion.Scope) error {
+	return autoConvert_api_NodeResourceUtilizationThresholds_To_v1alpha1_NodeResourceUtilizationThresholds(in, out, s)
+}
+
+func autoConvert_v1alpha1_PodLifeTime_To_api_PodLifeTime(in *PodLifeTime, out *api.PodLifeTime, s conversion.Scope) error {
+	out.MaxPodLifeTimeSeconds = (*uint)(unsafe.Pointer(in.MaxPodLifeTimeSeconds))
+	out.PodStatusPhases = *(*[]string)(unsafe.Pointer(&in.PodStatusPhases))
+	return nil
+}
+
+// Convert_v1alpha1_PodLifeTime_To_api_PodLifeTime is an autogenerated conversion function.
+func Convert_v1alpha1_PodLifeTime_To_api_PodLifeTime(in *PodLifeTime, out *api.PodLifeTime, s conversion.Scope) error {
+	return autoConvert_v1alpha1_PodLifeTime_To_api_PodLifeTime(in, out, s)
+}
+
+func autoConvert_api_PodLifeTime_To_v1alpha1_PodLifeTime(in *api.PodLifeTime, out *PodLifeTime, s conversion.Scope) error {
+	out.MaxPodLifeTimeSeconds = (*uint)(unsafe.Pointer(in.MaxPodLifeTimeSeconds))
+	out.PodStatusPhases = *(*[]string)(unsafe.Pointer(&in.PodStatusPhases))
+	return nil
+}
+
+// Convert_api_PodLifeTime_To_v1alpha1_PodLifeTime is an autogenerated conversion function.
+func Convert_api_PodLifeTime_To_v1alpha1_PodLifeTime(in *api.PodLifeTime, out *PodLifeTime, s conversion.Scope) error {
+	return autoConvert_api_PodLifeTime_To_v1alpha1_PodLifeTime(in, out, s)
+}
+
+func autoConvert_v1alpha1_PodsHavingTooManyRestarts_To_api_PodsHavingTooManyRestarts(in *PodsHavingTooManyRestarts, out *api.PodsHavingTooManyRestarts, s conversion.Scope) error {
+	out.PodRestartThreshold = in.PodRestartThreshold
+	out.IncludingInitContainers = in.IncludingInitContainers
+	return nil
+}
+
+// Convert_v1alpha1_PodsHavingTooManyRestarts_To_api_PodsHavingTooManyRestarts is an autogenerated conversion function.
+func Convert_v1alpha1_PodsHavingTooManyRestarts_To_api_PodsHavingTooManyRestarts(in *PodsHavingTooManyRestarts, out *api.PodsHavingTooManyRestarts, s conversion.Scope) error {
+	return autoConvert_v1alpha1_PodsHavingTooManyRestarts_To_api_PodsHavingTooManyRestarts(in, out, s)
+}
+
+func autoConvert_api_PodsHavingTooManyRestarts_To_v1alpha1_PodsHavingTooManyRestarts(in *api.PodsHavingTooManyRestarts, out *PodsHavingTooManyRestarts, s conversion.Scope) error {
+	out.PodRestartThreshold = in.PodRestartThreshold
+	out.IncludingInitContainers = in.IncludingInitContainers
+	return nil
+}
+
+// Convert_api_PodsHavingTooManyRestarts_To_v1alpha1_PodsHavingTooManyRestarts is an autogenerated conversion function.
+func Convert_api_PodsHavingTooManyRestarts_To_v1alpha1_PodsHavingTooManyRestarts(in *api.PodsHavingTooManyRestarts, out *PodsHavingTooManyRestarts, s conversion.Scope) error {
+	return autoConvert_api_PodsHavingTooManyRestarts_To_v1alpha1_PodsHavingTooManyRestarts(in, out, s)
+}
+
+func autoConvert_v1alpha1_RemoveDuplicates_To_api_RemoveDuplicates(in *RemoveDuplicates, out *api.RemoveDuplicates, s conversion.Scope) error {
+	out.ExcludeOwnerKinds = *(*[]string)(unsafe.Pointer(&in.ExcludeOwnerKinds))
+	return nil
+}
+
+// Convert_v1alpha1_RemoveDuplicates_To_api_RemoveDuplicates is an autogenerated conversion function.
+func Convert_v1alpha1_RemoveDuplicates_To_api_RemoveDuplicates(in *RemoveDuplicates, out *api.RemoveDuplicates, s conversion.Scope) error {
+	return autoConvert_v1alpha1_RemoveDuplicates_To_api_RemoveDuplicates(in, out, s)
+}
+
+func autoConvert_api_RemoveDuplicates_To_v1alpha1_RemoveDuplicates(in *api.RemoveDuplicates, out *RemoveDuplicates, s conversion.Scope) error {
+	out.ExcludeOwnerKinds = *(*[]string)(unsafe.Pointer(&in.ExcludeOwnerKinds))
+	return nil
+}
+
+// Convert_api_RemoveDuplicates_To_v1alpha1_RemoveDuplicates is an autogenerated conversion function.
+func Convert_api_RemoveDuplicates_To_v1alpha1_RemoveDuplicates(in *api.RemoveDuplicates, out *RemoveDuplicates, s conversion.Scope) error {
+	return autoConvert_api_RemoveDuplicates_To_v1alpha1_RemoveDuplicates(in, out, s)
+}
+
+func autoConvert_v1alpha1_StrategyParameters_To_api_StrategyParameters(in *StrategyParameters, out *api.StrategyParameters, s conversion.Scope) error {
+	out.NodeResourceUtilizationThresholds = (*api.NodeResourceUtilizationThresholds)(unsafe.Pointer(in.NodeResourceUtilizationThresholds))
+	out.NodeAffinityType = *(*[]string)(unsafe.Pointer(&in.NodeAffinityType))
+	out.PodsHavingTooManyRestarts = (*api.PodsHavingTooManyRestarts)(unsafe.Pointer(in.PodsHavingTooManyRestarts))
+	out.PodLifeTime = (*api.PodLifeTime)(unsafe.Pointer(in.PodLifeTime))
+	out.RemoveDuplicates = (*api.RemoveDuplicates)(unsafe.Pointer(in.RemoveDuplicates))
+	out.FailedPods = (*api.FailedPods)(unsafe.Pointer(in.FailedPods))
+	out.IncludeSoftConstraints = in.IncludeSoftConstraints
+	out.Namespaces = (*api.Namespaces)(unsafe.Pointer(in.Namespaces))
+	out.ThresholdPriority = (*int32)(unsafe.Pointer(in.ThresholdPriority))
+	out.ThresholdPriorityClassName = in.ThresholdPriorityClassName
+	out.LabelSelector = (*v1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
+	out.NodeFit = in.NodeFit
+	out.IncludePreferNoSchedule = in.IncludePreferNoSchedule
+	out.ExcludedTaints = *(*[]string)(unsafe.Pointer(&in.ExcludedTaints))
+	return nil
+}
+
+// Convert_v1alpha1_StrategyParameters_To_api_StrategyParameters is an autogenerated conversion function.
+func Convert_v1alpha1_StrategyParameters_To_api_StrategyParameters(in *StrategyParameters, out *api.StrategyParameters, s conversion.Scope) error {
+	return autoConvert_v1alpha1_StrategyParameters_To_api_StrategyParameters(in, out, s)
+}
+
+func autoConvert_api_StrategyParameters_To_v1alpha1_StrategyParameters(in *api.StrategyParameters, out *StrategyParameters, s conversion.Scope) error {
+	out.NodeResourceUtilizationThresholds = (*NodeResourceUtilizationThresholds)(unsafe.Pointer(in.NodeResourceUtilizationThresholds))
+	out.NodeAffinityType = *(*[]string)(unsafe.Pointer(&in.NodeAffinityType))
+	out.PodsHavingTooManyRestarts = (*PodsHavingTooManyRestarts)(unsafe.Pointer(in.PodsHavingTooManyRestarts))
+	out.PodLifeTime = (*PodLifeTime)(unsafe.Pointer(in.PodLifeTime))
+	out.RemoveDuplicates = (*RemoveDuplicates)(unsafe.Pointer(in.RemoveDuplicates))
+	out.FailedPods = (*FailedPods)(unsafe.Pointer(in.FailedPods))
+	out.IncludeSoftConstraints = in.IncludeSoftConstraints
+	out.Namespaces = (*Namespaces)(unsafe.Pointer(in.Namespaces))
+	out.ThresholdPriority = (*int32)(unsafe.Pointer(in.ThresholdPriority))
+	out.ThresholdPriorityClassName = in.ThresholdPriorityClassName
+	out.LabelSelector = (*v1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
+	out.NodeFit = in.NodeFit
+	out.IncludePreferNoSchedule = in.IncludePreferNoSchedule
+	out.ExcludedTaints = *(*[]string)(unsafe.Pointer(&in.ExcludedTaints))
+	return nil
+}
+
+// Convert_api_StrategyParameters_To_v1alpha1_StrategyParameters is an autogenerated conversion function.
+func Convert_api_StrategyParameters_To_v1alpha1_StrategyParameters(in *api.StrategyParameters, out *StrategyParameters, s conversion.Scope) error {
+	return autoConvert_api_StrategyParameters_To_v1alpha1_StrategyParameters(in, out, s)
+}

pkg/api/v1alpha1/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.
@@ -64,12 +64,12 @@ func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 	}
 	if in.MaxNoOfPodsToEvictPerNode != nil {
 		in, out := &in.MaxNoOfPodsToEvictPerNode, &out.MaxNoOfPodsToEvictPerNode
-		*out = new(uint)
+		*out = new(int)
 		**out = **in
 	}
 	if in.MaxNoOfPodsToEvictPerNamespace != nil {
 		in, out := &in.MaxNoOfPodsToEvictPerNamespace, &out.MaxNoOfPodsToEvictPerNamespace
-		*out = new(uint)
+		*out = new(int)
 		**out = **in
 	}
 	return
@@ -209,11 +209,6 @@ func (in *PodLifeTime) DeepCopyInto(out *PodLifeTime) {
 		*out = new(uint)
 		**out = **in
 	}
-	if in.States != nil {
-		in, out := &in.States, &out.States
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 	if in.PodStatusPhases != nil {
 		in, out := &in.PodStatusPhases, &out.PodStatusPhases
 		*out = make([]string, len(*in))

pkg/api/v1alpha1/zz_generated.defaults.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.

pkg/api/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.
@@ -22,6 +22,7 @@ limitations under the License.
 package api
 
 import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -29,11 +30,11 @@ import (
 func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	if in.Profiles != nil {
-		in, out := &in.Profiles, &out.Profiles
-		*out = make([]Profile, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
+	if in.Strategies != nil {
+		in, out := &in.Strategies, &out.Strategies
+		*out = make(StrategyList, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
 		}
 	}
 	if in.NodeSelector != nil {
@@ -41,6 +42,26 @@ func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 		*out = new(string)
 		**out = **in
 	}
+	if in.EvictFailedBarePods != nil {
+		in, out := &in.EvictFailedBarePods, &out.EvictFailedBarePods
+		*out = new(bool)
+		**out = **in
+	}
+	if in.EvictLocalStoragePods != nil {
+		in, out := &in.EvictLocalStoragePods, &out.EvictLocalStoragePods
+		*out = new(bool)
+		**out = **in
+	}
+	if in.EvictSystemCriticalPods != nil {
+		in, out := &in.EvictSystemCriticalPods, &out.EvictSystemCriticalPods
+		*out = new(bool)
+		**out = **in
+	}
+	if in.IgnorePVCPods != nil {
+		in, out := &in.IgnorePVCPods, &out.IgnorePVCPods
+		*out = new(bool)
+		**out = **in
+	}
 	if in.MaxNoOfPodsToEvictPerNode != nil {
 		in, out := &in.MaxNoOfPodsToEvictPerNode, &out.MaxNoOfPodsToEvictPerNode
 		*out = new(uint)
@@ -72,6 +93,58 @@ func (in *DeschedulerPolicy) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DeschedulerStrategy) DeepCopyInto(out *DeschedulerStrategy) {
+	*out = *in
+	if in.Params != nil {
+		in, out := &in.Params, &out.Params
+		*out = new(StrategyParameters)
+		(*in).DeepCopyInto(*out)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeschedulerStrategy.
+func (in *DeschedulerStrategy) DeepCopy() *DeschedulerStrategy {
+	if in == nil {
+		return nil
+	}
+	out := new(DeschedulerStrategy)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FailedPods) DeepCopyInto(out *FailedPods) {
+	*out = *in
+	if in.ExcludeOwnerKinds != nil {
+		in, out := &in.ExcludeOwnerKinds, &out.ExcludeOwnerKinds
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.MinPodLifetimeSeconds != nil {
+		in, out := &in.MinPodLifetimeSeconds, &out.MinPodLifetimeSeconds
+		*out = new(uint)
+		**out = **in
+	}
+	if in.Reasons != nil {
+		in, out := &in.Reasons, &out.Reasons
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FailedPods.
+func (in *FailedPods) DeepCopy() *FailedPods {
+	if in == nil {
+		return nil
+	}
+	out := new(FailedPods)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Namespaces) DeepCopyInto(out *Namespaces) {
 	*out = *in
@@ -99,114 +172,94 @@ func (in *Namespaces) DeepCopy() *Namespaces {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PluginConfig) DeepCopyInto(out *PluginConfig) {
+func (in *NodeResourceUtilizationThresholds) DeepCopyInto(out *NodeResourceUtilizationThresholds) {
 	*out = *in
-	if in.Args != nil {
-		out.Args = in.Args.DeepCopyObject()
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PluginConfig.
-func (in *PluginConfig) DeepCopy() *PluginConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(PluginConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PluginSet) DeepCopyInto(out *PluginSet) {
-	*out = *in
-	if in.Enabled != nil {
-		in, out := &in.Enabled, &out.Enabled
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Disabled != nil {
-		in, out := &in.Disabled, &out.Disabled
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PluginSet.
-func (in *PluginSet) DeepCopy() *PluginSet {
-	if in == nil {
-		return nil
-	}
-	out := new(PluginSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Plugins) DeepCopyInto(out *Plugins) {
-	*out = *in
-	in.PreSort.DeepCopyInto(&out.PreSort)
-	in.Sort.DeepCopyInto(&out.Sort)
-	in.Deschedule.DeepCopyInto(&out.Deschedule)
-	in.Balance.DeepCopyInto(&out.Balance)
-	in.Evict.DeepCopyInto(&out.Evict)
-	in.Filter.DeepCopyInto(&out.Filter)
-	in.PreEvictionFilter.DeepCopyInto(&out.PreEvictionFilter)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Plugins.
-func (in *Plugins) DeepCopy() *Plugins {
-	if in == nil {
-		return nil
-	}
-	out := new(Plugins)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PriorityThreshold) DeepCopyInto(out *PriorityThreshold) {
-	*out = *in
-	if in.Value != nil {
-		in, out := &in.Value, &out.Value
-		*out = new(int32)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PriorityThreshold.
-func (in *PriorityThreshold) DeepCopy() *PriorityThreshold {
-	if in == nil {
-		return nil
-	}
-	out := new(PriorityThreshold)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Profile) DeepCopyInto(out *Profile) {
-	*out = *in
-	if in.PluginConfigs != nil {
-		in, out := &in.PluginConfigs, &out.PluginConfigs
-		*out = make([]PluginConfig, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
+	if in.Thresholds != nil {
+		in, out := &in.Thresholds, &out.Thresholds
+		*out = make(ResourceThresholds, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	if in.TargetThresholds != nil {
+		in, out := &in.TargetThresholds, &out.TargetThresholds
+		*out = make(ResourceThresholds, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
 		}
 	}
-	in.Plugins.DeepCopyInto(&out.Plugins)
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Profile.
-func (in *Profile) DeepCopy() *Profile {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeResourceUtilizationThresholds.
+func (in *NodeResourceUtilizationThresholds) DeepCopy() *NodeResourceUtilizationThresholds {
 	if in == nil {
 		return nil
 	}
-	out := new(Profile)
+	out := new(NodeResourceUtilizationThresholds)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PodLifeTime) DeepCopyInto(out *PodLifeTime) {
+	*out = *in
+	if in.MaxPodLifeTimeSeconds != nil {
+		in, out := &in.MaxPodLifeTimeSeconds, &out.MaxPodLifeTimeSeconds
+		*out = new(uint)
+		**out = **in
+	}
+	if in.PodStatusPhases != nil {
+		in, out := &in.PodStatusPhases, &out.PodStatusPhases
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodLifeTime.
+func (in *PodLifeTime) DeepCopy() *PodLifeTime {
+	if in == nil {
+		return nil
+	}
+	out := new(PodLifeTime)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PodsHavingTooManyRestarts) DeepCopyInto(out *PodsHavingTooManyRestarts) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodsHavingTooManyRestarts.
+func (in *PodsHavingTooManyRestarts) DeepCopy() *PodsHavingTooManyRestarts {
+	if in == nil {
+		return nil
+	}
+	out := new(PodsHavingTooManyRestarts)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RemoveDuplicates) DeepCopyInto(out *RemoveDuplicates) {
+	*out = *in
+	if in.ExcludeOwnerKinds != nil {
+		in, out := &in.ExcludeOwnerKinds, &out.ExcludeOwnerKinds
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RemoveDuplicates.
+func (in *RemoveDuplicates) DeepCopy() *RemoveDuplicates {
+	if in == nil {
+		return nil
+	}
+	out := new(RemoveDuplicates)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -232,3 +285,91 @@ func (in ResourceThresholds) DeepCopy() ResourceThresholds {
 	in.DeepCopyInto(out)
 	return *out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in StrategyList) DeepCopyInto(out *StrategyList) {
+	{
+		in := &in
+		*out = make(StrategyList, len(*in))
+		for key, val := range *in {
+			(*out)[key] = *val.DeepCopy()
+		}
+		return
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StrategyList.
+func (in StrategyList) DeepCopy() StrategyList {
+	if in == nil {
+		return nil
+	}
+	out := new(StrategyList)
+	in.DeepCopyInto(out)
+	return *out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *StrategyParameters) DeepCopyInto(out *StrategyParameters) {
+	*out = *in
+	if in.NodeResourceUtilizationThresholds != nil {
+		in, out := &in.NodeResourceUtilizationThresholds, &out.NodeResourceUtilizationThresholds
+		*out = new(NodeResourceUtilizationThresholds)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.NodeAffinityType != nil {
+		in, out := &in.NodeAffinityType, &out.NodeAffinityType
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.PodsHavingTooManyRestarts != nil {
+		in, out := &in.PodsHavingTooManyRestarts, &out.PodsHavingTooManyRestarts
+		*out = new(PodsHavingTooManyRestarts)
+		**out = **in
+	}
+	if in.PodLifeTime != nil {
+		in, out := &in.PodLifeTime, &out.PodLifeTime
+		*out = new(PodLifeTime)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.RemoveDuplicates != nil {
+		in, out := &in.RemoveDuplicates, &out.RemoveDuplicates
+		*out = new(RemoveDuplicates)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.FailedPods != nil {
+		in, out := &in.FailedPods, &out.FailedPods
+		*out = new(FailedPods)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Namespaces != nil {
+		in, out := &in.Namespaces, &out.Namespaces
+		*out = new(Namespaces)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ThresholdPriority != nil {
+		in, out := &in.ThresholdPriority, &out.ThresholdPriority
+		*out = new(int32)
+		**out = **in
+	}
+	if in.LabelSelector != nil {
+		in, out := &in.LabelSelector, &out.LabelSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ExcludedTaints != nil {
+		in, out := &in.ExcludedTaints, &out.ExcludedTaints
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StrategyParameters.
+func (in *StrategyParameters) DeepCopy() *StrategyParameters {
+	if in == nil {
+		return nil
+	}
+	out := new(StrategyParameters)
+	in.DeepCopyInto(out)
+	return out
+}

pkg/apis/componentconfig/types.go

@@ -21,7 +21,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	componentbaseconfig "k8s.io/component-base/config"
-	registry "k8s.io/component-base/logs/api/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -58,6 +57,6 @@ type DeschedulerConfiguration struct {
 	LeaderElection componentbaseconfig.LeaderElectionConfiguration
 
 	// Logging specifies the options of logging.
-	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/api/v1/options.go) for more information.
-	Logging registry.LoggingConfiguration
+	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/options.go) for more information.
+	Logging componentbaseconfig.LoggingConfiguration
 }

pkg/apis/componentconfig/v1alpha1/register.go

@@ -28,10 +28,8 @@ var (
 )
 
 // GroupName is the group name use in this package
-const (
-	GroupName    = "deschedulercomponentconfig"
-	GroupVersion = "v1alpha1"
-)
+const GroupName = "deschedulercomponentconfig"
+const GroupVersion = "v1alpha1"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion}

pkg/apis/componentconfig/v1alpha1/types.go

@@ -19,9 +19,9 @@ package v1alpha1
 import (
 	"time"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	componentbaseconfig "k8s.io/component-base/config"
-	registry "k8s.io/component-base/logs/api/v1"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -58,6 +58,6 @@ type DeschedulerConfiguration struct {
 	LeaderElection componentbaseconfig.LeaderElectionConfiguration `json:"leaderElection,omitempty"`
 
 	// Logging specifies the options of logging.
-	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/api/v1/options.go) for more information.
-	Logging registry.LoggingConfiguration `json:"logging,omitempty"`
+	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/options.go) for more information.
+	Logging componentbaseconfig.LoggingConfiguration `json:"logging,omitempty"`
 }

pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.

pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.

pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.

pkg/apis/componentconfig/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2023 The Kubernetes Authors.
+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.

pkg/descheduler/client/client.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-func CreateClient(kubeconfig, userAgt string) (clientset.Interface, error) {
+func CreateClient(kubeconfig string) (clientset.Interface, error) {
 	var cfg *rest.Config
 	if len(kubeconfig) != 0 {
 		master, err := GetMasterFromKubeconfig(kubeconfig)
@@ -47,11 +47,7 @@ func CreateClient(kubeconfig, userAgt string) (clientset.Interface, error) {
 		}
 	}
 
-	if len(userAgt) != 0 {
-		return clientset.NewForConfig(rest.AddUserAgent(cfg, userAgt))
-	} else {
-		return clientset.NewForConfig(cfg)
-	}
+	return clientset.NewForConfig(cfg)
 }
 
 func GetMasterFromKubeconfig(filename string) (string, error) {

pkg/descheduler/descheduler.go

@@ -20,10 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	"k8s.io/klog/v2"
-
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
+	policy "k8s.io/api/policy/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -31,9 +29,11 @@ import (
 	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
-	listersv1 "k8s.io/client-go/listers/core/v1"
-	schedulingv1 "k8s.io/client-go/listers/scheduling/v1"
 	core "k8s.io/client-go/testing"
+	"k8s.io/klog/v2"
+
+	corev1informers "k8s.io/client-go/informers/core/v1"
+	schedulingv1informers "k8s.io/client-go/informers/scheduling/v1"
 
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/metrics"
@@ -43,23 +43,20 @@ import (
 	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/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/utils"
+	"sigs.k8s.io/descheduler/pkg/descheduler/strategies"
+	"sigs.k8s.io/descheduler/pkg/descheduler/strategies/nodeutilization"
 )
 
 func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 	metrics.Register()
 
-	rsclient, eventClient, err := createClients(rs.KubeconfigFile)
+	rsclient, err := client.CreateClient(rs.KubeconfigFile)
 	if err != nil {
 		return err
 	}
 	rs.Client = rsclient
-	rs.EventClient = eventClient
 
-	deschedulerPolicy, err := LoadPolicyConfig(rs.PolicyConfigFile, rs.Client, pluginbuilder.PluginRegistry)
+	deschedulerPolicy, err := LoadPolicyConfig(rs.PolicyConfigFile)
 	if err != nil {
 		return err
 	}
@@ -80,10 +77,6 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 		return fmt.Errorf("leaderElection must be used with deschedulingInterval")
 	}
 
-	if rs.LeaderElection.LeaderElect && rs.DryRun {
-		klog.V(1).InfoS("Warning: DryRun is set to True. You need to disable it to use Leader Election.")
-	}
-
 	if rs.LeaderElection.LeaderElect && !rs.DryRun {
 		if err := NewLeaderElection(runFn, rsclient, &rs.LeaderElection, ctx); err != nil {
 			return fmt.Errorf("leaderElection: %w", err)
@@ -94,12 +87,14 @@ 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, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc)
+
 func cachedClient(
 	realClient clientset.Interface,
-	podLister listersv1.PodLister,
-	nodeLister listersv1.NodeLister,
-	namespaceLister listersv1.NamespaceLister,
-	priorityClassLister schedulingv1.PriorityClassLister,
+	podInformer corev1informers.PodInformer,
+	nodeInformer corev1informers.NodeInformer,
+	namespaceInformer corev1informers.NamespaceInformer,
+	priorityClassInformer schedulingv1informers.PriorityClassInformer,
 ) (clientset.Interface, error) {
 	fakeClient := fakeclientset.NewSimpleClientset()
 	// simulate a pod eviction by deleting a pod
@@ -123,7 +118,7 @@ func cachedClient(
 	})
 
 	klog.V(3).Infof("Pulling resources for the cached client from the cluster")
-	pods, err := podLister.List(labels.Everything())
+	pods, err := podInformer.Lister().List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("unable to list pods: %v", err)
 	}
@@ -134,7 +129,7 @@ func cachedClient(
 		}
 	}
 
-	nodes, err := nodeLister.List(labels.Everything())
+	nodes, err := nodeInformer.Lister().List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("unable to list nodes: %v", err)
 	}
@@ -145,7 +140,7 @@ func cachedClient(
 		}
 	}
 
-	namespaces, err := namespaceLister.List(labels.Everything())
+	namespaces, err := namespaceInformer.Lister().List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("unable to list namespaces: %v", err)
 	}
@@ -156,7 +151,7 @@ func cachedClient(
 		}
 	}
 
-	priorityClasses, err := priorityClassLister.List(labels.Everything())
+	priorityClasses, err := priorityClassInformer.Lister().List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("unable to list priorityclasses: %v", err)
 	}
@@ -170,75 +165,20 @@ func cachedClient(
 	return fakeClient, nil
 }
 
-// evictorImpl implements the Evictor interface so plugins
-// can evict a pod without importing a specific pod evictor
-type evictorImpl struct {
-	podEvictor    *evictions.PodEvictor
-	evictorFilter framework.EvictorPlugin
-}
-
-var _ framework.Evictor = &evictorImpl{}
-
-// Filter checks if a pod can be evicted
-func (ei *evictorImpl) Filter(pod *v1.Pod) bool {
-	return ei.evictorFilter.Filter(pod)
-}
-
-// PreEvictionFilter checks if pod can be evicted right before eviction
-func (ei *evictorImpl) PreEvictionFilter(pod *v1.Pod) bool {
-	return ei.evictorFilter.PreEvictionFilter(pod)
-}
-
-// Evict evicts a pod (no pre-check performed)
-func (ei *evictorImpl) Evict(ctx context.Context, pod *v1.Pod, opts evictions.EvictOptions) bool {
-	return ei.podEvictor.EvictPod(ctx, pod, opts)
-}
-
-func (ei *evictorImpl) NodeLimitExceeded(node *v1.Node) bool {
-	return ei.podEvictor.NodeLimitExceeded(node)
-}
-
-// handleImpl implements the framework handle which gets passed to plugins
-type handleImpl struct {
-	clientSet                 clientset.Interface
-	getPodsAssignedToNodeFunc podutil.GetPodsAssignedToNodeFunc
-	sharedInformerFactory     informers.SharedInformerFactory
-	evictor                   *evictorImpl
-}
-
-var _ framework.Handle = &handleImpl{}
-
-// ClientSet retrieves kube client set
-func (hi *handleImpl) ClientSet() clientset.Interface {
-	return hi.clientSet
-}
-
-// GetPodsAssignedToNodeFunc retrieves GetPodsAssignedToNodeFunc implementation
-func (hi *handleImpl) GetPodsAssignedToNodeFunc() podutil.GetPodsAssignedToNodeFunc {
-	return hi.getPodsAssignedToNodeFunc
-}
-
-// SharedInformerFactory retrieves shared informer factory
-func (hi *handleImpl) SharedInformerFactory() informers.SharedInformerFactory {
-	return hi.sharedInformerFactory
-}
-
-// Evictor retrieves evictor so plugins can filter and evict pods
-func (hi *handleImpl) Evictor() framework.Evictor {
-	return hi.evictor
-}
-
 func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string) error {
 	sharedInformerFactory := informers.NewSharedInformerFactory(rs.Client, 0)
-	podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
-	podLister := sharedInformerFactory.Core().V1().Pods().Lister()
-	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
-	namespaceLister := sharedInformerFactory.Core().V1().Namespaces().Lister()
-	priorityClassLister := sharedInformerFactory.Scheduling().V1().PriorityClasses().Lister()
+	nodeInformer := sharedInformerFactory.Core().V1().Nodes()
+	podInformer := sharedInformerFactory.Core().V1().Pods()
+	namespaceInformer := sharedInformerFactory.Core().V1().Namespaces()
+	priorityClassInformer := sharedInformerFactory.Scheduling().V1().PriorityClasses()
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
+	// create the informers
+	namespaceInformer.Informer()
+	priorityClassInformer.Informer()
+
 	getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 	if err != nil {
 		return fmt.Errorf("build get pods assigned to node function error: %v", err)
@@ -247,23 +187,52 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	sharedInformerFactory.Start(ctx.Done())
 	sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
+	strategyFuncs := map[api.StrategyName]strategyFunction{
+		"RemoveDuplicates":                            strategies.RemoveDuplicatePods,
+		"LowNodeUtilization":                          nodeutilization.LowNodeUtilization,
+		"HighNodeUtilization":                         nodeutilization.HighNodeUtilization,
+		"RemovePodsViolatingInterPodAntiAffinity":     strategies.RemovePodsViolatingInterPodAntiAffinity,
+		"RemovePodsViolatingNodeAffinity":             strategies.RemovePodsViolatingNodeAffinity,
+		"RemovePodsViolatingNodeTaints":               strategies.RemovePodsViolatingNodeTaints,
+		"RemovePodsHavingTooManyRestarts":             strategies.RemovePodsHavingTooManyRestarts,
+		"PodLifeTime":                                 strategies.PodLifeTime,
+		"RemovePodsViolatingTopologySpreadConstraint": strategies.RemovePodsViolatingTopologySpreadConstraint,
+		"RemoveFailedPods":                            strategies.RemoveFailedPods,
+	}
+
 	var nodeSelector string
 	if deschedulerPolicy.NodeSelector != nil {
 		nodeSelector = *deschedulerPolicy.NodeSelector
 	}
 
-	var eventClient clientset.Interface
-	if rs.DryRun {
-		eventClient = fakeclientset.NewSimpleClientset()
-	} else {
-		eventClient = rs.Client
+	var evictLocalStoragePods bool
+	if deschedulerPolicy.EvictLocalStoragePods != nil {
+		evictLocalStoragePods = *deschedulerPolicy.EvictLocalStoragePods
 	}
 
-	eventBroadcaster, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, eventClient)
-	defer eventBroadcaster.Shutdown()
+	evictBarePods := false
+	if deschedulerPolicy.EvictFailedBarePods != nil {
+		evictBarePods = *deschedulerPolicy.EvictFailedBarePods
+		if evictBarePods {
+			klog.V(1).InfoS("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
+		}
+	}
+
+	evictSystemCriticalPods := false
+	if deschedulerPolicy.EvictSystemCriticalPods != nil {
+		evictSystemCriticalPods = *deschedulerPolicy.EvictSystemCriticalPods
+		if evictSystemCriticalPods {
+			klog.V(1).InfoS("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.")
+		}
+	}
+
+	ignorePvcPods := false
+	if deschedulerPolicy.IgnorePVCPods != nil {
+		ignorePvcPods = *deschedulerPolicy.IgnorePVCPods
+	}
 
 	wait.NonSlidingUntil(func() {
-		nodes, err := nodeutil.ReadyNodes(ctx, rs.Client, nodeLister, nodeSelector)
+		nodes, err := nodeutil.ReadyNodes(ctx, rs.Client, nodeInformer, nodeSelector)
 		if err != nil {
 			klog.V(1).InfoS("Unable to get ready nodes", "err", err)
 			cancel()
@@ -283,14 +252,14 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 		if rs.DryRun {
 			klog.V(3).Infof("Building a cached client from the cluster for the dry run")
 			// Create a new cache so we start from scratch without any leftovers
-			fakeClient, err := cachedClient(rs.Client, podLister, nodeLister, namespaceLister, priorityClassLister)
+			fakeClient, err := cachedClient(rs.Client, podInformer, nodeInformer, namespaceInformer, priorityClassInformer)
 			if err != nil {
 				klog.Error(err)
 				return
 			}
 
 			fakeSharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			getPodsAssignedToNode, err = podutil.BuildGetPodsAssignedToNodeFunc(fakeSharedInformerFactory.Core().V1().Pods().Informer())
+			getPodsAssignedToNode, err = podutil.BuildGetPodsAssignedToNodeFunc(fakeSharedInformerFactory.Core().V1().Pods())
 			if err != nil {
 				klog.Errorf("build get pods assigned to node function error: %v", err)
 				return
@@ -314,94 +283,21 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 			deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
 			deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
 			nodes,
+			getPodsAssignedToNode,
+			evictLocalStoragePods,
+			evictSystemCriticalPods,
+			ignorePvcPods,
+			evictBarePods,
 			!rs.DisableMetrics,
-			eventRecorder,
 		)
 
-		var enabledDeschedulePlugins []framework.DeschedulePlugin
-		var enabledBalancePlugins []framework.BalancePlugin
-
-		// Build plugins
-		for _, profile := range deschedulerPolicy.Profiles {
-			pc := getPluginConfig(defaultevictor.PluginName, profile.PluginConfigs)
-			if pc == nil {
-				klog.ErrorS(fmt.Errorf("unable to get plugin config"), "skipping plugin", "plugin", defaultevictor.PluginName, "profile", profile.Name)
-				continue
-			}
-			evictorFilter, err := defaultevictor.New(
-				pc.Args,
-				&handleImpl{
-					clientSet:                 rs.Client,
-					getPodsAssignedToNodeFunc: getPodsAssignedToNode,
-					sharedInformerFactory:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				klog.ErrorS(fmt.Errorf("unable to construct a plugin"), "skipping plugin", "plugin", defaultevictor.PluginName)
-				continue
-			}
-			handle := &handleImpl{
-				clientSet:                 rs.Client,
-				getPodsAssignedToNodeFunc: getPodsAssignedToNode,
-				sharedInformerFactory:     sharedInformerFactory,
-				evictor: &evictorImpl{
-					podEvictor:    podEvictor,
-					evictorFilter: evictorFilter.(framework.EvictorPlugin),
-				},
-			}
-			// Assuming only a list of enabled extension points.
-			// Later, when a default list of plugins and their extension points is established,
-			// compute the list of enabled extension points as (DefaultEnabled + Enabled - Disabled)
-			for _, plugin := range append(profile.Plugins.Deschedule.Enabled, profile.Plugins.Balance.Enabled...) {
-				pc := getPluginConfig(plugin, profile.PluginConfigs)
-				if pc == nil {
-					klog.ErrorS(fmt.Errorf("unable to get plugin config"), "skipping plugin", "plugin", plugin)
-					continue
+		for name, strategy := range deschedulerPolicy.Strategies {
+			if f, ok := strategyFuncs[name]; ok {
+				if strategy.Enabled {
+					f(ctx, rs.Client, strategy, nodes, podEvictor, getPodsAssignedToNode)
 				}
-				registryPlugin, ok := pluginbuilder.PluginRegistry[plugin]
-				pgFnc := registryPlugin.PluginBuilder
-				if !ok {
-					klog.ErrorS(fmt.Errorf("unable to find plugin in the pluginsMap"), "skipping plugin", "plugin", plugin)
-				}
-				pg, err := pgFnc(pc.Args, handle)
-				if err != nil {
-					klog.ErrorS(err, "unable to initialize a plugin", "pluginName", plugin)
-				}
-				if pg != nil {
-					switch v := pg.(type) {
-					case framework.DeschedulePlugin:
-						enabledDeschedulePlugins = append(enabledDeschedulePlugins, v)
-					case framework.BalancePlugin:
-						enabledBalancePlugins = append(enabledBalancePlugins, v)
-					default:
-						klog.ErrorS(fmt.Errorf("unknown plugin extension point"), "skipping plugin", "plugin", plugin)
-					}
-				}
-			}
-		}
-
-		// Execute extension points
-		for _, pg := range enabledDeschedulePlugins {
-			// TODO: strategyName should be accessible from within the strategy using a framework
-			// handle or function which the Evictor has access to. For migration/in-progress framework
-			// work, we are currently passing this via context. To be removed
-			// (See discussion thread https://github.com/kubernetes-sigs/descheduler/pull/885#discussion_r919962292)
-			childCtx := context.WithValue(ctx, "strategyName", pg.Name())
-			status := pg.Deschedule(childCtx, nodes)
-			if status != nil && status.Err != nil {
-				klog.ErrorS(status.Err, "plugin finished with error", "pluginName", pg.Name())
-			}
-		}
-
-		for _, pg := range enabledBalancePlugins {
-			// TODO: strategyName should be accessible from within the strategy using a framework
-			// handle or function which the Evictor has access to. For migration/in-progress framework
-			// work, we are currently passing this via context. To be removed
-			// (See discussion thread https://github.com/kubernetes-sigs/descheduler/pull/885#discussion_r919962292)
-			childCtx := context.WithValue(ctx, "strategyName", pg.Name())
-			status := pg.Balance(childCtx, nodes)
-			if status != nil && status.Err != nil {
-				klog.ErrorS(status.Err, "plugin finished with error", "pluginName", pg.Name())
+			} else {
+				klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
 			}
 		}
 
@@ -415,26 +311,3 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 
 	return nil
 }
-
-func getPluginConfig(pluginName string, pluginConfigs []api.PluginConfig) *api.PluginConfig {
-	for _, pluginConfig := range pluginConfigs {
-		if pluginConfig.Name == pluginName {
-			return &pluginConfig
-		}
-	}
-	return nil
-}
-
-func createClients(kubeconfig string) (clientset.Interface, clientset.Interface, error) {
-	kClient, err := client.CreateClient(kubeconfig, "descheduler")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	eventClient, err := client.CreateClient(kubeconfig, "")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return kClient, eventClient, nil
-}

pkg/descheduler/descheduler_test.go

@@ -3,27 +3,20 @@ package descheduler
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 	"time"
 
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
-	core "k8s.io/client-go/testing"
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
 	"sigs.k8s.io/descheduler/test"
 )
 
 func TestTaintsUpdated(t *testing.T) {
-	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	pluginbuilder.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, pluginbuilder.PluginRegistry)
 	ctx := context.Background()
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
@@ -34,10 +27,9 @@ func TestTaintsUpdated(t *testing.T) {
 	}
 
 	client := fakeclientset.NewSimpleClientset(n1, n2, p1)
-	eventClient := fakeclientset.NewSimpleClientset(n1, n2, p1)
-	dp := &v1alpha1.DeschedulerPolicy{
-		Strategies: v1alpha1.StrategyList{
-			"RemovePodsViolatingNodeTaints": v1alpha1.DeschedulerStrategy{
+	dp := &api.DeschedulerPolicy{
+		Strategies: api.StrategyList{
+			"RemovePodsViolatingNodeTaints": api.DeschedulerStrategy{
 				Enabled: true,
 			},
 		},
@@ -48,7 +40,21 @@ func TestTaintsUpdated(t *testing.T) {
 		t.Fatalf("Unable to initialize server: %v", err)
 	}
 	rs.Client = client
-	rs.EventClient = eventClient
+	rs.DeschedulingInterval = 100 * time.Millisecond
+	errChan := make(chan error, 1)
+	defer close(errChan)
+	go func() {
+		err := RunDeschedulerStrategies(ctx, rs, dp, "v1beta1")
+		errChan <- err
+	}()
+	select {
+	case err := <-errChan:
+		if err != nil {
+			t.Fatalf("Unable to run descheduler strategies: %v", err)
+		}
+	case <-time.After(1 * time.Second):
+		// Wait for few cycles and then verify the only pod still exists
+	}
 
 	pods, err := client.CoreV1().Pods(p1.Namespace).List(ctx, metav1.ListOptions{})
 	if err != nil {
@@ -71,81 +77,25 @@ func TestTaintsUpdated(t *testing.T) {
 		t.Fatalf("Unable to update node: %v\n", err)
 	}
 
-	var evictedPods []string
-	client.PrependReactor("create", "pods", podEvictionReactionFuc(&evictedPods))
+	if err := wait.PollImmediate(100*time.Millisecond, time.Second, func() (bool, error) {
+		// Get over evicted pod result in panic
+		//pods, err := client.CoreV1().Pods(p1.Namespace).Get(p1.Name, metav1.GetOptions{})
+		// List is better, it does not panic.
+		// Though once the pod is evicted, List starts to error with "can't assign or convert v1beta1.Eviction into v1.Pod"
+		pods, err := client.CoreV1().Pods(p1.Namespace).List(ctx, metav1.ListOptions{})
+		if err == nil {
+			if len(pods.Items) > 0 {
+				return false, nil
+			}
+			return true, nil
+		}
+		if strings.Contains(err.Error(), "can't assign or convert v1beta1.Eviction into v1.Pod") {
+			return true, nil
+		}
 
-	internalDeschedulerPolicy, err := V1alpha1ToInternal(client, dp, pluginbuilder.PluginRegistry)
-	if err != nil {
-		t.Fatalf("Unable to convert v1alpha1 to v1alpha2: %v", err)
-	}
-
-	if err := RunDeschedulerStrategies(ctx, rs, internalDeschedulerPolicy, "v1"); err != nil {
-		t.Fatalf("Unable to run descheduler strategies: %v", err)
-	}
-
-	if len(evictedPods) != 1 {
-		t.Fatalf("Unable to evict pod, node taint did not get propagated to descheduler strategies %v\n", err)
-	}
-}
-
-func TestDuplicate(t *testing.T) {
-	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	pluginbuilder.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicatesArgs{}, pluginbuilder.PluginRegistry)
-	ctx := context.Background()
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-	node2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
-
-	p1 := test.BuildTestPod("p1", 100, 0, node1.Name, nil)
-	p1.Namespace = "dev"
-	p2 := test.BuildTestPod("p2", 100, 0, node1.Name, nil)
-	p2.Namespace = "dev"
-	p3 := test.BuildTestPod("p3", 100, 0, node1.Name, nil)
-	p3.Namespace = "dev"
-
-	ownerRef1 := test.GetReplicaSetOwnerRefList()
-	p1.ObjectMeta.OwnerReferences = ownerRef1
-	p2.ObjectMeta.OwnerReferences = ownerRef1
-	p3.ObjectMeta.OwnerReferences = ownerRef1
-
-	client := fakeclientset.NewSimpleClientset(node1, node2, p1, p2, p3)
-	eventClient := fakeclientset.NewSimpleClientset(node1, node2, p1, p2, p3)
-	dp := &v1alpha1.DeschedulerPolicy{
-		Strategies: v1alpha1.StrategyList{
-			"RemoveDuplicates": v1alpha1.DeschedulerStrategy{
-				Enabled: true,
-			},
-		},
-	}
-
-	rs, err := options.NewDeschedulerServer()
-	if err != nil {
-		t.Fatalf("Unable to initialize server: %v", err)
-	}
-	rs.Client = client
-	rs.EventClient = eventClient
-
-	pods, err := client.CoreV1().Pods(p1.Namespace).List(ctx, metav1.ListOptions{})
-	if err != nil {
-		t.Errorf("Unable to list pods: %v", err)
-	}
-
-	if len(pods.Items) != 3 {
-		t.Errorf("Pods number should be 3 before evict")
-	}
-
-	var evictedPods []string
-	client.PrependReactor("create", "pods", podEvictionReactionFuc(&evictedPods))
-
-	internalDeschedulerPolicy, err := V1alpha1ToInternal(client, dp, pluginbuilder.PluginRegistry)
-	if err != nil {
-		t.Fatalf("Unable to convert v1alpha1 to v1alpha2: %v", err)
-	}
-	if err := RunDeschedulerStrategies(ctx, rs, internalDeschedulerPolicy, "v1"); err != nil {
-		t.Fatalf("Unable to run descheduler strategies: %v", err)
-	}
-
-	if len(evictedPods) == 0 {
-		t.Fatalf("Unable to evict pod, node taint did not get propagated to descheduler strategies %v\n", err)
+		return false, nil
+	}); err != nil {
+		t.Fatalf("Unable to evict pod, node taint did not get propagated to descheduler strategies")
 	}
 }
 
@@ -154,9 +104,8 @@ func TestRootCancel(t *testing.T) {
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
 	client := fakeclientset.NewSimpleClientset(n1, n2)
-	eventClient := fakeclientset.NewSimpleClientset(n1, n2)
 	dp := &api.DeschedulerPolicy{
-		Profiles: []api.Profile{}, // no strategies needed for this test
+		Strategies: api.StrategyList{}, // no strategies needed for this test
 	}
 
 	rs, err := options.NewDeschedulerServer()
@@ -164,13 +113,12 @@ func TestRootCancel(t *testing.T) {
 		t.Fatalf("Unable to initialize server: %v", err)
 	}
 	rs.Client = client
-	rs.EventClient = eventClient
 	rs.DeschedulingInterval = 100 * time.Millisecond
 	errChan := make(chan error, 1)
 	defer close(errChan)
 
 	go func() {
-		err := RunDeschedulerStrategies(ctx, rs, dp, "v1")
+		err := RunDeschedulerStrategies(ctx, rs, dp, "v1beta1")
 		errChan <- err
 	}()
 	cancel()
@@ -189,9 +137,8 @@ func TestRootCancelWithNoInterval(t *testing.T) {
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
 	client := fakeclientset.NewSimpleClientset(n1, n2)
-	eventClient := fakeclientset.NewSimpleClientset(n1, n2)
 	dp := &api.DeschedulerPolicy{
-		Profiles: []api.Profile{}, // no strategies needed for this test
+		Strategies: api.StrategyList{}, // no strategies needed for this test
 	}
 
 	rs, err := options.NewDeschedulerServer()
@@ -199,13 +146,12 @@ func TestRootCancelWithNoInterval(t *testing.T) {
 		t.Fatalf("Unable to initialize server: %v", err)
 	}
 	rs.Client = client
-	rs.EventClient = eventClient
 	rs.DeschedulingInterval = 0
 	errChan := make(chan error, 1)
 	defer close(errChan)
 
 	go func() {
-		err := RunDeschedulerStrategies(ctx, rs, dp, "v1")
+		err := RunDeschedulerStrategies(ctx, rs, dp, "v1beta1")
 		errChan <- err
 	}()
 	cancel()
@@ -218,18 +164,3 @@ func TestRootCancelWithNoInterval(t *testing.T) {
 		t.Fatal("Root ctx should have canceled immediately")
 	}
 }
-
-func podEvictionReactionFuc(evictedPods *[]string) func(action core.Action) (bool, runtime.Object, error) {
-	return func(action core.Action) (bool, runtime.Object, error) {
-		if action.GetSubresource() == "eviction" {
-			createAct, matched := action.(core.CreateActionImpl)
-			if !matched {
-				return false, nil, fmt.Errorf("unable to convert action to core.CreateActionImpl")
-			}
-			if eviction, matched := createAct.Object.(*policy.Eviction); matched {
-				*evictedPods = append(*evictedPods, eviction.GetName())
-			}
-		}
-		return false, nil, nil // fallback to the default reactor
-	}
-}

pkg/descheduler/evictions/evictions.go

@@ -19,36 +19,50 @@ package evictions
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
+	policy "k8s.io/api/policy/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/errors"
 	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/events"
+	"k8s.io/client-go/kubernetes/scheme"
+	clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
+	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/descheduler/metrics"
+	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
 
 	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
 )
 
-// nodePodEvictedCount keeps count of pods evicted on node
-type (
-	nodePodEvictedCount    map[string]uint
-	namespacePodEvictCount map[string]uint
+const (
+	evictPodAnnotationKey = "descheduler.alpha.kubernetes.io/evict"
 )
 
+// nodePodEvictedCount keeps count of pods evicted on node
+type nodePodEvictedCount map[*v1.Node]uint
+type namespacePodEvictCount map[string]uint
+
 type PodEvictor struct {
 	client                     clientset.Interface
 	nodes                      []*v1.Node
+	nodeIndexer                podutil.GetPodsAssignedToNodeFunc
 	policyGroupVersion         string
 	dryRun                     bool
 	maxPodsToEvictPerNode      *uint
 	maxPodsToEvictPerNamespace *uint
 	nodepodCount               nodePodEvictedCount
 	namespacePodCount          namespacePodEvictCount
+	evictFailedBarePods        bool
+	evictLocalStoragePods      bool
+	evictSystemCriticalPods    bool
+	ignorePvcPods              bool
 	metricsEnabled             bool
-	eventRecorder              events.EventRecorder
 }
 
 func NewPodEvictor(
@@ -58,33 +72,41 @@ func NewPodEvictor(
 	maxPodsToEvictPerNode *uint,
 	maxPodsToEvictPerNamespace *uint,
 	nodes []*v1.Node,
+	nodeIndexer podutil.GetPodsAssignedToNodeFunc,
+	evictLocalStoragePods bool,
+	evictSystemCriticalPods bool,
+	ignorePvcPods bool,
+	evictFailedBarePods bool,
 	metricsEnabled bool,
-	eventRecorder events.EventRecorder,
 ) *PodEvictor {
-	nodePodCount := make(nodePodEvictedCount)
-	namespacePodCount := make(namespacePodEvictCount)
+	var nodePodCount = make(nodePodEvictedCount)
+	var namespacePodCount = make(namespacePodEvictCount)
 	for _, node := range nodes {
 		// Initialize podsEvicted till now with 0.
-		nodePodCount[node.Name] = 0
+		nodePodCount[node] = 0
 	}
 
 	return &PodEvictor{
 		client:                     client,
 		nodes:                      nodes,
+		nodeIndexer:                nodeIndexer,
 		policyGroupVersion:         policyGroupVersion,
 		dryRun:                     dryRun,
 		maxPodsToEvictPerNode:      maxPodsToEvictPerNode,
 		maxPodsToEvictPerNamespace: maxPodsToEvictPerNamespace,
 		nodepodCount:               nodePodCount,
 		namespacePodCount:          namespacePodCount,
+		evictLocalStoragePods:      evictLocalStoragePods,
+		evictSystemCriticalPods:    evictSystemCriticalPods,
+		evictFailedBarePods:        evictFailedBarePods,
+		ignorePvcPods:              ignorePvcPods,
 		metricsEnabled:             metricsEnabled,
-		eventRecorder:              eventRecorder,
 	}
 }
 
 // NodeEvicted gives a number of pods evicted for node
 func (pe *PodEvictor) NodeEvicted(node *v1.Node) uint {
-	return pe.nodepodCount[node.Name]
+	return pe.nodepodCount[node]
 }
 
 // TotalEvicted gives a number of pods evicted through all nodes
@@ -96,80 +118,56 @@ func (pe *PodEvictor) TotalEvicted() uint {
 	return total
 }
 
-// NodeLimitExceeded checks if the number of evictions for a node was exceeded
-func (pe *PodEvictor) NodeLimitExceeded(node *v1.Node) bool {
-	if pe.maxPodsToEvictPerNode != nil {
-		return pe.nodepodCount[node.Name] == *pe.maxPodsToEvictPerNode
+// EvictPod returns non-nil error only when evicting a pod on a node is not
+// possible (due to maxPodsToEvictPerNode constraint). Success is true when the pod
+// is evicted on the server side.
+func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, node *v1.Node, strategy string, reasons ...string) (bool, error) {
+	reason := strategy
+	if len(reasons) > 0 {
+		reason += " (" + strings.Join(reasons, ", ") + ")"
 	}
-	return false
-}
-
-// EvictOptions provides a handle for passing additional info to EvictPod
-type EvictOptions struct {
-	// Reason allows for passing details about the specific eviction for logging.
-	Reason string
-}
-
-// EvictPod evicts a pod while exercising eviction limits.
-// Returns true when the pod is evicted on the server side.
-func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptions) bool {
-	// TODO: Replace context-propagated Strategy name with a defined framework handle for accessing Strategy info
-	strategy := ""
-	if ctx.Value("strategyName") != nil {
-		strategy = ctx.Value("strategyName").(string)
-	}
-
-	if pod.Spec.NodeName != "" {
-		if pe.maxPodsToEvictPerNode != nil && pe.nodepodCount[pod.Spec.NodeName]+1 > *pe.maxPodsToEvictPerNode {
-			if pe.metricsEnabled {
-				metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per node reached", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
-			}
-			klog.ErrorS(fmt.Errorf("Maximum number of evicted pods per node reached"), "limit", *pe.maxPodsToEvictPerNode, "node", pod.Spec.NodeName)
-			return false
+	if pe.maxPodsToEvictPerNode != nil && pe.nodepodCount[node]+1 > *pe.maxPodsToEvictPerNode {
+		if pe.metricsEnabled {
+			metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per node reached", "strategy": strategy, "namespace": pod.Namespace, "node": node.Name}).Inc()
 		}
+		return false, fmt.Errorf("Maximum number %v of evicted pods per %q node reached", *pe.maxPodsToEvictPerNode, node.Name)
 	}
 
 	if pe.maxPodsToEvictPerNamespace != nil && pe.namespacePodCount[pod.Namespace]+1 > *pe.maxPodsToEvictPerNamespace {
 		if pe.metricsEnabled {
-			metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per namespace reached", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
+			metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per namespace reached", "strategy": strategy, "namespace": pod.Namespace, "node": node.Name}).Inc()
 		}
-		klog.ErrorS(fmt.Errorf("Maximum number of evicted pods per namespace reached"), "limit", *pe.maxPodsToEvictPerNamespace, "namespace", pod.Namespace)
-		return false
+		return false, fmt.Errorf("Maximum number %v of evicted pods per %q namespace reached", *pe.maxPodsToEvictPerNamespace, pod.Namespace)
 	}
 
 	err := evictPod(ctx, pe.client, pod, pe.policyGroupVersion)
 	if err != nil {
 		// err is used only for logging purposes
-		klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod), "reason", opts.Reason)
+		klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod), "reason", reason)
 		if pe.metricsEnabled {
-			metrics.PodsEvicted.With(map[string]string{"result": "error", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
+			metrics.PodsEvicted.With(map[string]string{"result": "error", "strategy": strategy, "namespace": pod.Namespace, "node": node.Name}).Inc()
 		}
-		return false
+		return false, nil
 	}
 
-	if pod.Spec.NodeName != "" {
-		pe.nodepodCount[pod.Spec.NodeName]++
-	}
+	pe.nodepodCount[node]++
 	pe.namespacePodCount[pod.Namespace]++
 
 	if pe.metricsEnabled {
-		metrics.PodsEvicted.With(map[string]string{"result": "success", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
+		metrics.PodsEvicted.With(map[string]string{"result": "success", "strategy": strategy, "namespace": pod.Namespace, "node": node.Name}).Inc()
 	}
 
 	if pe.dryRun {
-		klog.V(1).InfoS("Evicted pod in dry run mode", "pod", klog.KObj(pod), "reason", opts.Reason, "strategy", strategy, "node", pod.Spec.NodeName)
+		klog.V(1).InfoS("Evicted pod in dry run mode", "pod", klog.KObj(pod), "reason", reason, "strategy", strategy, "node", node.Name)
 	} else {
-		klog.V(1).InfoS("Evicted pod", "pod", klog.KObj(pod), "reason", opts.Reason, "strategy", strategy, "node", pod.Spec.NodeName)
-		reason := opts.Reason
-		if len(reason) == 0 {
-			reason = strategy
-			if len(reason) == 0 {
-				reason = "NotSet"
-			}
-		}
-		pe.eventRecorder.Eventf(pod, nil, v1.EventTypeNormal, reason, "Descheduled", "pod evicted from %v node by sigs.k8s.io/descheduler", pod.Spec.NodeName)
+		klog.V(1).InfoS("Evicted pod", "pod", klog.KObj(pod), "reason", reason, "strategy", strategy, "node", node.Name)
+		eventBroadcaster := record.NewBroadcaster()
+		eventBroadcaster.StartStructuredLogging(3)
+		eventBroadcaster.StartRecordingToSink(&clientcorev1.EventSinkImpl{Interface: pe.client.CoreV1().Events(pod.Namespace)})
+		r := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "sigs.k8s.io.descheduler"})
+		r.Event(pod, v1.EventTypeNormal, "Descheduled", fmt.Sprintf("pod evicted by sigs.k8s.io/descheduler%s", reason))
 	}
-	return true
+	return true, nil
 }
 
 func evictPod(ctx context.Context, client clientset.Interface, pod *v1.Pod, policyGroupVersion string) error {
@@ -186,7 +184,7 @@ func evictPod(ctx context.Context, client clientset.Interface, pod *v1.Pod, poli
 		},
 		DeleteOptions: deleteOptions,
 	}
-	err := client.PolicyV1().Evictions(eviction.Namespace).Evict(ctx, eviction)
+	err := client.PolicyV1beta1().Evictions(eviction.Namespace).Evict(ctx, eviction)
 
 	if apierrors.IsTooManyRequests(err) {
 		return fmt.Errorf("error when evicting pod (ignoring) %q: %v", pod.Name, err)
@@ -196,3 +194,171 @@ func evictPod(ctx context.Context, client clientset.Interface, pod *v1.Pod, poli
 	}
 	return err
 }
+
+type Options struct {
+	priority      *int32
+	nodeFit       bool
+	labelSelector labels.Selector
+}
+
+// WithPriorityThreshold sets a threshold for pod's priority class.
+// Any pod whose priority class is lower is evictable.
+func WithPriorityThreshold(priority int32) func(opts *Options) {
+	return func(opts *Options) {
+		var p int32 = priority
+		opts.priority = &p
+	}
+}
+
+// WithNodeFit sets whether or not to consider taints, node selectors,
+// and pod affinity when evicting. A pod whose tolerations, node selectors,
+// and affinity match a node other than the one it is currently running on
+// is evictable.
+func WithNodeFit(nodeFit bool) func(opts *Options) {
+	return func(opts *Options) {
+		opts.nodeFit = nodeFit
+	}
+}
+
+// WithLabelSelector sets whether or not to apply label filtering when evicting.
+// Any pod matching the label selector is considered evictable.
+func WithLabelSelector(labelSelector labels.Selector) func(opts *Options) {
+	return func(opts *Options) {
+		opts.labelSelector = labelSelector
+	}
+}
+
+type constraint func(pod *v1.Pod) error
+
+type evictable struct {
+	constraints []constraint
+}
+
+// Evictable provides an implementation of IsEvictable(IsEvictable(pod *v1.Pod) bool).
+// The method accepts a list of options which allow to extend constraints
+// which decides when a pod is considered evictable.
+func (pe *PodEvictor) Evictable(opts ...func(opts *Options)) *evictable {
+	options := &Options{}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	ev := &evictable{}
+	if pe.evictFailedBarePods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			ownerRefList := podutil.OwnerRef(pod)
+			// Enable evictFailedBarePods to evict bare pods in failed phase
+			if len(ownerRefList) == 0 && pod.Status.Phase != v1.PodFailed {
+				return fmt.Errorf("pod does not have any ownerRefs and is not in failed phase")
+			}
+			return nil
+		})
+	} else {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			ownerRefList := podutil.OwnerRef(pod)
+			// Moved from IsEvictable function for backward compatibility
+			if len(ownerRefList) == 0 {
+				return fmt.Errorf("pod does not have any ownerRefs")
+			}
+			return nil
+		})
+	}
+	if !pe.evictSystemCriticalPods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			// Moved from IsEvictable function to allow for disabling
+			if utils.IsCriticalPriorityPod(pod) {
+				return fmt.Errorf("pod has system critical priority")
+			}
+			return nil
+		})
+
+		if options.priority != nil {
+			ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+				if IsPodEvictableBasedOnPriority(pod, *options.priority) {
+					return nil
+				}
+				return fmt.Errorf("pod has higher priority than specified priority class threshold")
+			})
+		}
+	}
+	if !pe.evictLocalStoragePods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if utils.IsPodWithLocalStorage(pod) {
+				return fmt.Errorf("pod has local storage and descheduler is not configured with evictLocalStoragePods")
+			}
+			return nil
+		})
+	}
+	if pe.ignorePvcPods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if utils.IsPodWithPVC(pod) {
+				return fmt.Errorf("pod has a PVC and descheduler is configured to ignore PVC pods")
+			}
+			return nil
+		})
+	}
+	if options.nodeFit {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if !nodeutil.PodFitsAnyOtherNode(pe.nodeIndexer, pod, pe.nodes) {
+				return fmt.Errorf("pod does not fit on any other node because of nodeSelector(s), Taint(s), or nodes marked as unschedulable")
+			}
+			return nil
+		})
+	}
+	if options.labelSelector != nil && !options.labelSelector.Empty() {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if !options.labelSelector.Matches(labels.Set(pod.Labels)) {
+				return fmt.Errorf("pod labels do not match the labelSelector filter in the policy parameter")
+			}
+			return nil
+		})
+	}
+
+	return ev
+}
+
+// IsEvictable decides when a pod is evictable
+func (ev *evictable) IsEvictable(pod *v1.Pod) bool {
+	checkErrs := []error{}
+
+	ownerRefList := podutil.OwnerRef(pod)
+	if utils.IsDaemonsetPod(ownerRefList) {
+		checkErrs = append(checkErrs, fmt.Errorf("pod is a DaemonSet pod"))
+	}
+
+	if utils.IsMirrorPod(pod) {
+		checkErrs = append(checkErrs, fmt.Errorf("pod is a mirror pod"))
+	}
+
+	if utils.IsStaticPod(pod) {
+		checkErrs = append(checkErrs, fmt.Errorf("pod is a static pod"))
+	}
+
+	if utils.IsPodTerminating(pod) {
+		checkErrs = append(checkErrs, fmt.Errorf("pod is terminating"))
+	}
+
+	for _, c := range ev.constraints {
+		if err := c(pod); err != nil {
+			checkErrs = append(checkErrs, err)
+		}
+	}
+
+	if len(checkErrs) > 0 && !HaveEvictAnnotation(pod) {
+		klog.V(4).InfoS("Pod lacks an eviction annotation and fails the following checks", "pod", klog.KObj(pod), "checks", errors.NewAggregate(checkErrs).Error())
+		return false
+	}
+
+	return true
+}
+
+// HaveEvictAnnotation checks if the pod have evict annotation
+func HaveEvictAnnotation(pod *v1.Pod) bool {
+	_, found := pod.ObjectMeta.Annotations[evictPodAnnotationKey]
+	return found
+}
+
+// IsPodEvictableBasedOnPriority checks if the given pod is evictable based on priority resolved from pod Spec.
+func IsPodEvictableBasedOnPriority(pod *v1.Pod, priority int32) bool {
+	return pod.Spec.Priority == nil || *pod.Spec.Priority < priority
+}

pkg/descheduler/evictions/evictions_test.go

@@ -21,8 +21,10 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
+	policyv1 "k8s.io/api/policy/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
@@ -69,6 +71,603 @@ func TestEvictPod(t *testing.T) {
 	}
 }
 
+func TestIsEvictable(t *testing.T) {
+	n1 := test.BuildTestNode("node1", 1000, 2000, 13, nil)
+	lowPriority := int32(800)
+	highPriority := int32(900)
+
+	nodeTaintKey := "hardware"
+	nodeTaintValue := "gpu"
+
+	nodeLabelKey := "datacenter"
+	nodeLabelValue := "east"
+	type testCase struct {
+		description             string
+		pods                    []*v1.Pod
+		nodes                   []*v1.Node
+		evictFailedBarePods     bool
+		evictLocalStoragePods   bool
+		evictSystemCriticalPods bool
+		priorityThreshold       *int32
+		nodeFit                 bool
+		result                  bool
+	}
+
+	testCases := []testCase{
+		{
+			description: "Failed pod eviction with no ownerRefs",
+			pods: []*v1.Pod{
+				test.BuildTestPod("bare_pod_failed", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Status.Phase = v1.PodFailed
+				}),
+			},
+			evictFailedBarePods: false,
+			result:              false,
+		}, {
+			description:         "Normal pod eviction with no ownerRefs and evictFailedBarePods enabled",
+			pods:                []*v1.Pod{test.BuildTestPod("bare_pod", 400, 0, n1.Name, nil)},
+			evictFailedBarePods: true,
+			result:              false,
+		}, {
+			description: "Failed pod eviction with no ownerRefs",
+			pods: []*v1.Pod{
+				test.BuildTestPod("bare_pod_failed_but_can_be_evicted", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Status.Phase = v1.PodFailed
+				}),
+			},
+			evictFailedBarePods: true,
+			result:              true,
+		}, {
+			description: "Normal pod eviction with normal ownerRefs",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Normal pod eviction with normal ownerRefs and descheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p2", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Normal pod eviction with replicaSet ownerRefs",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p3", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Normal pod eviction with replicaSet ownerRefs and descheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p4", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.ObjectMeta.OwnerReferences = test.GetReplicaSetOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Normal pod eviction with statefulSet ownerRefs",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p18", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Normal pod eviction with statefulSet ownerRefs and descheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p19", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.ObjectMeta.OwnerReferences = test.GetStatefulSetOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod not evicted because it is bound to a PV and evictLocalStoragePods = false",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p5", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Volumes = []v1.Volume{
+						{
+							Name: "sample",
+							VolumeSource: v1.VolumeSource{
+								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
+								EmptyDir: &v1.EmptyDirVolumeSource{
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
+							},
+						},
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  false,
+		}, {
+			description: "Pod is evicted because it is bound to a PV and evictLocalStoragePods = true",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p6", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Volumes = []v1.Volume{
+						{
+							Name: "sample",
+							VolumeSource: v1.VolumeSource{
+								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
+								EmptyDir: &v1.EmptyDirVolumeSource{
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
+							},
+						},
+					}
+				}),
+			},
+			evictLocalStoragePods:   true,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod is evicted because it is bound to a PV and evictLocalStoragePods = false, but it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p7", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Volumes = []v1.Volume{
+						{
+							Name: "sample",
+							VolumeSource: v1.VolumeSource{
+								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
+								EmptyDir: &v1.EmptyDirVolumeSource{
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
+							},
+						},
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod not evicted becasuse it is part of a daemonSet",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p8", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.ObjectMeta.OwnerReferences = test.GetDaemonSetOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  false,
+		}, {
+			description: "Pod is evicted becasuse it is part of a daemonSet, but it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p9", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.ObjectMeta.OwnerReferences = test.GetDaemonSetOwnerRefList()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod not evicted becasuse it is a mirror poddsa",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p10", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Annotations = test.GetMirrorPodAnnotation()
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  false,
+		}, {
+			description: "Pod is evicted becasuse it is a mirror pod, but it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p11", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Annotations = test.GetMirrorPodAnnotation()
+					pod.Annotations["descheduler.alpha.kubernetes.io/evict"] = "true"
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod not evicted becasuse it has system critical priority",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p12", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  false,
+		}, {
+			description: "Pod is evicted becasuse it has system critical priority, but it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p13", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
+					pod.Annotations = map[string]string{
+						"descheduler.alpha.kubernetes.io/evict": "true",
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			result:                  true,
+		}, {
+			description: "Pod not evicted becasuse it has a priority higher than the configured priority threshold",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p14", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Priority = &highPriority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			priorityThreshold:       &lowPriority,
+			result:                  false,
+		}, {
+			description: "Pod is evicted becasuse it has a priority higher than the configured priority threshold, but it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p15", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.Spec.Priority = &highPriority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			priorityThreshold:       &lowPriority,
+			result:                  true,
+		}, {
+			description: "Pod is evicted becasuse it has system critical priority, but evictSystemCriticalPods = true",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p16", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: true,
+			result:                  true,
+		}, {
+			description: "Pod is evicted becasuse it has system critical priority, but evictSystemCriticalPods = true and it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p16", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: true,
+			result:                  true,
+		}, {
+			description: "Pod is evicted becasuse it has a priority higher than the configured priority threshold, but evictSystemCriticalPods = true",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p17", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Priority = &highPriority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: true,
+			priorityThreshold:       &lowPriority,
+			result:                  true,
+		}, {
+			description: "Pod is evicted becasuse it has a priority higher than the configured priority threshold, but evictSystemCriticalPods = true and it has scheduler.alpha.kubernetes.io/evict annotation",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p17", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Annotations = map[string]string{"descheduler.alpha.kubernetes.io/evict": "true"}
+					pod.Spec.Priority = &highPriority
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: true,
+			priorityThreshold:       &lowPriority,
+			result:                  true,
+		}, {
+			description: "Pod with no tolerations running on normal node, all other nodes tainted",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 1000, 2000, 13, func(node *v1.Node) {
+					node.Spec.Taints = []v1.Taint{
+						{
+							Key:    nodeTaintKey,
+							Value:  nodeTaintValue,
+							Effect: v1.TaintEffectNoSchedule,
+						},
+					}
+				}),
+				test.BuildTestNode("node3", 1000, 2000, 13, func(node *v1.Node) {
+					node.Spec.Taints = []v1.Taint{
+						{
+							Key:    nodeTaintKey,
+							Value:  nodeTaintValue,
+							Effect: v1.TaintEffectNoSchedule,
+						},
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  false,
+		}, {
+			description: "Pod with correct tolerations running on normal node, all other nodes tainted",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.Tolerations = []v1.Toleration{
+						{
+							Key:    nodeTaintKey,
+							Value:  nodeTaintValue,
+							Effect: v1.TaintEffectNoSchedule,
+						},
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 1000, 2000, 13, func(node *v1.Node) {
+					node.Spec.Taints = []v1.Taint{
+						{
+							Key:    nodeTaintKey,
+							Value:  nodeTaintValue,
+							Effect: v1.TaintEffectNoSchedule,
+						},
+					}
+				}),
+				test.BuildTestNode("node3", 1000, 2000, 13, func(node *v1.Node) {
+					node.Spec.Taints = []v1.Taint{
+						{
+							Key:    nodeTaintKey,
+							Value:  nodeTaintValue,
+							Effect: v1.TaintEffectNoSchedule,
+						},
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  true,
+		}, {
+			description: "Pod with incorrect node selector",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.NodeSelector = map[string]string{
+						nodeLabelKey: "fail",
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 1000, 2000, 13, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestNode("node3", 1000, 2000, 13, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  false,
+		}, {
+			description: "Pod with correct node selector",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 400, 0, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.NodeSelector = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 1000, 2000, 13, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestNode("node3", 1000, 2000, 13, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  true,
+		}, {
+			description: "Pod with correct node selector, but only available node doesn't have enough CPU",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 12, 8, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.NodeSelector = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2-TEST", 10, 16, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestNode("node3-TEST", 10, 16, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  false,
+		}, {
+			description: "Pod with correct node selector, and one node has enough memory",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 12, 8, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.NodeSelector = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestPod("node2-pod-10GB-mem", 20, 10, "node2", func(pod *v1.Pod) {
+					pod.ObjectMeta.Labels = map[string]string{
+						"test": "true",
+					}
+				}),
+				test.BuildTestPod("node3-pod-10GB-mem", 20, 10, "node3", func(pod *v1.Pod) {
+					pod.ObjectMeta.Labels = map[string]string{
+						"test": "true",
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 100, 16, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestNode("node3", 100, 20, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  true,
+		}, {
+			description: "Pod with correct node selector, but both nodes don't have enough memory",
+			pods: []*v1.Pod{
+				test.BuildTestPod("p1", 12, 8, n1.Name, func(pod *v1.Pod) {
+					pod.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
+					pod.Spec.NodeSelector = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestPod("node2-pod-10GB-mem", 10, 10, "node2", func(pod *v1.Pod) {
+					pod.ObjectMeta.Labels = map[string]string{
+						"test": "true",
+					}
+				}),
+				test.BuildTestPod("node3-pod-10GB-mem", 10, 10, "node3", func(pod *v1.Pod) {
+					pod.ObjectMeta.Labels = map[string]string{
+						"test": "true",
+					}
+				}),
+			},
+			nodes: []*v1.Node{
+				test.BuildTestNode("node2", 100, 16, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+				test.BuildTestNode("node3", 100, 16, 10, func(node *v1.Node) {
+					node.ObjectMeta.Labels = map[string]string{
+						nodeLabelKey: nodeLabelValue,
+					}
+				}),
+			},
+			evictLocalStoragePods:   false,
+			evictSystemCriticalPods: false,
+			nodeFit:                 true,
+			result:                  false,
+		},
+	}
+
+	for _, test := range testCases {
+
+		t.Run(test.description, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			nodes := append(test.nodes, n1)
+
+			var objs []runtime.Object
+			for _, node := range test.nodes {
+				objs = append(objs, node)
+			}
+			for _, pod := range test.pods {
+				objs = append(objs, pod)
+			}
+
+			fakeClient := fake.NewSimpleClientset(objs...)
+
+			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
+			podInformer := sharedInformerFactory.Core().V1().Pods()
+
+			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
+			if err != nil {
+				t.Errorf("Build get pods assigned to node function error: %v", err)
+			}
+
+			sharedInformerFactory.Start(ctx.Done())
+			sharedInformerFactory.WaitForCacheSync(ctx.Done())
+
+			podEvictor := &PodEvictor{
+				client:                     fakeClient,
+				nodes:                      nodes,
+				nodeIndexer:                getPodsAssignedToNode,
+				policyGroupVersion:         policyv1.SchemeGroupVersion.String(),
+				dryRun:                     false,
+				maxPodsToEvictPerNode:      nil,
+				maxPodsToEvictPerNamespace: nil,
+				evictLocalStoragePods:      test.evictLocalStoragePods,
+				evictSystemCriticalPods:    test.evictSystemCriticalPods,
+				evictFailedBarePods:        test.evictFailedBarePods,
+			}
+
+			var opts []func(opts *Options)
+			if test.priorityThreshold != nil {
+				opts = append(opts, WithPriorityThreshold(*test.priorityThreshold))
+			}
+			if test.nodeFit {
+				opts = append(opts, WithNodeFit(true))
+			}
+			evictable := podEvictor.Evictable(opts...)
+
+			result := evictable.IsEvictable(test.pods[0])
+			if result != test.result {
+				t.Errorf("IsEvictable should return for pod %s %t, but it returns %t", test.pods[0].Name, test.result, result)
+			}
+		})
+	}
+}
 func TestPodTypes(t *testing.T) {
 	n1 := test.BuildTestNode("node1", 1000, 2000, 9, nil)
 	p1 := test.BuildTestPod("p1", 400, 0, n1.Name, nil)
@@ -81,7 +680,7 @@ func TestPodTypes(t *testing.T) {
 	p1.ObjectMeta.OwnerReferences = test.GetReplicaSetOwnerRefList()
 	// The following 4 pods won't get evicted.
 	// A daemonset.
-	// p2.Annotations = test.GetDaemonSetAnnotation()
+	//p2.Annotations = test.GetDaemonSetAnnotation()
 	p2.ObjectMeta.OwnerReferences = test.GetDaemonSetOwnerRefList()
 	// A pod with local storage.
 	p3.ObjectMeta.OwnerReferences = test.GetNormalPodOwnerRefList()
@@ -91,8 +690,7 @@ func TestPodTypes(t *testing.T) {
 			VolumeSource: v1.VolumeSource{
 				HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 				EmptyDir: &v1.EmptyDirVolumeSource{
-					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-				},
+					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 			},
 		},
 	}
@@ -112,4 +710,5 @@ func TestPodTypes(t *testing.T) {
 	if utils.IsDaemonsetPod(ownerRefList) || utils.IsPodWithLocalStorage(p1) || utils.IsCriticalPriorityPod(p1) || utils.IsMirrorPod(p1) || utils.IsStaticPod(p1) {
 		t.Errorf("Expected p1 to be a normal pod.")
 	}
+
 }

pkg/descheduler/leaderelection.go

@@ -19,14 +19,13 @@ package descheduler
 import (
 	"context"
 	"fmt"
-	"os"
-
 	"k8s.io/apimachinery/pkg/util/uuid"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	componentbaseconfig "k8s.io/component-base/config"
 	"k8s.io/klog/v2"
+	"os"
 )
 
 // NewLeaderElection starts the leader election code loop

pkg/descheduler/node/node.go

@@ -24,8 +24,8 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	coreinformers "k8s.io/client-go/informers/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
-	listersv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/klog/v2"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/utils"
@@ -33,7 +33,7 @@ import (
 
 // ReadyNodes returns ready nodes irrespective of whether they are
 // schedulable or not.
-func ReadyNodes(ctx context.Context, client clientset.Interface, nodeLister listersv1.NodeLister, nodeSelector string) ([]*v1.Node, error) {
+func ReadyNodes(ctx context.Context, client clientset.Interface, nodeInformer coreinformers.NodeInformer, nodeSelector string) ([]*v1.Node, error) {
 	ns, err := labels.Parse(nodeSelector)
 	if err != nil {
 		return []*v1.Node{}, err
@@ -41,7 +41,7 @@ func ReadyNodes(ctx context.Context, client clientset.Interface, nodeLister list
 
 	var nodes []*v1.Node
 	// err is defined above
-	if nodes, err = nodeLister.List(ns); err != nil {
+	if nodes, err = nodeInformer.Lister().List(ns); err != nil {
 		return []*v1.Node{}, err
 	}
 
@@ -119,11 +119,9 @@ func NodeFit(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v
 		errors = append(errors, fmt.Errorf("pod does not tolerate taints on the node"))
 	}
 	// Check if the pod can fit on a node based off it's requests
-	if pod.Spec.NodeName == "" || pod.Spec.NodeName != node.Name {
-		ok, reqErrors := fitsRequest(nodeIndexer, pod, node)
-		if !ok {
-			errors = append(errors, reqErrors...)
-		}
+	ok, reqErrors := fitsRequest(nodeIndexer, pod, node)
+	if !ok {
+		errors = append(errors, reqErrors...)
 	}
 	// Check if node is schedulable
 	if IsNodeUnschedulable(node) {

pkg/descheduler/node/node_test.go

@@ -56,6 +56,7 @@ func TestReadyNodes(t *testing.T) {
 	if IsReady(node5) {
 		t.Errorf("Expected %v to be not ready", node5.Name)
 	}
+
 }
 
 func TestReadyNodesWithNodeSelector(t *testing.T) {
@@ -69,14 +70,14 @@ func TestReadyNodesWithNodeSelector(t *testing.T) {
 	nodeSelector := "type=compute"
 
 	sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
+	nodeInformer := sharedInformerFactory.Core().V1().Nodes()
 
 	stopChannel := make(chan struct{})
 	sharedInformerFactory.Start(stopChannel)
 	sharedInformerFactory.WaitForCacheSync(stopChannel)
 	defer close(stopChannel)
 
-	nodes, _ := ReadyNodes(ctx, fakeClient, nodeLister, nodeSelector)
+	nodes, _ := ReadyNodes(ctx, fakeClient, nodeInformer, nodeSelector)
 
 	if nodes[0].Name != "node1" {
 		t.Errorf("Expected node1, got %s", nodes[0].Name)
@@ -110,9 +111,11 @@ func TestIsNodeUnschedulable(t *testing.T) {
 			t.Errorf("Test %#v failed", test.description)
 		}
 	}
+
 }
 
 func TestPodFitsCurrentNode(t *testing.T) {
+
 	nodeLabelKey := "kubernetes.io/desiredNode"
 	nodeLabelValue := "yes"
 
@@ -204,7 +207,7 @@ func TestPodFitsCurrentNode(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -734,7 +737,7 @@ func TestPodFitsAnyOtherNode(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -753,7 +756,7 @@ func TestPodFitsAnyOtherNode(t *testing.T) {
 }
 
 // createResourceList builds a small resource list of core resources
-func createResourceList(cpu, memory, ephemeralStorage int64) v1.ResourceList {
+func createResourceList(cpu int64, memory int64, ephemeralStorage int64) v1.ResourceList {
 	resourceList := make(map[v1.ResourceName]resource.Quantity)
 	resourceList[v1.ResourceCPU] = *resource.NewMilliQuantity(cpu, resource.DecimalSI)
 	resourceList[v1.ResourceMemory] = *resource.NewQuantity(memory, resource.DecimalSI)

pkg/descheduler/pod/pods.go

@@ -23,6 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/sets"
+	coreinformers "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/tools/cache"
 
 	"sigs.k8s.io/descheduler/pkg/utils"
@@ -117,9 +118,9 @@ func (o *Options) BuildFilterFunc() (FilterFunc, error) {
 
 // BuildGetPodsAssignedToNodeFunc establishes an indexer to map the pods and their assigned nodes.
 // It returns a function to help us get all the pods that assigned to a node based on the indexer.
-func BuildGetPodsAssignedToNodeFunc(podInformer cache.SharedIndexInformer) (GetPodsAssignedToNodeFunc, error) {
+func BuildGetPodsAssignedToNodeFunc(podInformer coreinformers.PodInformer) (GetPodsAssignedToNodeFunc, error) {
 	// Establish an indexer to map the pods and their assigned nodes.
-	err := podInformer.AddIndexers(cache.Indexers{
+	err := podInformer.Informer().AddIndexers(cache.Indexers{
 		nodeNameKeyIndex: func(obj interface{}) ([]string, error) {
 			pod, ok := obj.(*v1.Pod)
 			if !ok {
@@ -136,7 +137,7 @@ func BuildGetPodsAssignedToNodeFunc(podInformer cache.SharedIndexInformer) (GetP
 	}
 
 	// The indexer helps us get all the pods that assigned to a node.
-	podIndexer := podInformer.GetIndexer()
+	podIndexer := podInformer.Informer().GetIndexer()
 	getPodsAssignedToNode := func(nodeName string, filter FilterFunc) ([]*v1.Pod, error) {
 		objs, err := podIndexer.ByIndex(nodeNameKeyIndex, nodeName)
 		if err != nil {
@@ -227,10 +228,3 @@ func SortPodsBasedOnPriorityLowToHigh(pods []*v1.Pod) {
 		return *pods[i].Spec.Priority < *pods[j].Spec.Priority
 	})
 }
-
-// SortPodsBasedOnAge sorts Pods from oldest to most recent in place
-func SortPodsBasedOnAge(pods []*v1.Pod) {
-	sort.Slice(pods, func(i, j int) bool {
-		return pods[i].CreationTimestamp.Before(&pods[j].CreationTimestamp)
-	})
-}

pkg/descheduler/pod/pods_test.go

@@ -18,10 +18,8 @@ package pod
 
 import (
 	"context"
-	"fmt"
 	"reflect"
 	"testing"
-	"time"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -94,7 +92,7 @@ func TestListPodsOnANode(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -156,23 +154,3 @@ func TestSortPodsBasedOnPriorityLowToHigh(t *testing.T) {
 		t.Errorf("Expected last pod in sorted list to be %v which of highest priority and guaranteed but got %v", p4, podList[len(podList)-1])
 	}
 }
-
-func TestSortPodsBasedOnAge(t *testing.T) {
-	podList := make([]*v1.Pod, 9)
-	n1 := test.BuildTestNode("n1", 4000, 3000, int64(len(podList)), nil)
-
-	for i := 0; i < len(podList); i++ {
-		podList[i] = test.BuildTestPod(fmt.Sprintf("p%d", i), 1, 32, n1.Name, func(pod *v1.Pod) {
-			creationTimestamp := metav1.Now().Add(time.Minute * time.Duration(-i))
-			pod.ObjectMeta.SetCreationTimestamp(metav1.NewTime(creationTimestamp))
-		})
-	}
-
-	SortPodsBasedOnAge(podList)
-
-	for i := 0; i < len(podList)-1; i++ {
-		if podList[i+1].CreationTimestamp.Before(&podList[i].CreationTimestamp) {
-			t.Errorf("Expected pods to be sorted by age but pod at index %d was older than %d", i+1, i)
-		}
-	}
-}

pkg/descheduler/policyconfig.go

@@ -17,30 +17,24 @@ limitations under the License.
 package descheduler
 
 import (
-	"context"
 	"fmt"
-	"os"
+	"io/ioutil"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
 	"sigs.k8s.io/descheduler/pkg/descheduler/scheme"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
-func LoadPolicyConfig(policyConfigFile string, client clientset.Interface, registry pluginbuilder.Registry) (*api.DeschedulerPolicy, error) {
+func LoadPolicyConfig(policyConfigFile string) (*api.DeschedulerPolicy, error) {
 	if policyConfigFile == "" {
 		klog.V(1).InfoS("Policy config file not specified")
 		return nil, nil
 	}
 
-	policy, err := os.ReadFile(policyConfigFile)
+	policy, err := ioutil.ReadFile(policyConfigFile)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read policy config file %q: %+v", policyConfigFile, err)
 	}
@@ -52,164 +46,10 @@ func LoadPolicyConfig(policyConfigFile string, client clientset.Interface, regis
 		return nil, fmt.Errorf("failed decoding descheduler's policy config %q: %v", policyConfigFile, err)
 	}
 
-	// Build profiles
-	internalPolicy, err := V1alpha1ToInternal(client, versionedPolicy, registry)
-	if err != nil {
+	internalPolicy := &api.DeschedulerPolicy{}
+	if err := scheme.Scheme.Convert(versionedPolicy, internalPolicy, nil); err != nil {
 		return nil, fmt.Errorf("failed converting versioned policy to internal policy version: %v", err)
 	}
 
 	return internalPolicy, nil
 }
-
-func V1alpha1ToInternal(
-	client clientset.Interface,
-	deschedulerPolicy *v1alpha1.DeschedulerPolicy,
-	registry pluginbuilder.Registry,
-) (*api.DeschedulerPolicy, error) {
-	var evictLocalStoragePods bool
-	if deschedulerPolicy.EvictLocalStoragePods != nil {
-		evictLocalStoragePods = *deschedulerPolicy.EvictLocalStoragePods
-	}
-
-	evictBarePods := false
-	if deschedulerPolicy.EvictFailedBarePods != nil {
-		evictBarePods = *deschedulerPolicy.EvictFailedBarePods
-		if evictBarePods {
-			klog.V(1).InfoS("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
-		}
-	}
-
-	evictSystemCriticalPods := false
-	if deschedulerPolicy.EvictSystemCriticalPods != nil {
-		evictSystemCriticalPods = *deschedulerPolicy.EvictSystemCriticalPods
-		if evictSystemCriticalPods {
-			klog.V(1).InfoS("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.")
-		}
-	}
-
-	ignorePvcPods := false
-	if deschedulerPolicy.IgnorePVCPods != nil {
-		ignorePvcPods = *deschedulerPolicy.IgnorePVCPods
-	}
-
-	var profiles []api.Profile
-
-	// Build profiles
-	for name, strategy := range deschedulerPolicy.Strategies {
-		if _, ok := pluginbuilder.PluginRegistry[string(name)]; ok {
-			if strategy.Enabled {
-				params := strategy.Params
-				if params == nil {
-					params = &v1alpha1.StrategyParameters{}
-				}
-
-				nodeFit := false
-				if name != "PodLifeTime" {
-					nodeFit = params.NodeFit
-				}
-
-				// TODO(jchaloup): once all strategies are migrated move this check under
-				// the default evictor args validation
-				if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
-					klog.ErrorS(fmt.Errorf("priority threshold misconfigured"), "only one of priorityThreshold fields can be set", "pluginName", name)
-					return nil, fmt.Errorf("priority threshold misconfigured for plugin %v", name)
-				}
-				var priorityThreshold *api.PriorityThreshold
-				if strategy.Params != nil {
-					priorityThreshold = &api.PriorityThreshold{
-						Value: strategy.Params.ThresholdPriority,
-						Name:  strategy.Params.ThresholdPriorityClassName,
-					}
-				}
-				thresholdPriority, err := utils.GetPriorityFromStrategyParams(context.TODO(), client, priorityThreshold)
-				if err != nil {
-					klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
-					return nil, fmt.Errorf("failed to get threshold priority from strategy's params: %v", err)
-				}
-
-				var pluginConfig *api.PluginConfig
-				if pcFnc, exists := strategyParamsToPluginArgs[string(name)]; exists {
-					pluginConfig, err = pcFnc(params)
-					if err != nil {
-						klog.ErrorS(err, "skipping strategy", "strategy", name)
-						return nil, fmt.Errorf("failed to get plugin config for strategy %v: %v", name, err)
-					}
-				} else {
-					klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
-					return nil, fmt.Errorf("unknown strategy name: %v", name)
-				}
-
-				profile := api.Profile{
-					Name: fmt.Sprintf("strategy-%v-profile", name),
-					PluginConfigs: []api.PluginConfig{
-						{
-							Name: defaultevictor.PluginName,
-							Args: &defaultevictor.DefaultEvictorArgs{
-								EvictLocalStoragePods:   evictLocalStoragePods,
-								EvictSystemCriticalPods: evictSystemCriticalPods,
-								IgnorePvcPods:           ignorePvcPods,
-								EvictFailedBarePods:     evictBarePods,
-								NodeFit:                 nodeFit,
-								PriorityThreshold: &api.PriorityThreshold{
-									Value: &thresholdPriority,
-								},
-							},
-						},
-						*pluginConfig,
-					},
-					Plugins: api.Plugins{
-						Evict: api.PluginSet{
-							Enabled: []string{defaultevictor.PluginName},
-						},
-					},
-				}
-
-				pluginArgs := registry[string(name)].PluginArgInstance
-				pluginInstance, err := registry[string(name)].PluginBuilder(pluginArgs, &handleImpl{})
-				if err != nil {
-					klog.ErrorS(fmt.Errorf("could not build plugin"), "plugin build error", "plugin", name)
-					return nil, fmt.Errorf("could not build plugin: %v", name)
-				}
-
-				// pluginInstance can be of any of each type, or both
-				profilePlugins := profile.Plugins
-				profile.Plugins = enableProfilePluginsByType(profilePlugins, pluginInstance, pluginConfig)
-				profiles = append(profiles, profile)
-			}
-		} else {
-			klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
-			return nil, fmt.Errorf("unknown strategy name: %v", name)
-		}
-	}
-
-	return &api.DeschedulerPolicy{
-		Profiles:                       profiles,
-		NodeSelector:                   deschedulerPolicy.NodeSelector,
-		MaxNoOfPodsToEvictPerNode:      deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
-		MaxNoOfPodsToEvictPerNamespace: deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
-	}, nil
-}
-
-func enableProfilePluginsByType(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	profilePlugins = checkBalance(profilePlugins, pluginInstance, pluginConfig)
-	profilePlugins = checkDeschedule(profilePlugins, pluginInstance, pluginConfig)
-	return profilePlugins
-}
-
-func checkBalance(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	switch p := pluginInstance.(type) {
-	case framework.BalancePlugin:
-		klog.V(3).Info("converting Balance plugin: %s", p.Name())
-		profilePlugins.Balance.Enabled = []string{pluginConfig.Name}
-	}
-	return profilePlugins
-}
-
-func checkDeschedule(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	switch p := pluginInstance.(type) {
-	case framework.DeschedulePlugin:
-		klog.V(3).Info("converting Deschedule plugin: %s", p.Name())
-		profilePlugins.Deschedule.Enabled = []string{pluginConfig.Name}
-	}
-	return profilePlugins
-}

pkg/descheduler/policyconfig_test.go

@@ -1,701 +0,0 @@
-/*
-Copyright 2017 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 descheduler
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	fakeclientset "k8s.io/client-go/kubernetes/fake"
-	utilpointer "k8s.io/utils/pointer"
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
-	"sigs.k8s.io/descheduler/pkg/utils"
-)
-
-func TestV1alpha1ToV1alpha2(t *testing.T) {
-	SetupPlugins()
-	defaultEvictorPluginConfig := api.PluginConfig{
-		Name: defaultevictor.PluginName,
-		Args: &defaultevictor.DefaultEvictorArgs{
-			PriorityThreshold: &api.PriorityThreshold{
-				Value: utilpointer.Int32(utils.SystemCriticalPriority),
-			},
-		},
-	}
-	defaultEvictorPluginSet := api.PluginSet{
-		Enabled: []string{defaultevictor.PluginName},
-	}
-	type testCase struct {
-		description string
-		policy      *v1alpha1.DeschedulerPolicy
-		err         error
-		result      *api.DeschedulerPolicy
-	}
-	testCases := []testCase{
-		{
-			description: "RemoveFailedPods enabled, LowNodeUtilization disabled strategies to profile",
-			policy: &v1alpha1.DeschedulerPolicy{
-				Strategies: v1alpha1.StrategyList{
-					removeduplicates.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							Namespaces: &v1alpha1.Namespaces{
-								Exclude: []string{
-									"test2",
-								},
-							},
-						},
-					},
-					nodeutilization.LowNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: false,
-						Params: &v1alpha1.StrategyParameters{
-							NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-								Thresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(20),
-									"memory": v1alpha1.Percentage(20),
-									"pods":   v1alpha1.Percentage(20),
-								},
-								TargetThresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(50),
-									"memory": v1alpha1.Percentage(50),
-									"pods":   v1alpha1.Percentage(50),
-								},
-							},
-						},
-					},
-				},
-			},
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.Profile{
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removeduplicates.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removeduplicates.PluginName,
-								Args: &removeduplicates.RemoveDuplicatesArgs{
-									Namespaces: &api.Namespaces{
-										Exclude: []string{
-											"test2",
-										},
-									},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{removeduplicates.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					// Disabled strategy is not generating internal plugin since it is not being used internally currently
-					// {
-					// 	Name: nodeutilization.LowNodeUtilizationPluginName,
-					// 	PluginConfigs: []api.PluginConfig{
-					// 		{
-					// 			Name: nodeutilization.LowNodeUtilizationPluginName,
-					// 			Args: &nodeutilization.LowNodeUtilizationArgs{
-					// 				Thresholds: api.ResourceThresholds{
-					// 					"cpu":    api.Percentage(20),
-					// [...]
-					// [...]
-					// },
-				},
-			},
-		},
-		{
-			description: "convert all strategies",
-			policy: &v1alpha1.DeschedulerPolicy{
-				Strategies: v1alpha1.StrategyList{
-					removeduplicates.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-					nodeutilization.LowNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-								Thresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(20),
-									"memory": v1alpha1.Percentage(20),
-									"pods":   v1alpha1.Percentage(20),
-								},
-								TargetThresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(50),
-									"memory": v1alpha1.Percentage(50),
-									"pods":   v1alpha1.Percentage(50),
-								},
-							},
-						},
-					},
-					nodeutilization.HighNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-								Thresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(20),
-									"memory": v1alpha1.Percentage(20),
-									"pods":   v1alpha1.Percentage(20),
-								},
-							},
-						},
-					},
-					removefailedpods.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-					removepodshavingtoomanyrestarts.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							PodsHavingTooManyRestarts: &v1alpha1.PodsHavingTooManyRestarts{
-								PodRestartThreshold: 100,
-							},
-						},
-					},
-					removepodsviolatinginterpodantiaffinity.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-					removepodsviolatingnodeaffinity.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-						},
-					},
-					removepodsviolatingnodetaints.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-					removepodsviolatingtopologyspreadconstraint.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-				},
-			},
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.Profile{
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.HighNodeUtilizationPluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: nodeutilization.HighNodeUtilizationPluginName,
-								Args: &nodeutilization.HighNodeUtilizationArgs{
-									Thresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(20),
-										"memory": api.Percentage(20),
-										"pods":   api.Percentage(20),
-									},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{nodeutilization.HighNodeUtilizationPluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.LowNodeUtilizationPluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: nodeutilization.LowNodeUtilizationPluginName,
-								Args: &nodeutilization.LowNodeUtilizationArgs{
-									Thresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(20),
-										"memory": api.Percentage(20),
-										"pods":   api.Percentage(20),
-									},
-									TargetThresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(50),
-										"memory": api.Percentage(50),
-										"pods":   api.Percentage(50),
-									},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{nodeutilization.LowNodeUtilizationPluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removeduplicates.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removeduplicates.PluginName,
-								Args: &removeduplicates.RemoveDuplicatesArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{removeduplicates.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removefailedpods.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removefailedpods.PluginName,
-								Args: &removefailedpods.RemoveFailedPodsArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removefailedpods.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodshavingtoomanyrestarts.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodshavingtoomanyrestarts.PluginName,
-								Args: &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
-									PodRestartThreshold: 100,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatinginterpodantiaffinity.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatinginterpodantiaffinity.PluginName,
-								Args: &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatinginterpodantiaffinity.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingnodeaffinity.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingnodeaffinity.PluginName,
-								Args: &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{
-									NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatingnodeaffinity.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingnodetaints.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingnodetaints.PluginName,
-								Args: &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatingnodetaints.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingtopologyspreadconstraint.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{removepodsviolatingtopologyspreadconstraint.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "pass in all params to check args",
-			policy: &v1alpha1.DeschedulerPolicy{
-				Strategies: v1alpha1.StrategyList{
-					removeduplicates.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							RemoveDuplicates: &v1alpha1.RemoveDuplicates{
-								ExcludeOwnerKinds: []string{"ReplicaSet"},
-							},
-						},
-					},
-					nodeutilization.LowNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-								Thresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(20),
-									"memory": v1alpha1.Percentage(20),
-									"pods":   v1alpha1.Percentage(20),
-								},
-								TargetThresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(50),
-									"memory": v1alpha1.Percentage(50),
-									"pods":   v1alpha1.Percentage(50),
-								},
-								UseDeviationThresholds: true,
-								NumberOfNodes:          3,
-							},
-						},
-					},
-					nodeutilization.HighNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-								Thresholds: v1alpha1.ResourceThresholds{
-									"cpu":    v1alpha1.Percentage(20),
-									"memory": v1alpha1.Percentage(20),
-									"pods":   v1alpha1.Percentage(20),
-								},
-							},
-						},
-					},
-					removefailedpods.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							FailedPods: &v1alpha1.FailedPods{
-								MinPodLifetimeSeconds:   utilpointer.Uint(3600),
-								ExcludeOwnerKinds:       []string{"Job"},
-								Reasons:                 []string{"NodeAffinity"},
-								IncludingInitContainers: true,
-							},
-						},
-					},
-					removepodshavingtoomanyrestarts.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							PodsHavingTooManyRestarts: &v1alpha1.PodsHavingTooManyRestarts{
-								PodRestartThreshold:     100,
-								IncludingInitContainers: true,
-							},
-						},
-					},
-					removepodsviolatinginterpodantiaffinity.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params:  &v1alpha1.StrategyParameters{},
-					},
-					removepodsviolatingnodeaffinity.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-						},
-					},
-					removepodsviolatingnodetaints.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							ExcludedTaints: []string{"dedicated=special-user", "reserved"},
-						},
-					},
-					removepodsviolatingtopologyspreadconstraint.PluginName: v1alpha1.DeschedulerStrategy{
-						Enabled: true,
-						Params: &v1alpha1.StrategyParameters{
-							IncludeSoftConstraints: true,
-						},
-					},
-				},
-			},
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.Profile{
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.HighNodeUtilizationPluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: nodeutilization.HighNodeUtilizationPluginName,
-								Args: &nodeutilization.HighNodeUtilizationArgs{
-									Thresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(20),
-										"memory": api.Percentage(20),
-										"pods":   api.Percentage(20),
-									},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{nodeutilization.HighNodeUtilizationPluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.LowNodeUtilizationPluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: nodeutilization.LowNodeUtilizationPluginName,
-								Args: &nodeutilization.LowNodeUtilizationArgs{
-									UseDeviationThresholds: true,
-									NumberOfNodes:          3,
-									Thresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(20),
-										"memory": api.Percentage(20),
-										"pods":   api.Percentage(20),
-									},
-									TargetThresholds: api.ResourceThresholds{
-										"cpu":    api.Percentage(50),
-										"memory": api.Percentage(50),
-										"pods":   api.Percentage(50),
-									},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{nodeutilization.LowNodeUtilizationPluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removeduplicates.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removeduplicates.PluginName,
-								Args: &removeduplicates.RemoveDuplicatesArgs{
-									ExcludeOwnerKinds: []string{"ReplicaSet"},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{removeduplicates.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removefailedpods.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removefailedpods.PluginName,
-								Args: &removefailedpods.RemoveFailedPodsArgs{
-									ExcludeOwnerKinds:       []string{"Job"},
-									MinPodLifetimeSeconds:   utilpointer.Uint(3600),
-									Reasons:                 []string{"NodeAffinity"},
-									IncludingInitContainers: true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removefailedpods.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodshavingtoomanyrestarts.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodshavingtoomanyrestarts.PluginName,
-								Args: &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
-									PodRestartThreshold:     100,
-									IncludingInitContainers: true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatinginterpodantiaffinity.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatinginterpodantiaffinity.PluginName,
-								Args: &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatinginterpodantiaffinity.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingnodeaffinity.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingnodeaffinity.PluginName,
-								Args: &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{
-									NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatingnodeaffinity.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingnodetaints.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingnodetaints.PluginName,
-								Args: &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{
-									ExcludedTaints: []string{"dedicated=special-user", "reserved"},
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodsviolatingnodetaints.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", removepodsviolatingtopologyspreadconstraint.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-									IncludeSoftConstraints: true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Balance: api.PluginSet{
-								Enabled: []string{removepodsviolatingtopologyspreadconstraint.PluginName},
-							},
-							Evict: defaultEvictorPluginSet,
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid strategy name",
-			policy: &v1alpha1.DeschedulerPolicy{Strategies: v1alpha1.StrategyList{
-				"InvalidName": v1alpha1.DeschedulerStrategy{
-					Enabled: true,
-					Params:  &v1alpha1.StrategyParameters{},
-				},
-			}},
-			result: nil,
-			err:    fmt.Errorf("unknown strategy name: InvalidName"),
-		},
-		{
-			description: "invalid threshold priority",
-			policy: &v1alpha1.DeschedulerPolicy{Strategies: v1alpha1.StrategyList{
-				nodeutilization.LowNodeUtilizationPluginName: v1alpha1.DeschedulerStrategy{
-					Enabled: true,
-					Params: &v1alpha1.StrategyParameters{
-						ThresholdPriority:          utilpointer.Int32(100),
-						ThresholdPriorityClassName: "name",
-						NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
-							Thresholds: v1alpha1.ResourceThresholds{
-								"cpu":    v1alpha1.Percentage(20),
-								"memory": v1alpha1.Percentage(20),
-								"pods":   v1alpha1.Percentage(20),
-							},
-							TargetThresholds: v1alpha1.ResourceThresholds{
-								"cpu":    v1alpha1.Percentage(50),
-								"memory": v1alpha1.Percentage(50),
-								"pods":   v1alpha1.Percentage(50),
-							},
-						},
-					},
-				},
-			}},
-			result: nil,
-			err:    fmt.Errorf("priority threshold misconfigured for plugin LowNodeUtilization"),
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			client := fakeclientset.NewSimpleClientset()
-			result, err := V1alpha1ToInternal(client, tc.policy, pluginbuilder.PluginRegistry)
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				result.Profiles = api.SortProfilesByName(result.Profiles)
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}

pkg/descheduler/setupplugins.go

@@ -1,50 +0,0 @@
-/*
-Copyright 2017 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 descheduler
-
-import (
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
-)
-
-func SetupPlugins() {
-	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	RegisterDefaultPlugins(pluginbuilder.PluginRegistry)
-}
-
-func RegisterDefaultPlugins(registry pluginbuilder.Registry) {
-	pluginbuilder.Register(defaultevictor.PluginName, defaultevictor.New, &defaultevictor.DefaultEvictorArgs{}, registry)
-	pluginbuilder.Register(nodeutilization.LowNodeUtilizationPluginName, nodeutilization.NewLowNodeUtilization, &nodeutilization.LowNodeUtilizationArgs{}, registry)
-	pluginbuilder.Register(nodeutilization.HighNodeUtilizationPluginName, nodeutilization.NewHighNodeUtilization, &nodeutilization.HighNodeUtilizationArgs{}, registry)
-	pluginbuilder.Register(podlifetime.PluginName, podlifetime.New, &podlifetime.PodLifeTimeArgs{}, registry)
-	pluginbuilder.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicatesArgs{}, registry)
-	pluginbuilder.Register(removefailedpods.PluginName, removefailedpods.New, &removefailedpods.RemoveFailedPodsArgs{}, registry)
-	pluginbuilder.Register(removepodshavingtoomanyrestarts.PluginName, removepodshavingtoomanyrestarts.New, &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{}, registry)
-	pluginbuilder.Register(removepodsviolatinginterpodantiaffinity.PluginName, removepodsviolatinginterpodantiaffinity.New, &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{}, registry)
-	pluginbuilder.Register(removepodsviolatingnodeaffinity.PluginName, removepodsviolatingnodeaffinity.New, &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{}, registry)
-	pluginbuilder.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, registry)
-	pluginbuilder.Register(removepodsviolatingtopologyspreadconstraint.PluginName, removepodsviolatingtopologyspreadconstraint.New, &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{}, registry)
-}

pkg/descheduler/strategies/duplicates.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2017 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.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removeduplicates
+package strategies
 
 import (
 	"context"
@@ -24,84 +24,91 @@ import (
 	"sort"
 	"strings"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/descheduler/pkg/utils"
-
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
+	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
-const PluginName = "RemoveDuplicates"
+func validateRemoveDuplicatePodsParams(params *api.StrategyParameters) error {
+	if params == nil {
+		return nil
+	}
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
 
-// RemoveDuplicatePods removes the duplicate pods on node. This plugin evicts all duplicate pods on node.
-// A pod is said to be a duplicate of other if both of them are from same creator, kind and are within the same
-// namespace, and have at least one container with the same image.
-// As of now, this plugin won't evict daemonsets, mirror pods, critical pods and pods with local storages.
-
-type RemoveDuplicates struct {
-	handle    framework.Handle
-	args      *RemoveDuplicatesArgs
-	podFilter podutil.FilterFunc
+	return nil
 }
 
-var _ framework.BalancePlugin = &RemoveDuplicates{}
-
 type podOwner struct {
 	namespace, kind, name string
 	imagesHash            string
 }
 
-// New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	removeDuplicatesArgs, ok := args.(*RemoveDuplicatesArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type RemoveDuplicatesArgs, got %T", args)
+// RemoveDuplicatePods removes the duplicate pods on node. This strategy evicts all duplicate pods on node.
+// A pod is said to be a duplicate of other if both of them are from same creator, kind and are within the same
+// namespace, and have at least one container with the same image.
+// As of now, this strategy won't evict daemonsets, mirror pods, critical pods and pods with local storages.
+func RemoveDuplicatePods(
+	ctx context.Context,
+	client clientset.Interface,
+	strategy api.DeschedulerStrategy,
+	nodes []*v1.Node,
+	podEvictor *evictions.PodEvictor,
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
+) {
+	if err := validateRemoveDuplicatePodsParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid RemoveDuplicatePods parameters")
+		return
+	}
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
 	}
 
 	var includedNamespaces, excludedNamespaces sets.String
-	if removeDuplicatesArgs.Namespaces != nil {
-		includedNamespaces = sets.NewString(removeDuplicatesArgs.Namespaces.Include...)
-		excludedNamespaces = sets.NewString(removeDuplicatesArgs.Namespaces.Exclude...)
+	if strategy.Params != nil && strategy.Params.Namespaces != nil {
+		includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+		excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
 	}
 
-	// We can combine Filter and PreEvictionFilter since for this strategy it does not matter where we run PreEvictionFilter
-	podFilter, err := podutil.NewOptions().
-		WithFilter(podutil.WrapFilterFuncs(handle.Evictor().Filter, handle.Evictor().PreEvictionFilter)).
-		WithNamespaces(includedNamespaces).
-		WithoutNamespaces(excludedNamespaces).
-		BuildFilterFunc()
-	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
 	}
 
-	return &RemoveDuplicates{
-		handle:    handle,
-		args:      removeDuplicatesArgs,
-		podFilter: podFilter,
-	}, nil
-}
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
 
-// Name retrieves the plugin name
-func (r *RemoveDuplicates) Name() string {
-	return PluginName
-}
-
-// Balance extension point implementation for the plugin
-func (r *RemoveDuplicates) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
 	duplicatePods := make(map[podOwner]map[string][]*v1.Pod)
 	ownerKeyOccurence := make(map[podOwner]int32)
 	nodeCount := 0
 	nodeMap := make(map[string]*v1.Node)
 
+	podFilter, err := podutil.NewOptions().
+		WithFilter(evictable.IsEvictable).
+		WithNamespaces(includedNamespaces).
+		WithoutNamespaces(excludedNamespaces).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+
 	for _, node := range nodes {
 		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
-		pods, err := podutil.ListPodsOnANode(node.Name, r.handle.GetPodsAssignedToNodeFunc(), r.podFilter)
+		pods, err := podutil.ListPodsOnANode(node.Name, getPodsAssignedToNode, podFilter)
 		if err != nil {
 			klog.ErrorS(err, "Error listing evictable pods on node", "node", klog.KObj(node))
 			continue
@@ -124,8 +131,7 @@ func (r *RemoveDuplicates) Balance(ctx context.Context, nodes []*v1.Node) *frame
 		duplicateKeysMap := map[string][][]string{}
 		for _, pod := range pods {
 			ownerRefList := podutil.OwnerRef(pod)
-
-			if len(ownerRefList) == 0 || hasExcludedOwnerRefKind(ownerRefList, r.args.ExcludeOwnerKinds) {
+			if hasExcludedOwnerRefKind(ownerRefList, strategy) || len(ownerRefList) == 0 {
 				continue
 			}
 			podContainerKeys := make([]string, 0, len(ownerRefList)*len(pod.Spec.Containers))
@@ -188,7 +194,6 @@ func (r *RemoveDuplicates) Balance(ctx context.Context, nodes []*v1.Node) *frame
 
 	// 1. how many pods can be evicted to respect uniform placement of pods among viable nodes?
 	for ownerKey, podNodes := range duplicatePods {
-
 		targetNodes := getTargetNodes(podNodes, nodes)
 
 		klog.V(2).InfoS("Adjusting feasible nodes", "owner", ownerKey, "from", nodeCount, "to", len(targetNodes))
@@ -198,7 +203,6 @@ func (r *RemoveDuplicates) Balance(ctx context.Context, nodes []*v1.Node) *frame
 		}
 
 		upperAvg := int(math.Ceil(float64(ownerKeyOccurence[ownerKey]) / float64(len(targetNodes))))
-	loop:
 		for nodeName, pods := range podNodes {
 			klog.V(2).InfoS("Average occurrence per node", "node", klog.KObj(nodeMap[nodeName]), "ownerKey", ownerKey, "avg", upperAvg)
 			// list of duplicated pods does not contain the original referential pod
@@ -206,15 +210,24 @@ func (r *RemoveDuplicates) Balance(ctx context.Context, nodes []*v1.Node) *frame
 				// It's assumed all duplicated pods are in the same priority class
 				// TODO(jchaloup): check if the pod has a different node to lend to
 				for _, pod := range pods[upperAvg-1:] {
-					r.handle.Evictor().Evict(ctx, pod, evictions.EvictOptions{})
-					if r.handle.Evictor().NodeLimitExceeded(nodeMap[nodeName]) {
-						continue loop
+					if _, err := podEvictor.EvictPod(ctx, pod, nodeMap[nodeName], "RemoveDuplicatePods"); err != nil {
+						klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+						break
 					}
 				}
 			}
 		}
 	}
-	return nil
+}
+
+func getNodeAffinityNodeSelector(pod *v1.Pod) *v1.NodeSelector {
+	if pod.Spec.Affinity == nil {
+		return nil
+	}
+	if pod.Spec.Affinity.NodeAffinity == nil {
+		return nil
+	}
+	return pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution
 }
 
 func getTargetNodes(podNodes map[string][]*v1.Pod, nodes []*v1.Node) []*v1.Node {
@@ -274,27 +287,15 @@ func getTargetNodes(podNodes map[string][]*v1.Pod, nodes []*v1.Node) []*v1.Node
 	return targetNodes
 }
 
-func hasExcludedOwnerRefKind(ownerRefs []metav1.OwnerReference, excludeOwnerKinds []string) bool {
-	if len(excludeOwnerKinds) == 0 {
+func hasExcludedOwnerRefKind(ownerRefs []metav1.OwnerReference, strategy api.DeschedulerStrategy) bool {
+	if strategy.Params == nil || strategy.Params.RemoveDuplicates == nil {
 		return false
 	}
-
-	exclude := sets.NewString(excludeOwnerKinds...)
+	exclude := sets.NewString(strategy.Params.RemoveDuplicates.ExcludeOwnerKinds...)
 	for _, owner := range ownerRefs {
 		if exclude.Has(owner.Kind) {
 			return true
 		}
 	}
-
 	return false
 }
-
-func getNodeAffinityNodeSelector(pod *v1.Pod) *v1.NodeSelector {
-	if pod.Spec.Affinity == nil {
-		return nil
-	}
-	if pod.Spec.Affinity.NodeAffinity == nil {
-		return nil
-	}
-	return pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution
-}

pkg/descheduler/strategies/duplicates_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2017 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.
@@ -14,17 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removeduplicates
+package strategies
 
 import (
 	"context"
 	"testing"
 
-	"k8s.io/client-go/tools/events"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-
 	v1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -33,6 +28,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/utils"
@@ -142,8 +138,7 @@ func TestFindDuplicatePods(t *testing.T) {
 			VolumeSource: v1.VolumeSource{
 				HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 				EmptyDir: &v1.EmptyDirVolumeSource{
-					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-				},
+					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 			},
 		},
 	}
@@ -191,98 +186,105 @@ func TestFindDuplicatePods(t *testing.T) {
 		pods                    []*v1.Pod
 		nodes                   []*v1.Node
 		expectedEvictedPodCount uint
-		excludeOwnerKinds       []string
-		nodefit                 bool
+		strategy                api.DeschedulerStrategy
 	}{
 		{
 			description:             "Three pods in the `dev` Namespace, bound to same ReplicaSet. 1 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 1,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Three pods in the `dev` Namespace, bound to same ReplicaSet, but ReplicaSet kind is excluded. 0 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
-			excludeOwnerKinds:       []string{"ReplicaSet"},
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{RemoveDuplicates: &api.RemoveDuplicates{ExcludeOwnerKinds: []string{"ReplicaSet"}}}},
 		},
 		{
 			description:             "Three Pods in the `test` Namespace, bound to same ReplicaSet. 1 should be evicted.",
 			pods:                    []*v1.Pod{p8, p9, p10},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 1,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Three Pods in the `dev` Namespace, three Pods in the `test` Namespace. Bound to ReplicaSet with same name. 4 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3, p8, p9, p10},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 2,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Pods are: part of DaemonSet, with local storage, mirror pod annotation, critical pod annotation - none should be evicted.",
 			pods:                    []*v1.Pod{p4, p5, p6, p7},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Test all Pods: 4 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 2,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Pods with the same owner but different images should not be evicted",
 			pods:                    []*v1.Pod{p11, p12},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Pods with multiple containers should not match themselves",
 			pods:                    []*v1.Pod{p13},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Pods with matching ownerrefs and at not all matching image should not trigger an eviction",
 			pods:                    []*v1.Pod{p11, p13},
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
+			strategy:                api.DeschedulerStrategy{},
 		},
 		{
 			description:             "Three pods in the `dev` Namespace, bound to same ReplicaSet. Only node available has a taint, and nodeFit set to true. 0 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3},
 			nodes:                   []*v1.Node{node1, node3},
 			expectedEvictedPodCount: 0,
-			nodefit:                 true,
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{NodeFit: true}},
 		},
 		{
 			description:             "Three pods in the `node-fit` Namespace, bound to same ReplicaSet, all with a nodeSelector. Only node available has an incorrect node label, and nodeFit set to true. 0 should be evicted.",
 			pods:                    []*v1.Pod{p15, p16, p17},
 			nodes:                   []*v1.Node{node1, node4},
 			expectedEvictedPodCount: 0,
-			nodefit:                 true,
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{NodeFit: true}},
 		},
 		{
 			description:             "Three pods in the `node-fit` Namespace, bound to same ReplicaSet. Only node available is not schedulable, and nodeFit set to true. 0 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3},
 			nodes:                   []*v1.Node{node1, node5},
 			expectedEvictedPodCount: 0,
-			nodefit:                 true,
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{NodeFit: true}},
 		},
 		{
 			description:             "Three pods in the `node-fit` Namespace, bound to same ReplicaSet. Only node available does not have enough CPU, and nodeFit set to true. 0 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3, p19},
 			nodes:                   []*v1.Node{node1, node6},
 			expectedEvictedPodCount: 0,
-			nodefit:                 true,
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{NodeFit: true}},
 		},
 		{
 			description:             "Three pods in the `node-fit` Namespace, bound to same ReplicaSet. Only node available has enough CPU, and nodeFit set to true. 1 should be evicted.",
 			pods:                    []*v1.Pod{p1, p2, p3, p20},
 			nodes:                   []*v1.Node{node1, node6},
 			expectedEvictedPodCount: 1,
-			nodefit:                 true,
+			strategy:                api.DeschedulerStrategy{Params: &api.StrategyParameters{NodeFit: true}},
 		},
 	}
 
@@ -301,7 +303,7 @@ func TestFindDuplicatePods(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -311,8 +313,6 @@ func TestFindDuplicatePods(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				"v1",
@@ -320,53 +320,22 @@ func TestFindDuplicatePods(t *testing.T) {
 				nil,
 				nil,
 				testCase.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			nodeFit := testCase.nodefit
-
-			defaultEvictorFilterArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 nodeFit,
-			}
-
-			evictorFilter, _ := defaultevictor.New(
-				defaultEvictorFilterArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := New(&RemoveDuplicatesArgs{
-				ExcludeOwnerKinds: testCase.excludeOwnerKinds,
-			},
-				handle,
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.BalancePlugin).Balance(ctx, testCase.nodes)
-			actualEvictedPodCount := podEvictor.TotalEvicted()
-			if actualEvictedPodCount != testCase.expectedEvictedPodCount {
-				t.Errorf("Test %#v failed, Unexpected no of pods evicted: pods evicted: %d, expected: %d", testCase.description, actualEvictedPodCount, testCase.expectedEvictedPodCount)
+			RemoveDuplicatePods(ctx, fakeClient, testCase.strategy, testCase.nodes, podEvictor, getPodsAssignedToNode)
+			podsEvicted := podEvictor.TotalEvicted()
+			if podsEvicted != testCase.expectedEvictedPodCount {
+				t.Errorf("Test error for description: %s. Expected evicted pods count %v, got %v", testCase.description, testCase.expectedEvictedPodCount, podsEvicted)
 			}
 		})
 	}
+
 }
 
 func TestRemoveDuplicatesUniformly(t *testing.T) {
@@ -498,6 +467,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 		pods                    []*v1.Pod
 		nodes                   []*v1.Node
 		expectedEvictedPodCount uint
+		strategy                api.DeschedulerStrategy
 	}{
 		{
 			description: "Evict pods uniformly",
@@ -519,6 +489,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly with one node left out",
@@ -539,6 +510,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n1", 2000, 3000, 10, nil),
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly with two replica sets",
@@ -560,6 +532,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly with two owner references",
@@ -591,6 +564,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods with number of pods less than nodes",
@@ -605,6 +579,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods with number of pods less than nodes, but ignore different pods with the same ownerref",
@@ -623,6 +598,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods with a single pod with three nodes",
@@ -636,6 +612,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("n2", 2000, 3000, 10, nil),
 				test.BuildTestNode("n3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly respecting taints",
@@ -660,6 +637,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("master2", 2000, 3000, 10, setMasterNoScheduleTaint),
 				test.BuildTestNode("master3", 2000, 3000, 10, setMasterNoScheduleTaint),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly respecting RequiredDuringSchedulingIgnoredDuringExecution node affinity",
@@ -684,6 +662,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("master2", 2000, 3000, 10, setMasterNoScheduleLabel),
 				test.BuildTestNode("master3", 2000, 3000, 10, setMasterNoScheduleLabel),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly respecting node selector",
@@ -708,6 +687,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("master2", 2000, 3000, 10, nil),
 				test.BuildTestNode("master3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 		{
 			description: "Evict pods uniformly respecting node selector with zero target nodes",
@@ -732,6 +712,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				test.BuildTestNode("master2", 2000, 3000, 10, nil),
 				test.BuildTestNode("master3", 2000, 3000, 10, nil),
 			},
+			strategy: api.DeschedulerStrategy{},
 		},
 	}
 
@@ -750,7 +731,7 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -760,8 +741,6 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -769,48 +748,18 @@ func TestRemoveDuplicatesUniformly(t *testing.T) {
 				nil,
 				nil,
 				testCase.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultEvictorFilterArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultEvictorFilterArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := New(&RemoveDuplicatesArgs{},
-				handle,
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.BalancePlugin).Balance(ctx, testCase.nodes)
-			actualEvictedPodCount := podEvictor.TotalEvicted()
-			if actualEvictedPodCount != testCase.expectedEvictedPodCount {
-				t.Errorf("Test %#v failed, Unexpected no of pods evicted: pods evicted: %d, expected: %d", testCase.description, actualEvictedPodCount, testCase.expectedEvictedPodCount)
+			RemoveDuplicatePods(ctx, fakeClient, testCase.strategy, testCase.nodes, podEvictor, getPodsAssignedToNode)
+			podsEvicted := podEvictor.TotalEvicted()
+			if podsEvicted != testCase.expectedEvictedPodCount {
+				t.Errorf("Test error for description: %s. Expected evicted pods count %v, got %v", testCase.description, testCase.expectedEvictedPodCount, podsEvicted)
 			}
 		})
 	}

pkg/descheduler/strategies/failedpods.go

@@ -0,0 +1,179 @@
+package strategies
+
+import (
+	"context"
+	"fmt"
+
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/descheduler/strategies/validation"
+)
+
+// validatedFailedPodsStrategyParams contains validated strategy parameters
+type validatedFailedPodsStrategyParams struct {
+	validation.ValidatedStrategyParams
+	includingInitContainers bool
+	reasons                 sets.String
+	excludeOwnerKinds       sets.String
+	minPodLifetimeSeconds   *uint
+}
+
+// RemoveFailedPods removes Pods that are in failed status phase.
+func RemoveFailedPods(
+	ctx context.Context,
+	client clientset.Interface,
+	strategy api.DeschedulerStrategy,
+	nodes []*v1.Node,
+	podEvictor *evictions.PodEvictor,
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
+) {
+	strategyParams, err := validateAndParseRemoveFailedPodsParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Invalid RemoveFailedPods parameters")
+		return
+	}
+
+	evictable := podEvictor.Evictable(
+		evictions.WithPriorityThreshold(strategyParams.ThresholdPriority),
+		evictions.WithNodeFit(strategyParams.NodeFit),
+		evictions.WithLabelSelector(strategyParams.LabelSelector),
+	)
+
+	var labelSelector *metav1.LabelSelector
+	if strategy.Params != nil {
+		labelSelector = strategy.Params.LabelSelector
+	}
+
+	podFilter, err := podutil.NewOptions().
+		WithFilter(evictable.IsEvictable).
+		WithNamespaces(strategyParams.IncludedNamespaces).
+		WithoutNamespaces(strategyParams.ExcludedNamespaces).
+		WithLabelSelector(labelSelector).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+	// Only list failed pods
+	phaseFilter := func(pod *v1.Pod) bool { return pod.Status.Phase == v1.PodFailed }
+	podFilter = podutil.WrapFilterFuncs(phaseFilter, podFilter)
+
+	for _, node := range nodes {
+		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
+		pods, err := podutil.ListAllPodsOnANode(node.Name, getPodsAssignedToNode, podFilter)
+		if err != nil {
+			klog.ErrorS(err, "Error listing a nodes failed pods", "node", klog.KObj(node))
+			continue
+		}
+
+		for i, pod := range pods {
+			if err = validateFailedPodShouldEvict(pod, *strategyParams); err != nil {
+				klog.V(4).InfoS(fmt.Sprintf("ignoring pod for eviction due to: %s", err.Error()), "pod", klog.KObj(pod))
+				continue
+			}
+
+			if _, err = podEvictor.EvictPod(ctx, pods[i], node, "FailedPod"); err != nil {
+				klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+				break
+			}
+		}
+	}
+}
+
+func validateAndParseRemoveFailedPodsParams(
+	ctx context.Context,
+	client clientset.Interface,
+	params *api.StrategyParameters,
+) (*validatedFailedPodsStrategyParams, error) {
+	if params == nil {
+		return &validatedFailedPodsStrategyParams{
+			ValidatedStrategyParams: validation.DefaultValidatedStrategyParams(),
+		}, nil
+	}
+
+	strategyParams, err := validation.ValidateAndParseStrategyParams(ctx, client, params)
+	if err != nil {
+		return nil, err
+	}
+
+	var reasons, excludeOwnerKinds sets.String
+	var includingInitContainers bool
+	var minPodLifetimeSeconds *uint
+	if params.FailedPods != nil {
+		reasons = sets.NewString(params.FailedPods.Reasons...)
+		includingInitContainers = params.FailedPods.IncludingInitContainers
+		excludeOwnerKinds = sets.NewString(params.FailedPods.ExcludeOwnerKinds...)
+		minPodLifetimeSeconds = params.FailedPods.MinPodLifetimeSeconds
+	}
+
+	return &validatedFailedPodsStrategyParams{
+		ValidatedStrategyParams: *strategyParams,
+		includingInitContainers: includingInitContainers,
+		reasons:                 reasons,
+		excludeOwnerKinds:       excludeOwnerKinds,
+		minPodLifetimeSeconds:   minPodLifetimeSeconds,
+	}, nil
+}
+
+// validateFailedPodShouldEvict looks at strategy params settings to see if the Pod
+// should be evicted given the params in the PodFailed policy.
+func validateFailedPodShouldEvict(pod *v1.Pod, strategyParams validatedFailedPodsStrategyParams) error {
+	var errs []error
+
+	if strategyParams.minPodLifetimeSeconds != nil {
+		podAgeSeconds := uint(metav1.Now().Sub(pod.GetCreationTimestamp().Local()).Seconds())
+		if podAgeSeconds < *strategyParams.minPodLifetimeSeconds {
+			errs = append(errs, fmt.Errorf("pod does not exceed the min age seconds of %d", *strategyParams.minPodLifetimeSeconds))
+		}
+	}
+
+	if len(strategyParams.excludeOwnerKinds) > 0 {
+		ownerRefList := podutil.OwnerRef(pod)
+		for _, owner := range ownerRefList {
+			if strategyParams.excludeOwnerKinds.Has(owner.Kind) {
+				errs = append(errs, fmt.Errorf("pod's owner kind of %s is excluded", owner.Kind))
+			}
+		}
+	}
+
+	if len(strategyParams.reasons) > 0 {
+		reasons := getFailedContainerStatusReasons(pod.Status.ContainerStatuses)
+
+		if pod.Status.Phase == v1.PodFailed && pod.Status.Reason != "" {
+			reasons = append(reasons, pod.Status.Reason)
+		}
+
+		if strategyParams.includingInitContainers {
+			reasons = append(reasons, getFailedContainerStatusReasons(pod.Status.InitContainerStatuses)...)
+		}
+
+		if !strategyParams.reasons.HasAny(reasons...) {
+			errs = append(errs, fmt.Errorf("pod does not match any of the reasons"))
+		}
+	}
+
+	return utilerrors.NewAggregate(errs)
+}
+
+func getFailedContainerStatusReasons(containerStatuses []v1.ContainerStatus) []string {
+	reasons := make([]string, 0)
+
+	for _, containerStatus := range containerStatuses {
+		if containerStatus.State.Waiting != nil && containerStatus.State.Waiting.Reason != "" {
+			reasons = append(reasons, containerStatus.State.Waiting.Reason)
+		}
+		if containerStatus.State.Terminated != nil && containerStatus.State.Terminated.Reason != "" {
+			reasons = append(reasons, containerStatus.State.Terminated.Reason)
+		}
+	}
+
+	return reasons
+}

pkg/descheduler/strategies/failedpods_test.go

@@ -1,20 +1,4 @@
-/*
-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
+package strategies
 
 import (
 	"context"
@@ -26,57 +10,57 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
-	"sigs.k8s.io/descheduler/pkg/framework"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/test"
 )
 
-var OneHourInSeconds uint = 3600
+var (
+	OneHourInSeconds uint = 3600
+)
 
 func TestRemoveFailedPods(t *testing.T) {
-	createRemoveFailedPodsArgs := func(
-		includingInitContainers bool,
-		reasons, excludeKinds []string,
-		minAgeSeconds *uint,
-	) RemoveFailedPodsArgs {
-		return RemoveFailedPodsArgs{
-			IncludingInitContainers: includingInitContainers,
-			Reasons:                 reasons,
-			MinPodLifetimeSeconds:   minAgeSeconds,
-			ExcludeOwnerKinds:       excludeKinds,
+	createStrategy := func(enabled, includingInitContainers bool, reasons, excludeKinds []string, minAgeSeconds *uint, nodeFit bool) api.DeschedulerStrategy {
+		return api.DeschedulerStrategy{
+			Enabled: enabled,
+			Params: &api.StrategyParameters{
+				FailedPods: &api.FailedPods{
+					Reasons:                 reasons,
+					IncludingInitContainers: includingInitContainers,
+					ExcludeOwnerKinds:       excludeKinds,
+					MinPodLifetimeSeconds:   minAgeSeconds,
+				},
+				NodeFit: nodeFit,
+			},
 		}
 	}
 
 	tests := []struct {
 		description             string
 		nodes                   []*v1.Node
-		args                    RemoveFailedPodsArgs
+		strategy                api.DeschedulerStrategy
 		expectedEvictedPodCount uint
 		pods                    []*v1.Pod
-		nodeFit                 bool
 	}{
 		{
-			description:             "default empty args, 0 failures, 0 evictions",
-			args:                    RemoveFailedPodsArgs{},
+			description:             "default empty strategy, 0 failures, 0 evictions",
+			strategy:                api.DeschedulerStrategy{},
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods:                    []*v1.Pod{}, // no pods come back with field selector phase=Failed
 		},
 		{
 			description:             "0 failures, 0 evictions",
-			args:                    createRemoveFailedPodsArgs(false, nil, nil, nil),
+			strategy:                createStrategy(true, false, nil, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods:                    []*v1.Pod{}, // no pods come back with field selector phase=Failed
 		},
 		{
 			description:             "1 container terminated with reason NodeAffinity, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(false, nil, nil, nil),
+			strategy:                createStrategy(true, false, nil, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -87,7 +71,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "1 init container terminated with reason NodeAffinity, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(true, nil, nil, nil),
+			strategy:                createStrategy(true, true, nil, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -98,7 +82,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "1 init container waiting with reason CreateContainerConfigError, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(true, nil, nil, nil),
+			strategy:                createStrategy(true, true, nil, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -109,7 +93,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description: "2 init container waiting with reason CreateContainerConfigError, 2 nodes, 2 evictions",
-			args:        createRemoveFailedPodsArgs(true, nil, nil, nil),
+			strategy:    createStrategy(true, true, nil, nil, nil, false),
 			nodes: []*v1.Node{
 				test.BuildTestNode("node1", 2000, 3000, 10, nil),
 				test.BuildTestNode("node2", 2000, 3000, 10, nil),
@@ -126,7 +110,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "include reason=CreateContainerConfigError, 1 container terminated with reason CreateContainerConfigError, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(false, []string{"CreateContainerConfigError"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"CreateContainerConfigError"}, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -137,7 +121,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "include reason=CreateContainerConfigError+NodeAffinity, 1 container terminated with reason CreateContainerConfigError, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(false, []string{"CreateContainerConfigError", "NodeAffinity"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"CreateContainerConfigError", "NodeAffinity"}, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -148,7 +132,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "include reason=CreateContainerConfigError, 1 container terminated with reason NodeAffinity, 0 eviction",
-			args:                    createRemoveFailedPodsArgs(false, []string{"CreateContainerConfigError"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"CreateContainerConfigError"}, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -159,7 +143,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "include init container=false, 1 init container waiting with reason CreateContainerConfigError, 0 eviction",
-			args:                    createRemoveFailedPodsArgs(false, []string{"CreateContainerConfigError"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"CreateContainerConfigError"}, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -170,7 +154,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "lifetime 1 hour, 1 container terminated with reason NodeAffinity, 0 eviction",
-			args:                    createRemoveFailedPodsArgs(false, nil, nil, &OneHourInSeconds),
+			strategy:                createStrategy(true, false, nil, nil, &OneHourInSeconds, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -181,7 +165,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description: "nodeFit=true, 1 unschedulable node, 1 container terminated with reason NodeAffinity, 0 eviction",
-			args:        createRemoveFailedPodsArgs(false, nil, nil, nil),
+			strategy:    createStrategy(true, false, nil, nil, nil, true),
 			nodes: []*v1.Node{
 				test.BuildTestNode("node1", 2000, 3000, 10, nil),
 				test.BuildTestNode("node2", 2000, 2000, 10, func(node *v1.Node) {
@@ -194,11 +178,10 @@ func TestRemoveFailedPods(t *testing.T) {
 					Terminated: &v1.ContainerStateTerminated{Reason: "NodeAffinity"},
 				}), nil),
 			},
-			nodeFit: true,
 		},
 		{
 			description:             "nodeFit=true, only available node does not have enough resources, 1 container terminated with reason CreateContainerConfigError, 0 eviction",
-			args:                    createRemoveFailedPodsArgs(false, []string{"CreateContainerConfigError"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"CreateContainerConfigError"}, nil, nil, true),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 1, 1, 10, nil), test.BuildTestNode("node2", 0, 0, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -206,11 +189,10 @@ func TestRemoveFailedPods(t *testing.T) {
 					Terminated: &v1.ContainerStateTerminated{Reason: "CreateContainerConfigError"},
 				}), nil),
 			},
-			nodeFit: true,
 		},
 		{
 			description:             "excluded owner kind=ReplicaSet, 1 init container terminated with owner kind=ReplicaSet, 0 eviction",
-			args:                    createRemoveFailedPodsArgs(true, nil, []string{"ReplicaSet"}, nil),
+			strategy:                createStrategy(true, true, nil, []string{"ReplicaSet"}, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -221,7 +203,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "excluded owner kind=DaemonSet, 1 init container terminated with owner kind=ReplicaSet, 1 eviction",
-			args:                    createRemoveFailedPodsArgs(true, nil, []string{"DaemonSet"}, nil),
+			strategy:                createStrategy(true, true, nil, []string{"DaemonSet"}, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 1,
 			pods: []*v1.Pod{
@@ -232,7 +214,7 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "excluded owner kind=DaemonSet, 1 init container terminated with owner kind=ReplicaSet, 1 pod in termination; nothing should be moved",
-			args:                    createRemoveFailedPodsArgs(true, nil, []string{"DaemonSet"}, nil),
+			strategy:                createStrategy(true, true, nil, []string{"DaemonSet"}, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
@@ -243,17 +225,16 @@ func TestRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description:             "1 container terminated with reason ShutDown, 0 evictions",
-			args:                    createRemoveFailedPodsArgs(false, nil, nil, nil),
+			strategy:                createStrategy(true, false, nil, nil, nil, true),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 0,
 			pods: []*v1.Pod{
 				buildTestPod("p1", "node1", newPodStatus("Shutdown", v1.PodFailed, nil, nil), nil),
 			},
-			nodeFit: true,
 		},
 		{
 			description:             "include reason=Shutdown, 2 containers terminated with reason ShutDown, 2 evictions",
-			args:                    createRemoveFailedPodsArgs(false, []string{"Shutdown"}, nil, nil),
+			strategy:                createStrategy(true, false, []string{"Shutdown"}, nil, nil, false),
 			nodes:                   []*v1.Node{test.BuildTestNode("node1", 2000, 3000, 10, nil)},
 			expectedEvictedPodCount: 2,
 			pods: []*v1.Pod{
@@ -277,7 +258,7 @@ func TestRemoveFailedPods(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -287,8 +268,6 @@ func TestRemoveFailedPods(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -296,51 +275,15 @@ func TestRemoveFailedPods(t *testing.T) {
 				nil,
 				nil,
 				tc.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 tc.nodeFit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin, err := New(&RemoveFailedPodsArgs{
-				Reasons:                 tc.args.Reasons,
-				MinPodLifetimeSeconds:   tc.args.MinPodLifetimeSeconds,
-				IncludingInitContainers: tc.args.IncludingInitContainers,
-				ExcludeOwnerKinds:       tc.args.ExcludeOwnerKinds,
-				LabelSelector:           tc.args.LabelSelector,
-				Namespaces:              tc.args.Namespaces,
-			},
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					PodEvictorImpl:                podEvictor,
-					EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, tc.nodes)
+			RemoveFailedPods(ctx, fakeClient, tc.strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			actualEvictedPodCount := podEvictor.TotalEvicted()
 			if actualEvictedPodCount != tc.expectedEvictedPodCount {
 				t.Errorf("Test %#v failed, expected %v pod evictions, but got %v pod evictions\n", tc.description, tc.expectedEvictedPodCount, actualEvictedPodCount)
@@ -349,6 +292,42 @@ func TestRemoveFailedPods(t *testing.T) {
 	}
 }
 
+func TestValidRemoveFailedPodsParams(t *testing.T) {
+	ctx := context.Background()
+	fakeClient := &fake.Clientset{}
+	testCases := []struct {
+		name   string
+		params *api.StrategyParameters
+	}{
+		{name: "validate nil params", params: nil},
+		{name: "validate empty params", params: &api.StrategyParameters{}},
+		{name: "validate reasons params", params: &api.StrategyParameters{FailedPods: &api.FailedPods{
+			Reasons: []string{"CreateContainerConfigError"},
+		}}},
+		{name: "validate includingInitContainers params", params: &api.StrategyParameters{FailedPods: &api.FailedPods{
+			IncludingInitContainers: true,
+		}}},
+		{name: "validate excludeOwnerKinds params", params: &api.StrategyParameters{FailedPods: &api.FailedPods{
+			ExcludeOwnerKinds: []string{"Job"},
+		}}},
+		{name: "validate excludeOwnerKinds params", params: &api.StrategyParameters{FailedPods: &api.FailedPods{
+			MinPodLifetimeSeconds: &OneHourInSeconds,
+		}}},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			params, err := validateAndParseRemoveFailedPodsParams(ctx, fakeClient, tc.params)
+			if err != nil {
+				t.Errorf("strategy params should be valid but got err: %v", err.Error())
+			}
+			if params == nil {
+				t.Errorf("strategy params should return a ValidatedFailedPodsStrategyParams but got nil")
+			}
+		})
+	}
+}
+
 func newPodStatus(reason string, phase v1.PodPhase, initContainerState, containerState *v1.ContainerState) v1.PodStatus {
 	ps := v1.PodStatus{
 		Reason: reason,

pkg/descheduler/strategies/node_affinity.go

@@ -0,0 +1,120 @@
+/*
+Copyright 2017 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 strategies
+
+import (
+	"context"
+	"fmt"
+
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
+)
+
+func validatePodsViolatingNodeAffinityParams(params *api.StrategyParameters) error {
+	if params == nil || len(params.NodeAffinityType) == 0 {
+		return fmt.Errorf("NodeAffinityType is empty")
+	}
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
+}
+
+// RemovePodsViolatingNodeAffinity evicts pods on nodes which violate node affinity
+func RemovePodsViolatingNodeAffinity(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validatePodsViolatingNodeAffinityParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid RemovePodsViolatingNodeAffinity parameters")
+		return
+	}
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
+	}
+
+	var includedNamespaces, excludedNamespaces sets.String
+	if strategy.Params.Namespaces != nil {
+		includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+		excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
+	}
+
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
+	podFilter, err := podutil.NewOptions().
+		WithNamespaces(includedNamespaces).
+		WithoutNamespaces(excludedNamespaces).
+		WithLabelSelector(strategy.Params.LabelSelector).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+
+	for _, nodeAffinity := range strategy.Params.NodeAffinityType {
+		klog.V(2).InfoS("Executing for nodeAffinityType", "nodeAffinity", nodeAffinity)
+
+		switch nodeAffinity {
+		case "requiredDuringSchedulingIgnoredDuringExecution":
+			for _, node := range nodes {
+				klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
+
+				pods, err := podutil.ListPodsOnANode(
+					node.Name,
+					getPodsAssignedToNode,
+					podutil.WrapFilterFuncs(podFilter, func(pod *v1.Pod) bool {
+						return evictable.IsEvictable(pod) &&
+							!nodeutil.PodFitsCurrentNode(getPodsAssignedToNode, pod, node) &&
+							nodeutil.PodFitsAnyNode(getPodsAssignedToNode, pod, nodes)
+					}),
+				)
+				if err != nil {
+					klog.ErrorS(err, "Failed to get pods", "node", klog.KObj(node))
+				}
+
+				for _, pod := range pods {
+					if pod.Spec.Affinity != nil && pod.Spec.Affinity.NodeAffinity != nil && pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution != nil {
+						klog.V(1).InfoS("Evicting pod", "pod", klog.KObj(pod))
+						if _, err := podEvictor.EvictPod(ctx, pod, node, "NodeAffinity"); err != nil {
+							klog.ErrorS(err, "Error evicting pod")
+							break
+						}
+					}
+				}
+			}
+		default:
+			klog.ErrorS(nil, "Invalid nodeAffinityType", "nodeAffinity", nodeAffinity)
+		}
+	}
+}

pkg/descheduler/strategies/node_affinity_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removepodsviolatingnodeaffinity
+package strategies
 
 import (
 	"context"
@@ -26,17 +26,33 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
-	"sigs.k8s.io/descheduler/pkg/framework"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/test"
 )
 
 func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
+	requiredDuringSchedulingIgnoredDuringExecutionStrategy := api.DeschedulerStrategy{
+		Enabled: true,
+		Params: &api.StrategyParameters{
+			NodeAffinityType: []string{
+				"requiredDuringSchedulingIgnoredDuringExecution",
+			},
+		},
+	}
+
+	requiredDuringSchedulingIgnoredDuringExecutionWithNodeFitStrategy := api.DeschedulerStrategy{
+		Enabled: true,
+		Params: &api.StrategyParameters{
+			NodeAffinityType: []string{
+				"requiredDuringSchedulingIgnoredDuringExecution",
+			},
+			NodeFit: true,
+		},
+	}
+
 	nodeLabelKey := "kubernetes.io/desiredNode"
 	nodeLabelValue := "yes"
 	nodeWithLabels := test.BuildTestNode("nodeWithLabels", 2000, 3000, 10, nil)
@@ -92,26 +108,28 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 		description                    string
 		nodes                          []*v1.Node
 		pods                           []*v1.Pod
+		strategy                       api.DeschedulerStrategy
 		expectedEvictedPodCount        uint
 		maxPodsToEvictPerNode          *uint
 		maxNoOfPodsToEvictPerNamespace *uint
-		args                           RemovePodsViolatingNodeAffinityArgs
-		nodefit                        bool
 	}{
 		{
-			description: "Invalid Affinity type, should not evict any pods",
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingRequiredDuringExecution"},
+			description: "Invalid strategy type, should not evict any pods",
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					NodeAffinityType: []string{
+						"requiredDuringSchedulingRequiredDuringExecution",
+					},
+				},
 			},
 			expectedEvictedPodCount: 0,
 			pods:                    addPodsToNode(nodeWithoutLabels, nil),
 			nodes:                   []*v1.Node{nodeWithoutLabels, nodeWithLabels},
 		},
 		{
-			description: "Pod is correctly scheduled on node, no eviction expected",
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
+			description:             "Pod is correctly scheduled on node, no eviction expected",
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionStrategy,
 			expectedEvictedPodCount: 0,
 			pods:                    addPodsToNode(nodeWithLabels, nil),
 			nodes:                   []*v1.Node{nodeWithLabels},
@@ -119,48 +137,38 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 		{
 			description:             "Pod is scheduled on node without matching labels, another schedulable node available, should be evicted",
 			expectedEvictedPodCount: 1,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
-			pods:  addPodsToNode(nodeWithoutLabels, nil),
-			nodes: []*v1.Node{nodeWithoutLabels, nodeWithLabels},
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionStrategy,
+			pods:                    addPodsToNode(nodeWithoutLabels, nil),
+			nodes:                   []*v1.Node{nodeWithoutLabels, nodeWithLabels},
 		},
 		{
 			description:             "Pod is scheduled on node without matching labels, another schedulable node available, maxPodsToEvictPerNode set to 1, should not be evicted",
 			expectedEvictedPodCount: 1,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
-			pods:                  addPodsToNode(nodeWithoutLabels, nil),
-			nodes:                 []*v1.Node{nodeWithoutLabels, nodeWithLabels},
-			maxPodsToEvictPerNode: &uint1,
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionStrategy,
+			pods:                    addPodsToNode(nodeWithoutLabels, nil),
+			nodes:                   []*v1.Node{nodeWithoutLabels, nodeWithLabels},
+			maxPodsToEvictPerNode:   &uint1,
 		},
 		{
 			description:             "Pod is scheduled on node without matching labels, another schedulable node available, maxPodsToEvictPerNode set to 1, no pod evicted since pod terminting",
 			expectedEvictedPodCount: 1,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
-			pods:                  addPodsToNode(nodeWithoutLabels, &metav1.Time{}),
-			nodes:                 []*v1.Node{nodeWithoutLabels, nodeWithLabels},
-			maxPodsToEvictPerNode: &uint1,
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionStrategy,
+			pods:                    addPodsToNode(nodeWithoutLabels, &metav1.Time{}),
+			nodes:                   []*v1.Node{nodeWithoutLabels, nodeWithLabels},
+			maxPodsToEvictPerNode:   &uint1,
 		},
 		{
-			description:             "Pod is scheduled on node without matching labels, another schedulable node available, maxNoOfPodsToEvictPerNamespace set to 1, should not be evicted",
-			expectedEvictedPodCount: 1,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
+			description:                    "Pod is scheduled on node without matching labels, another schedulable node available, maxNoOfPodsToEvictPerNamespace set to 1, should not be evicted",
+			expectedEvictedPodCount:        1,
+			strategy:                       requiredDuringSchedulingIgnoredDuringExecutionStrategy,
 			pods:                           addPodsToNode(nodeWithoutLabels, nil),
 			nodes:                          []*v1.Node{nodeWithoutLabels, nodeWithLabels},
 			maxNoOfPodsToEvictPerNamespace: &uint1,
 		},
 		{
-			description:             "Pod is scheduled on node without matching labels, another schedulable node available, maxNoOfPodsToEvictPerNamespace set to 1, no pod evicted since pod terminting",
-			expectedEvictedPodCount: 1,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
+			description:                    "Pod is scheduled on node without matching labels, another schedulable node available, maxNoOfPodsToEvictPerNamespace set to 1, no pod evicted since pod terminting",
+			expectedEvictedPodCount:        1,
+			strategy:                       requiredDuringSchedulingIgnoredDuringExecutionStrategy,
 			pods:                           addPodsToNode(nodeWithoutLabels, &metav1.Time{}),
 			nodes:                          []*v1.Node{nodeWithoutLabels, nodeWithLabels},
 			maxNoOfPodsToEvictPerNamespace: &uint1,
@@ -168,23 +176,17 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 		{
 			description:             "Pod is scheduled on node without matching labels, but no node where pod fits is available, should not evict",
 			expectedEvictedPodCount: 0,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
-			pods:    addPodsToNode(nodeWithoutLabels, nil),
-			nodes:   []*v1.Node{nodeWithoutLabels, unschedulableNodeWithLabels},
-			nodefit: true,
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionWithNodeFitStrategy,
+			pods:                    addPodsToNode(nodeWithoutLabels, nil),
+			nodes:                   []*v1.Node{nodeWithoutLabels, unschedulableNodeWithLabels},
 		},
 		{
 			description:             "Pod is scheduled on node without matching labels, and node where pod fits is available, should evict",
 			expectedEvictedPodCount: 0,
-			args: RemovePodsViolatingNodeAffinityArgs{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-			},
-			pods:                  addPodsToNode(nodeWithoutLabels, nil),
-			nodes:                 []*v1.Node{nodeWithLabels, unschedulableNodeWithLabels},
-			maxPodsToEvictPerNode: &uint1,
-			nodefit:               true,
+			strategy:                requiredDuringSchedulingIgnoredDuringExecutionWithNodeFitStrategy,
+			pods:                    addPodsToNode(nodeWithoutLabels, nil),
+			nodes:                   []*v1.Node{nodeWithLabels, unschedulableNodeWithLabels},
+			maxPodsToEvictPerNode:   &uint1,
 		},
 	}
 
@@ -203,7 +205,7 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -213,8 +215,6 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -222,49 +222,15 @@ func TestRemovePodsViolatingNodeAffinity(t *testing.T) {
 				tc.maxPodsToEvictPerNode,
 				tc.maxNoOfPodsToEvictPerNamespace,
 				tc.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 tc.nodefit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-			}
-
-			plugin, err := New(
-				&RemovePodsViolatingNodeAffinityArgs{
-					NodeAffinityType: tc.args.NodeAffinityType,
-				},
-				handle,
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, tc.nodes)
+			RemovePodsViolatingNodeAffinity(ctx, fakeClient, tc.strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			actualEvictedPodCount := podEvictor.TotalEvicted()
 			if actualEvictedPodCount != tc.expectedEvictedPodCount {
 				t.Errorf("Test %#v failed, expected %v pod evictions, but got %v pod evictions\n", tc.description, tc.expectedEvictedPodCount, actualEvictedPodCount)

pkg/descheduler/strategies/node_taint.go

@@ -0,0 +1,129 @@
+/*
+Copyright 2017 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 strategies
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
+
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
+)
+
+func validateRemovePodsViolatingNodeTaintsParams(params *api.StrategyParameters) error {
+	if params == nil {
+		return nil
+	}
+
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
+}
+
+// RemovePodsViolatingNodeTaints evicts pods on the node which violate NoSchedule Taints on nodes
+func RemovePodsViolatingNodeTaints(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validateRemovePodsViolatingNodeTaintsParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid RemovePodsViolatingNodeTaints parameters")
+		return
+	}
+
+	var includedNamespaces, excludedNamespaces, excludedTaints sets.String
+	var labelSelector *metav1.LabelSelector
+	if strategy.Params != nil {
+		if strategy.Params.Namespaces != nil {
+			includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+			excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
+		}
+		if strategy.Params.ExcludedTaints != nil {
+			excludedTaints = sets.NewString(strategy.Params.ExcludedTaints...)
+		}
+		labelSelector = strategy.Params.LabelSelector
+	}
+
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
+	}
+
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
+	podFilter, err := podutil.NewOptions().
+		WithFilter(evictable.IsEvictable).
+		WithNamespaces(includedNamespaces).
+		WithoutNamespaces(excludedNamespaces).
+		WithLabelSelector(labelSelector).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+
+	excludeTaint := func(taint *v1.Taint) bool {
+		// Exclude taints by key *or* key=value
+		return excludedTaints.Has(taint.Key) || (taint.Value != "" && excludedTaints.Has(fmt.Sprintf("%s=%s", taint.Key, taint.Value)))
+	}
+
+	taintFilterFnc := func(taint *v1.Taint) bool { return (taint.Effect == v1.TaintEffectNoSchedule) && !excludeTaint(taint) }
+	if strategy.Params != nil && strategy.Params.IncludePreferNoSchedule {
+		taintFilterFnc = func(taint *v1.Taint) bool {
+			return (taint.Effect == v1.TaintEffectNoSchedule || taint.Effect == v1.TaintEffectPreferNoSchedule) && !excludeTaint(taint)
+		}
+	}
+
+	for _, node := range nodes {
+		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
+		pods, err := podutil.ListAllPodsOnANode(node.Name, getPodsAssignedToNode, podFilter)
+		if err != nil {
+			//no pods evicted as error encountered retrieving evictable Pods
+			return
+		}
+		totalPods := len(pods)
+		for i := 0; i < totalPods; i++ {
+			if !utils.TolerationsTolerateTaintsWithFilter(
+				pods[i].Spec.Tolerations,
+				node.Spec.Taints,
+				taintFilterFnc,
+			) {
+				klog.V(2).InfoS("Not all taints with NoSchedule effect are tolerated after update for pod on node", "pod", klog.KObj(pods[i]), "node", klog.KObj(node))
+				if _, err := podEvictor.EvictPod(ctx, pods[i], node, "NodeTaint"); err != nil {
+					klog.ErrorS(err, "Error evicting pod")
+					break
+				}
+			}
+		}
+	}
+}

pkg/descheduler/strategies/node_taint_test.go

@@ -1,20 +1,4 @@
-/*
-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 removepodsviolatingnodetaints
+package strategies
 
 import (
 	"context"
@@ -27,13 +11,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -139,8 +120,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			VolumeSource: v1.VolumeSource{
 				HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 				EmptyDir: &v1.EmptyDirVolumeSource{
-					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-				},
+					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 			},
 		},
 	}
@@ -176,13 +156,14 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 		includePreferNoSchedule        bool
 		excludedTaints                 []string
 	}{
+
 		{
 			description:             "Pods not tolerating node taint should be evicted",
 			pods:                    []*v1.Pod{p1, p2, p3},
 			nodes:                   []*v1.Node{node1},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 1, // p2 gets evicted
+			expectedEvictedPodCount: 1, //p2 gets evicted
 		},
 		{
 			description:             "Pods with tolerations but not tolerating node taint should be evicted",
@@ -190,7 +171,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 1, // p4 gets evicted
+			expectedEvictedPodCount: 1, //p4 gets evicted
 		},
 		{
 			description:             "Only <maxPodsToEvictPerNode> number of Pods not tolerating node taint should be evicted",
@@ -199,7 +180,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
 			maxPodsToEvictPerNode:   &uint1,
-			expectedEvictedPodCount: 1, // p5 or p6 gets evicted
+			expectedEvictedPodCount: 1, //p5 or p6 gets evicted
 		},
 		{
 			description:                    "Only <maxNoOfPodsToEvictPerNamespace> number of Pods not tolerating node taint should be evicted",
@@ -208,7 +189,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			evictLocalStoragePods:          false,
 			evictSystemCriticalPods:        false,
 			maxNoOfPodsToEvictPerNamespace: &uint1,
-			expectedEvictedPodCount:        1, // p5 or p6 gets evicted
+			expectedEvictedPodCount:        1, //p5 or p6 gets evicted
 		},
 		{
 			description:             "Critical pods not tolerating node taint should not be evicted",
@@ -216,7 +197,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node2},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 0, // nothing is evicted
+			expectedEvictedPodCount: 0, //nothing is evicted
 		},
 		{
 			description:             "Critical pods except storage pods not tolerating node taint should not be evicted",
@@ -224,7 +205,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node2},
 			evictLocalStoragePods:   true,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 1, // p9 gets evicted
+			expectedEvictedPodCount: 1, //p9 gets evicted
 		},
 		{
 			description:             "Critical and non critical pods, only non critical pods not tolerating node taint should be evicted",
@@ -232,7 +213,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node2},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 1, // p11 gets evicted
+			expectedEvictedPodCount: 1, //p11 gets evicted
 		},
 		{
 			description:             "Critical and non critical pods, pods not tolerating node taint should be evicted even if they are critical",
@@ -240,7 +221,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1, node2},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: true,
-			expectedEvictedPodCount: 2, // p2 and p7 are evicted
+			expectedEvictedPodCount: 2, //p2 and p7 are evicted
 		},
 		{
 			description:             "Pod p2 doesn't tolerate taint on it's node, but also doesn't tolerate taints on other nodes",
@@ -248,7 +229,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1, node2},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 0, // p2 gets evicted
+			expectedEvictedPodCount: 0, //p2 gets evicted
 			nodeFit:                 true,
 		},
 		{
@@ -257,7 +238,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1, node3},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 0, // p2 gets evicted
+			expectedEvictedPodCount: 0, //p2 gets evicted
 			nodeFit:                 true,
 		},
 		{
@@ -266,7 +247,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1, node4},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: false,
-			expectedEvictedPodCount: 0, // p2 gets evicted
+			expectedEvictedPodCount: 0, //p2 gets evicted
 			nodeFit:                 true,
 		},
 		{
@@ -319,13 +300,14 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			nodes:                   []*v1.Node{node1, node6},
 			evictLocalStoragePods:   false,
 			evictSystemCriticalPods: true,
-			expectedEvictedPodCount: 0, // p2 and p7 can't be evicted
+			expectedEvictedPodCount: 0, //p2 and p7 can't be evicted
 			nodeFit:                 true,
 		},
 	}
 
 	for _, tc := range tests {
 		t.Run(tc.description, func(t *testing.T) {
+
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
@@ -339,7 +321,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -349,8 +331,6 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -358,49 +338,23 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 				tc.maxPodsToEvictPerNode,
 				tc.maxNoOfPodsToEvictPerNamespace,
 				tc.nodes,
+				getPodsAssignedToNode,
+				tc.evictLocalStoragePods,
+				tc.evictSystemCriticalPods,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   tc.evictLocalStoragePods,
-				EvictSystemCriticalPods: tc.evictSystemCriticalPods,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 tc.nodeFit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
+			strategy := api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit:                 tc.nodeFit,
+					IncludePreferNoSchedule: tc.includePreferNoSchedule,
+					ExcludedTaints:          tc.excludedTaints,
 				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
 
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := New(&RemovePodsViolatingNodeTaintsArgs{
-				IncludePreferNoSchedule: tc.includePreferNoSchedule,
-				ExcludedTaints:          tc.excludedTaints,
-			},
-				handle,
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, tc.nodes)
+			RemovePodsViolatingNodeTaints(ctx, fakeClient, strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			actualEvictedPodCount := podEvictor.TotalEvicted()
 			if actualEvictedPodCount != tc.expectedEvictedPodCount {
 				t.Errorf("Test %#v failed, Unexpected no of pods evicted: pods evicted: %d, expected: %d", tc.description, actualEvictedPodCount, tc.expectedEvictedPodCount)
@@ -410,6 +364,7 @@ func TestDeletePodsViolatingNodeTaints(t *testing.T) {
 }
 
 func TestToleratesTaint(t *testing.T) {
+
 	testCases := []struct {
 		description     string
 		toleration      v1.Toleration

pkg/descheduler/strategies/nodeutilization/highnodeutilization.go

@@ -1,11 +1,11 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2021 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
+   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,
@@ -22,65 +22,49 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/runtime"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/descheduler/pkg/api"
-	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	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/utils"
 )
 
-const HighNodeUtilizationPluginName = "HighNodeUtilization"
-
-// HighNodeUtilization evicts pods from under utilized nodes so that scheduler can schedule according to its plugin.
+// HighNodeUtilization evicts pods from under utilized nodes so that scheduler can schedule according to its strategy.
 // Note that CPU/Memory requests are used to calculate nodes' utilization and not the actual resource usage.
-
-type HighNodeUtilization struct {
-	handle    framework.Handle
-	args      *HighNodeUtilizationArgs
-	podFilter func(pod *v1.Pod) bool
-}
-
-var _ framework.BalancePlugin = &HighNodeUtilization{}
-
-// NewHighNodeUtilization builds plugin from its arguments while passing a handle
-func NewHighNodeUtilization(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	highNodeUtilizatioArgs, ok := args.(*HighNodeUtilizationArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type HighNodeUtilizationArgs, got %T", args)
+func HighNodeUtilization(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validateNodeUtilizationParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid HighNodeUtilization parameters")
+		return
 	}
 
-	podFilter, err := podutil.NewOptions().
-		WithFilter(handle.Evictor().Filter).
-		BuildFilterFunc()
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
 	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
 	}
 
-	return &HighNodeUtilization{
-		handle:    handle,
-		args:      highNodeUtilizatioArgs,
-		podFilter: podFilter,
-	}, nil
-}
-
-// Name retrieves the plugin name
-func (h *HighNodeUtilization) Name() string {
-	return HighNodeUtilizationPluginName
-}
-
-// Balance extension point implementation for the plugin
-func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
-	thresholds := h.args.Thresholds
-	targetThresholds := make(api.ResourceThresholds)
+	thresholds := strategy.Params.NodeResourceUtilizationThresholds.Thresholds
+	targetThresholds := strategy.Params.NodeResourceUtilizationThresholds.TargetThresholds
+	if err := validateHighUtilizationStrategyConfig(thresholds, targetThresholds); err != nil {
+		klog.ErrorS(err, "HighNodeUtilization config is not valid")
+		return
+	}
+	targetThresholds = make(api.ResourceThresholds)
 
 	setDefaultForThresholds(thresholds, targetThresholds)
 	resourceNames := getResourceNames(targetThresholds)
 
 	sourceNodes, highNodes := classifyNodes(
-		getNodeUsage(nodes, resourceNames, h.handle.GetPodsAssignedToNodeFunc()),
-		getNodeThresholds(nodes, thresholds, targetThresholds, resourceNames, h.handle.GetPodsAssignedToNodeFunc(), false),
+		getNodeUsage(nodes, resourceNames, getPodsAssignedToNode),
+		getNodeThresholds(nodes, thresholds, targetThresholds, resourceNames, getPodsAssignedToNode, false),
 		func(node *v1.Node, usage NodeUsage, threshold NodeThresholds) bool {
 			return isNodeWithLowUtilization(usage, threshold.lowResourceThreshold)
 		},
@@ -109,21 +93,23 @@ func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fr
 
 	if len(sourceNodes) == 0 {
 		klog.V(1).InfoS("No node is underutilized, nothing to do here, you might tune your thresholds further")
-		return nil
+		return
 	}
-	if len(sourceNodes) <= h.args.NumberOfNodes {
-		klog.V(1).InfoS("Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here", "underutilizedNodes", len(sourceNodes), "numberOfNodes", h.args.NumberOfNodes)
-		return nil
+	if len(sourceNodes) <= strategy.Params.NodeResourceUtilizationThresholds.NumberOfNodes {
+		klog.V(1).InfoS("Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here", "underutilizedNodes", len(sourceNodes), "numberOfNodes", strategy.Params.NodeResourceUtilizationThresholds.NumberOfNodes)
+		return
 	}
 	if len(sourceNodes) == len(nodes) {
 		klog.V(1).InfoS("All nodes are underutilized, nothing to do here")
-		return nil
+		return
 	}
 	if len(highNodes) == 0 {
 		klog.V(1).InfoS("No node is available to schedule the pods, nothing to do here")
-		return nil
+		return
 	}
 
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
 	// stop if the total available usage has dropped to zero - no more pods can be scheduled
 	continueEvictionCond := func(nodeInfo NodeInfo, totalAvailableUsage map[v1.ResourceName]*resource.Quantity) bool {
 		for name := range totalAvailableUsage {
@@ -140,14 +126,23 @@ func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fr
 
 	evictPodsFromSourceNodes(
 		ctx,
-		h.args.EvictableNamespaces,
 		sourceNodes,
 		highNodes,
-		h.handle.Evictor(),
-		h.podFilter,
+		podEvictor,
+		evictable.IsEvictable,
 		resourceNames,
+		"HighNodeUtilization",
 		continueEvictionCond)
 
+}
+
+func validateHighUtilizationStrategyConfig(thresholds, targetThresholds api.ResourceThresholds) error {
+	if targetThresholds != nil {
+		return fmt.Errorf("targetThresholds is not applicable for HighNodeUtilization")
+	}
+	if err := validateThresholds(thresholds); err != nil {
+		return fmt.Errorf("thresholds config is not valid: %v", err)
+	}
 	return nil
 }
 

pkg/descheduler/strategies/nodeutilization/highnodeutilization_test.go

@@ -22,20 +22,16 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
+	"k8s.io/api/policy/v1beta1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/events"
 
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -105,8 +101,7 @@ func TestHighNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -320,7 +315,7 @@ func TestHighNodeUtilization(t *testing.T) {
 				test.BuildTestNode(n3NodeName, 4000, 3000, 10, test.SetNodeUnschedulable),
 			},
 			pods: []*v1.Pod{
-				// These won't be evicted
+				//These won't be evicted
 				test.BuildTestPod("p1", 100, 0, n1NodeName, func(pod *v1.Pod) {
 					test.SetRSOwnerRef(pod)
 					test.SetPodExtendedResourceRequest(pod, extendedResource, 1)
@@ -451,7 +446,7 @@ func TestHighNodeUtilization(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -468,7 +463,7 @@ func TestHighNodeUtilization(t *testing.T) {
 				fakeClient.Fake.AddReactor("create", "pods", func(action core.Action) (bool, runtime.Object, error) {
 					getAction := action.(core.CreateAction)
 					obj := getAction.GetObject()
-					if eviction, ok := obj.(*policy.Eviction); ok {
+					if eviction, ok := obj.(*v1beta1.Eviction); ok {
 						if _, exists := podsForEviction[eviction.Name]; exists {
 							return true, obj, nil
 						}
@@ -482,7 +477,28 @@ func TestHighNodeUtilization(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
+			//fakeClient := &fake.Clientset{}
+			//fakeClient.Fake.AddReactor("list", "pods", func(action core.Action) (bool, runtime.Object, error) {
+			//	list := action.(core.ListAction)
+			//	fieldString := list.GetListRestrictions().Fields.String()
+			//	if strings.Contains(fieldString, n1NodeName) {
+			//		return true, test.pods[n1NodeName], nil
+			//	}
+			//	if strings.Contains(fieldString, n2NodeName) {
+			//		return true, test.pods[n2NodeName], nil
+			//	}
+			//	if strings.Contains(fieldString, n3NodeName) {
+			//		return true, test.pods[n3NodeName], nil
+			//	}
+			//	return true, nil, fmt.Errorf("Failed to list: %v", list)
+			//})
+			//fakeClient.Fake.AddReactor("get", "nodes", func(action core.Action) (bool, runtime.Object, error) {
+			//	getAction := action.(core.GetAction)
+			//	if node, exists := testCase.nodes[getAction.GetName()]; exists {
+			//		return true, node, nil
+			//	}
+			//	return true, nil, fmt.Errorf("Wrong node: %v", getAction.GetName())
+			//})
 
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
@@ -491,46 +507,24 @@ func TestHighNodeUtilization(t *testing.T) {
 				nil,
 				nil,
 				testCase.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 true,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
+			strategy := api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					NodeResourceUtilizationThresholds: &api.NodeResourceUtilizationThresholds{
+						Thresholds: testCase.thresholds,
+					},
+					NodeFit: true,
 				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := NewHighNodeUtilization(&HighNodeUtilizationArgs{
-				Thresholds: testCase.thresholds,
-			},
-				handle)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-			plugin.(framework.BalancePlugin).Balance(ctx, testCase.nodes)
+			HighNodeUtilization(ctx, fakeClient, strategy, testCase.nodes, podEvictor, getPodsAssignedToNode)
 
 			podsEvicted := podEvictor.TotalEvicted()
 			if testCase.expectedPodsEvicted != podsEvicted {
@@ -543,7 +537,85 @@ func TestHighNodeUtilization(t *testing.T) {
 	}
 }
 
+func TestValidateHighNodeUtilizationStrategyConfig(t *testing.T) {
+	tests := []struct {
+		name             string
+		thresholds       api.ResourceThresholds
+		targetThresholds api.ResourceThresholds
+		errInfo          error
+	}{
+		{
+			name: "passing target thresholds",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: fmt.Errorf("targetThresholds is not applicable for HighNodeUtilization"),
+		},
+		{
+			name:       "passing empty thresholds",
+			thresholds: api.ResourceThresholds{},
+			errInfo:    fmt.Errorf("thresholds config is not valid: no resource threshold is configured"),
+		},
+		{
+			name: "passing invalid thresholds",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 120,
+			},
+			errInfo: fmt.Errorf("thresholds config is not valid: %v", fmt.Errorf(
+				"%v threshold not in [%v, %v] range", v1.ResourceMemory, MinResourcePercentage, MaxResourcePercentage)),
+		},
+		{
+			name: "passing valid strategy config",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing valid strategy config with extended resource",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				extendedResource:  80,
+			},
+			errInfo: nil,
+		},
+	}
+
+	for _, testCase := range tests {
+		validateErr := validateHighUtilizationStrategyConfig(testCase.thresholds, testCase.targetThresholds)
+
+		if validateErr == nil || testCase.errInfo == nil {
+			if validateErr != testCase.errInfo {
+				t.Errorf("expected validity of strategy config: thresholds %#v targetThresholds %#v to be %v but got %v instead",
+					testCase.thresholds, testCase.targetThresholds, testCase.errInfo, validateErr)
+			}
+		} else if validateErr.Error() != testCase.errInfo.Error() {
+			t.Errorf("expected validity of strategy config: thresholds %#v targetThresholds %#v to be %v but got %v instead",
+				testCase.thresholds, testCase.targetThresholds, testCase.errInfo, validateErr)
+		}
+	}
+}
+
 func TestHighNodeUtilizationWithTaints(t *testing.T) {
+	strategy := api.DeschedulerStrategy{
+		Enabled: true,
+		Params: &api.StrategyParameters{
+			NodeResourceUtilizationThresholds: &api.NodeResourceUtilizationThresholds{
+				Thresholds: api.ResourceThresholds{
+					v1.ResourceCPU: 40,
+				},
+			},
+		},
+	}
+
 	n1 := test.BuildTestNode("n1", 1000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 1000, 3000, 10, nil)
 	n3 := test.BuildTestNode("n3", 1000, 3000, 10, nil)
@@ -574,7 +646,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 			name:  "No taints",
 			nodes: []*v1.Node{n1, n2, n3},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_2_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_3_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
@@ -587,7 +659,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 			name:  "No pod tolerates node taint",
 			nodes: []*v1.Node{n1, n3withTaints},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				// Node 3 pods
 				test.BuildTestPod(fmt.Sprintf("pod_2_%s", n3withTaints.Name), 200, 0, n3withTaints.Name, test.SetRSOwnerRef),
@@ -598,7 +670,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 			name:  "Pod which tolerates node taint",
 			nodes: []*v1.Node{n1, n3withTaints},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 100, 0, n1.Name, test.SetRSOwnerRef),
 				podThatToleratesTaint,
 				// Node 3 pods
@@ -624,7 +696,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 
 			fakeClient := fake.NewSimpleClientset(objs...)
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -634,8 +706,6 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				"policy/v1",
@@ -643,47 +713,15 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 				&item.evictionsExpected,
 				nil,
 				item.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := NewHighNodeUtilization(&HighNodeUtilizationArgs{
-				Thresholds: api.ResourceThresholds{
-					v1.ResourceCPU: 40,
-				},
-			},
-				handle)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-			plugin.(framework.BalancePlugin).Balance(ctx, item.nodes)
+			HighNodeUtilization(ctx, fakeClient, strategy, item.nodes, podEvictor, getPodsAssignedToNode)
 
 			if item.evictionsExpected != podEvictor.TotalEvicted() {
 				t.Errorf("Expected %v evictions, got %v", item.evictionsExpected, podEvictor.TotalEvicted())

pkg/descheduler/strategies/nodeutilization/lownodeutilization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2017 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.
@@ -22,57 +22,41 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/runtime"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	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/utils"
 )
 
-const LowNodeUtilizationPluginName = "LowNodeUtilization"
-
 // LowNodeUtilization evicts pods from overutilized nodes to underutilized nodes. Note that CPU/Memory requests are used
 // to calculate nodes' utilization and not the actual resource usage.
-
-type LowNodeUtilization struct {
-	handle    framework.Handle
-	args      *LowNodeUtilizationArgs
-	podFilter func(pod *v1.Pod) bool
-}
-
-var _ framework.BalancePlugin = &LowNodeUtilization{}
-
-// NewLowNodeUtilization builds plugin from its arguments while passing a handle
-func NewLowNodeUtilization(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	lowNodeUtilizationArgsArgs, ok := args.(*LowNodeUtilizationArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type LowNodeUtilizationArgs, got %T", args)
+func LowNodeUtilization(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	// TODO: May be create a struct for the strategy as well, so that we don't have to pass along the all the params?
+	if err := validateNodeUtilizationParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid LowNodeUtilization parameters")
+		return
 	}
-
-	podFilter, err := podutil.NewOptions().
-		WithFilter(handle.Evictor().Filter).
-		BuildFilterFunc()
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
 	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
 	}
 
-	return &LowNodeUtilization{
-		handle:    handle,
-		args:      lowNodeUtilizationArgsArgs,
-		podFilter: podFilter,
-	}, nil
-}
-
-// Name retrieves the plugin name
-func (l *LowNodeUtilization) Name() string {
-	return LowNodeUtilizationPluginName
-}
-
-// Balance extension point implementation for the plugin
-func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
-	useDeviationThresholds := l.args.UseDeviationThresholds
-	thresholds := l.args.Thresholds
-	targetThresholds := l.args.TargetThresholds
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+	useDeviationThresholds := strategy.Params.NodeResourceUtilizationThresholds.UseDeviationThresholds
+	thresholds := strategy.Params.NodeResourceUtilizationThresholds.Thresholds
+	targetThresholds := strategy.Params.NodeResourceUtilizationThresholds.TargetThresholds
+	if err := validateLowUtilizationStrategyConfig(thresholds, targetThresholds, useDeviationThresholds); err != nil {
+		klog.ErrorS(err, "LowNodeUtilization config is not valid")
+		return
+	}
 
 	// check if Pods/CPU/Mem are set, if not, set them to 100
 	if _, ok := thresholds[v1.ResourcePods]; !ok {
@@ -105,8 +89,8 @@ func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fra
 	resourceNames := getResourceNames(thresholds)
 
 	lowNodes, sourceNodes := classifyNodes(
-		getNodeUsage(nodes, resourceNames, l.handle.GetPodsAssignedToNodeFunc()),
-		getNodeThresholds(nodes, thresholds, targetThresholds, resourceNames, l.handle.GetPodsAssignedToNodeFunc(), useDeviationThresholds),
+		getNodeUsage(nodes, resourceNames, getPodsAssignedToNode),
+		getNodeThresholds(nodes, thresholds, targetThresholds, resourceNames, getPodsAssignedToNode, useDeviationThresholds),
 		// The node has to be schedulable (to be able to move workload there)
 		func(node *v1.Node, usage NodeUsage, threshold NodeThresholds) bool {
 			if nodeutil.IsNodeUnschedulable(node) {
@@ -120,54 +104,56 @@ func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fra
 		},
 	)
 
-	// log message for nodes with low utilization
-	underutilizationCriteria := []interface{}{
+	// log message in one line
+	keysAndValues := []interface{}{
 		"CPU", thresholds[v1.ResourceCPU],
 		"Mem", thresholds[v1.ResourceMemory],
 		"Pods", thresholds[v1.ResourcePods],
 	}
 	for name := range thresholds {
 		if !nodeutil.IsBasicResource(name) {
-			underutilizationCriteria = append(underutilizationCriteria, string(name), int64(thresholds[name]))
+			keysAndValues = append(keysAndValues, string(name), int64(thresholds[name]))
 		}
 	}
-	klog.V(1).InfoS("Criteria for a node under utilization", underutilizationCriteria...)
+	klog.V(1).InfoS("Criteria for a node under utilization", keysAndValues...)
 	klog.V(1).InfoS("Number of underutilized nodes", "totalNumber", len(lowNodes))
 
-	// log message for over utilized nodes
-	overutilizationCriteria := []interface{}{
+	// log message in one line
+	keysAndValues = []interface{}{
 		"CPU", targetThresholds[v1.ResourceCPU],
 		"Mem", targetThresholds[v1.ResourceMemory],
 		"Pods", targetThresholds[v1.ResourcePods],
 	}
 	for name := range targetThresholds {
 		if !nodeutil.IsBasicResource(name) {
-			overutilizationCriteria = append(overutilizationCriteria, string(name), int64(targetThresholds[name]))
+			keysAndValues = append(keysAndValues, string(name), int64(targetThresholds[name]))
 		}
 	}
-	klog.V(1).InfoS("Criteria for a node above target utilization", overutilizationCriteria...)
+	klog.V(1).InfoS("Criteria for a node above target utilization", keysAndValues...)
 	klog.V(1).InfoS("Number of overutilized nodes", "totalNumber", len(sourceNodes))
 
 	if len(lowNodes) == 0 {
 		klog.V(1).InfoS("No node is underutilized, nothing to do here, you might tune your thresholds further")
-		return nil
+		return
 	}
 
-	if len(lowNodes) <= l.args.NumberOfNodes {
-		klog.V(1).InfoS("Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here", "underutilizedNodes", len(lowNodes), "numberOfNodes", l.args.NumberOfNodes)
-		return nil
+	if len(lowNodes) <= strategy.Params.NodeResourceUtilizationThresholds.NumberOfNodes {
+		klog.V(1).InfoS("Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here", "underutilizedNodes", len(lowNodes), "numberOfNodes", strategy.Params.NodeResourceUtilizationThresholds.NumberOfNodes)
+		return
 	}
 
 	if len(lowNodes) == len(nodes) {
 		klog.V(1).InfoS("All nodes are underutilized, nothing to do here")
-		return nil
+		return
 	}
 
 	if len(sourceNodes) == 0 {
 		klog.V(1).InfoS("All nodes are under target utilization, nothing to do here")
-		return nil
+		return
 	}
 
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
 	// stop if node utilization drops below target threshold or any of required capacity (cpu, memory, pods) is moved
 	continueEvictionCond := func(nodeInfo NodeInfo, totalAvailableUsage map[v1.ResourceName]*resource.Quantity) bool {
 		if !isNodeAboveTargetUtilization(nodeInfo.NodeUsage, nodeInfo.thresholds.highResourceThreshold) {
@@ -187,13 +173,37 @@ func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fra
 
 	evictPodsFromSourceNodes(
 		ctx,
-		l.args.EvictableNamespaces,
 		sourceNodes,
 		lowNodes,
-		l.handle.Evictor(),
-		l.podFilter,
+		podEvictor,
+		evictable.IsEvictable,
 		resourceNames,
+		"LowNodeUtilization",
 		continueEvictionCond)
 
+	klog.V(1).InfoS("Total number of pods evicted", "evictedPods", podEvictor.TotalEvicted())
+}
+
+// validateLowUtilizationStrategyConfig checks if the strategy's config is valid
+func validateLowUtilizationStrategyConfig(thresholds, targetThresholds api.ResourceThresholds, useDeviationThresholds bool) error {
+	// validate thresholds and targetThresholds config
+	if err := validateThresholds(thresholds); err != nil {
+		return fmt.Errorf("thresholds config is not valid: %v", err)
+	}
+	if err := validateThresholds(targetThresholds); err != nil {
+		return fmt.Errorf("targetThresholds config is not valid: %v", err)
+	}
+
+	// validate if thresholds and targetThresholds have same resources configured
+	if len(thresholds) != len(targetThresholds) {
+		return fmt.Errorf("thresholds and targetThresholds configured different resources")
+	}
+	for resourceName, value := range thresholds {
+		if targetValue, ok := targetThresholds[resourceName]; !ok {
+			return fmt.Errorf("thresholds and targetThresholds configured different resources")
+		} else if value > targetValue && !useDeviationThresholds {
+			return fmt.Errorf("thresholds' %v percentage is greater than targetThresholds'", resourceName)
+		}
+	}
 	return nil
 }

pkg/descheduler/strategies/nodeutilization/lownodeutilization_test.go

@@ -21,20 +21,16 @@ import (
 	"fmt"
 	"testing"
 
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
+	policyv1 "k8s.io/api/policy/v1"
+	"k8s.io/api/policy/v1beta1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/events"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/utils"
@@ -58,7 +54,6 @@ func TestLowNodeUtilization(t *testing.T) {
 		pods                         []*v1.Pod
 		expectedPodsEvicted          uint
 		evictedPods                  []string
-		evictableNamespaces          *api.Namespaces
 	}{
 		{
 			name: "no evictable pods",
@@ -90,8 +85,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -140,8 +134,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -158,132 +151,6 @@ func TestLowNodeUtilization(t *testing.T) {
 			},
 			expectedPodsEvicted: 4,
 		},
-		{
-			name: "without priorities, but excluding namespaces",
-			thresholds: api.ResourceThresholds{
-				v1.ResourceCPU:  30,
-				v1.ResourcePods: 30,
-			},
-			targetThresholds: api.ResourceThresholds{
-				v1.ResourceCPU:  50,
-				v1.ResourcePods: 50,
-			},
-			nodes: []*v1.Node{
-				test.BuildTestNode(n1NodeName, 4000, 3000, 9, nil),
-				test.BuildTestNode(n2NodeName, 4000, 3000, 10, nil),
-				test.BuildTestNode(n3NodeName, 4000, 3000, 10, test.SetNodeUnschedulable),
-			},
-			pods: []*v1.Pod{
-				test.BuildTestPod("p1", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace1"
-				}),
-				test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace1"
-				}),
-				test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace1"
-				}),
-				test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace1"
-				}),
-				test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace1"
-				}),
-				// These won't be evicted.
-				test.BuildTestPod("p6", 400, 0, n1NodeName, test.SetDSOwnerRef),
-				test.BuildTestPod("p7", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					// A pod with local storage.
-					test.SetNormalOwnerRef(pod)
-					pod.Spec.Volumes = []v1.Volume{
-						{
-							Name: "sample",
-							VolumeSource: v1.VolumeSource{
-								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
-								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
-							},
-						},
-					}
-					// A Mirror Pod.
-					pod.Annotations = test.GetMirrorPodAnnotation()
-				}),
-				test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					// A Critical Pod.
-					pod.Namespace = "kube-system"
-					priority := utils.SystemCriticalPriority
-					pod.Spec.Priority = &priority
-				}),
-				test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef),
-			},
-			evictableNamespaces: &api.Namespaces{
-				Exclude: []string{
-					"namespace1",
-				},
-			},
-			expectedPodsEvicted: 0,
-		},
-		{
-			name: "without priorities, but include only default namespace",
-			thresholds: api.ResourceThresholds{
-				v1.ResourceCPU:  30,
-				v1.ResourcePods: 30,
-			},
-			targetThresholds: api.ResourceThresholds{
-				v1.ResourceCPU:  50,
-				v1.ResourcePods: 50,
-			},
-			nodes: []*v1.Node{
-				test.BuildTestNode(n1NodeName, 4000, 3000, 9, nil),
-				test.BuildTestNode(n2NodeName, 4000, 3000, 10, nil),
-				test.BuildTestNode(n3NodeName, 4000, 3000, 10, test.SetNodeUnschedulable),
-			},
-			pods: []*v1.Pod{
-				test.BuildTestPod("p1", 400, 0, n1NodeName, test.SetRSOwnerRef),
-				test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef),
-				test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace3"
-				}),
-				test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace4"
-				}),
-				test.BuildTestPod("p5", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					pod.Namespace = "namespace5"
-				}),
-				// These won't be evicted.
-				test.BuildTestPod("p6", 400, 0, n1NodeName, test.SetDSOwnerRef),
-				test.BuildTestPod("p7", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					// A pod with local storage.
-					test.SetNormalOwnerRef(pod)
-					pod.Spec.Volumes = []v1.Volume{
-						{
-							Name: "sample",
-							VolumeSource: v1.VolumeSource{
-								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
-								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
-							},
-						},
-					}
-					// A Mirror Pod.
-					pod.Annotations = test.GetMirrorPodAnnotation()
-				}),
-				test.BuildTestPod("p8", 400, 0, n1NodeName, func(pod *v1.Pod) {
-					// A Critical Pod.
-					pod.Namespace = "kube-system"
-					priority := utils.SystemCriticalPriority
-					pod.Spec.Priority = &priority
-				}),
-				test.BuildTestPod("p9", 400, 0, n2NodeName, test.SetRSOwnerRef),
-			},
-			evictableNamespaces: &api.Namespaces{
-				Include: []string{
-					"default",
-				},
-			},
-			expectedPodsEvicted: 2,
-		},
 		{
 			name: "without priorities stop when cpu capacity is depleted",
 			thresholds: api.ResourceThresholds{
@@ -316,8 +183,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -386,8 +252,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -453,8 +318,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -528,8 +392,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -610,8 +473,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -674,8 +536,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -766,8 +627,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -817,8 +677,7 @@ func TestLowNodeUtilization(t *testing.T) {
 							VolumeSource: v1.VolumeSource{
 								HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 								EmptyDir: &v1.EmptyDirVolumeSource{
-									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-								},
+									SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 							},
 						},
 					}
@@ -853,13 +712,35 @@ func TestLowNodeUtilization(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
 				t.Errorf("Build get pods assigned to node function error: %v", err)
 			}
 
+			//fakeClient := &fake.Clientset{}
+			//fakeClient.Fake.AddReactor("list", "pods", func(action core.Action) (bool, runtime.Object, error) {
+			//	list := action.(core.ListAction)
+			//	fieldString := list.GetListRestrictions().Fields.String()
+			//	if strings.Contains(fieldString, n1NodeName) {
+			//		return true, test.pods[n1NodeName], nil
+			//	}
+			//	if strings.Contains(fieldString, n2NodeName) {
+			//		return true, test.pods[n2NodeName], nil
+			//	}
+			//	if strings.Contains(fieldString, n3NodeName) {
+			//		return true, test.pods[n3NodeName], nil
+			//	}
+			//	return true, nil, fmt.Errorf("Failed to list: %v", list)
+			//})
+			//fakeClient.Fake.AddReactor("get", "nodes", func(action core.Action) (bool, runtime.Object, error) {
+			//	getAction := action.(core.GetAction)
+			//	if node, exists := test.nodes[getAction.GetName()]; exists {
+			//		return true, node, nil
+			//	}
+			//	return true, nil, fmt.Errorf("Wrong node: %v", getAction.GetName())
+			//})
 			podsForEviction := make(map[string]struct{})
 			for _, pod := range test.evictedPods {
 				podsForEviction[pod] = struct{}{}
@@ -870,7 +751,7 @@ func TestLowNodeUtilization(t *testing.T) {
 				fakeClient.Fake.AddReactor("create", "pods", func(action core.Action) (bool, runtime.Object, error) {
 					getAction := action.(core.CreateAction)
 					obj := getAction.GetObject()
-					if eviction, ok := obj.(*policy.Eviction); ok {
+					if eviction, ok := obj.(*v1beta1.Eviction); ok {
 						if _, exists := podsForEviction[eviction.Name]; exists {
 							return true, obj, nil
 						}
@@ -884,58 +765,33 @@ func TestLowNodeUtilization(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
-				policy.SchemeGroupVersion.String(),
+				policyv1.SchemeGroupVersion.String(),
 				false,
 				nil,
 				nil,
 				test.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultEvictorFilterArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 true,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultEvictorFilterArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
+			strategy := api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					NodeResourceUtilizationThresholds: &api.NodeResourceUtilizationThresholds{
+						Thresholds:             test.thresholds,
+						TargetThresholds:       test.targetThresholds,
+						UseDeviationThresholds: test.useDeviationThresholds,
+					},
+					NodeFit: true,
 				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := NewLowNodeUtilization(&LowNodeUtilizationArgs{
-				Thresholds:             test.thresholds,
-				TargetThresholds:       test.targetThresholds,
-				UseDeviationThresholds: test.useDeviationThresholds,
-				EvictableNamespaces:    test.evictableNamespaces,
-			},
-				handle)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-			plugin.(framework.BalancePlugin).Balance(ctx, test.nodes)
+			LowNodeUtilization(ctx, fakeClient, strategy, test.nodes, podEvictor, getPodsAssignedToNode)
 
 			podsEvicted := podEvictor.TotalEvicted()
 			if test.expectedPodsEvicted != podsEvicted {
@@ -948,8 +804,176 @@ func TestLowNodeUtilization(t *testing.T) {
 	}
 }
 
+func TestValidateLowNodeUtilizationStrategyConfig(t *testing.T) {
+	tests := []struct {
+		name             string
+		thresholds       api.ResourceThresholds
+		targetThresholds api.ResourceThresholds
+		errInfo          error
+	}{
+		{
+			name: "passing invalid thresholds",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 120,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: fmt.Errorf("thresholds config is not valid: %v", fmt.Errorf(
+				"%v threshold not in [%v, %v] range", v1.ResourceMemory, MinResourcePercentage, MaxResourcePercentage)),
+		},
+		{
+			name: "thresholds and targetThresholds configured different num of resources",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				v1.ResourcePods:   80,
+			},
+			errInfo: fmt.Errorf("thresholds and targetThresholds configured different resources"),
+		},
+		{
+			name: "thresholds and targetThresholds configured different resources",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:  80,
+				v1.ResourcePods: 80,
+			},
+			errInfo: fmt.Errorf("thresholds and targetThresholds configured different resources"),
+		},
+		{
+			name: "thresholds' CPU config value is greater than targetThresholds'",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    90,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: fmt.Errorf("thresholds' %v percentage is greater than targetThresholds'", v1.ResourceCPU),
+		},
+		{
+			name: "only thresholds configured extended resource",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+				extendedResource:  20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: fmt.Errorf("thresholds and targetThresholds configured different resources"),
+		},
+		{
+			name: "only targetThresholds configured extended resource",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				extendedResource:  80,
+			},
+			errInfo: fmt.Errorf("thresholds and targetThresholds configured different resources"),
+		},
+		{
+			name: "thresholds and targetThresholds configured different extended resources",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+				extendedResource:  20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				"example.com/bar": 80,
+			},
+			errInfo: fmt.Errorf("thresholds and targetThresholds configured different resources"),
+		},
+		{
+			name: "thresholds' extended resource config value is greater than targetThresholds'",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+				extendedResource:  90,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				extendedResource:  20,
+			},
+			errInfo: fmt.Errorf("thresholds' %v percentage is greater than targetThresholds'", extendedResource),
+		},
+		{
+			name: "passing valid strategy config",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing valid strategy config with extended resource",
+			thresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 20,
+				extendedResource:  20,
+			},
+			targetThresholds: api.ResourceThresholds{
+				v1.ResourceCPU:    80,
+				v1.ResourceMemory: 80,
+				extendedResource:  80,
+			},
+			errInfo: nil,
+		},
+	}
+
+	for _, testCase := range tests {
+		validateErr := validateLowUtilizationStrategyConfig(testCase.thresholds, testCase.targetThresholds, false)
+
+		if validateErr == nil || testCase.errInfo == nil {
+			if validateErr != testCase.errInfo {
+				t.Errorf("expected validity of strategy config: thresholds %#v targetThresholds %#v to be %v but got %v instead",
+					testCase.thresholds, testCase.targetThresholds, testCase.errInfo, validateErr)
+			}
+		} else if validateErr.Error() != testCase.errInfo.Error() {
+			t.Errorf("expected validity of strategy config: thresholds %#v targetThresholds %#v to be %v but got %v instead",
+				testCase.thresholds, testCase.targetThresholds, testCase.errInfo, validateErr)
+		}
+	}
+}
+
 func TestLowNodeUtilizationWithTaints(t *testing.T) {
 	ctx := context.Background()
+	strategy := api.DeschedulerStrategy{
+		Enabled: true,
+		Params: &api.StrategyParameters{
+			NodeResourceUtilizationThresholds: &api.NodeResourceUtilizationThresholds{
+				Thresholds: api.ResourceThresholds{
+					v1.ResourcePods: 20,
+				},
+				TargetThresholds: api.ResourceThresholds{
+					v1.ResourcePods: 70,
+				},
+			},
+			NodeFit: true,
+		},
+	}
 
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 1000, 3000, 10, nil)
@@ -981,7 +1005,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 			name:  "No taints",
 			nodes: []*v1.Node{n1, n2, n3},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_2_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_3_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
@@ -999,7 +1023,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 			name:  "No pod tolerates node taint",
 			nodes: []*v1.Node{n1, n3withTaints},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_2_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_3_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
@@ -1017,7 +1041,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 			name:  "Pod which tolerates node taint",
 			nodes: []*v1.Node{n1, n3withTaints},
 			pods: []*v1.Pod{
-				// Node 1 pods
+				//Node 1 pods
 				test.BuildTestPod(fmt.Sprintf("pod_1_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_2_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
 				test.BuildTestPod(fmt.Sprintf("pod_3_%s", n1.Name), 200, 0, n1.Name, test.SetRSOwnerRef),
@@ -1046,7 +1070,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 
 			fakeClient := fake.NewSimpleClientset(objs...)
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -1056,60 +1080,22 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
-				policy.SchemeGroupVersion.String(),
+				policyv1.SchemeGroupVersion.String(),
 				false,
 				&item.evictionsExpected,
 				nil,
 				item.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultEvictorFilterArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 true,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultEvictorFilterArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := NewLowNodeUtilization(&LowNodeUtilizationArgs{
-				Thresholds: api.ResourceThresholds{
-					v1.ResourcePods: 20,
-				},
-				TargetThresholds: api.ResourceThresholds{
-					v1.ResourcePods: 70,
-				},
-			},
-				handle)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-			plugin.(framework.BalancePlugin).Balance(ctx, item.nodes)
+			LowNodeUtilization(ctx, fakeClient, strategy, item.nodes, podEvictor, getPodsAssignedToNode)
 
 			if item.evictionsExpected != podEvictor.TotalEvicted() {
 				t.Errorf("Expected %v evictions, got %v", item.evictionsExpected, podEvictor.TotalEvicted())

pkg/descheduler/strategies/nodeutilization/nodeutilization.go

@@ -18,19 +18,18 @@ package nodeutilization
 
 import (
 	"context"
+	"fmt"
 	"sort"
 
-	"sigs.k8s.io/descheduler/pkg/api"
-
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	"sigs.k8s.io/descheduler/pkg/descheduler/node"
 	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/utils"
 )
 
@@ -63,6 +62,30 @@ const (
 	MaxResourcePercentage = 100
 )
 
+func validateNodeUtilizationParams(params *api.StrategyParameters) error {
+	if params == nil || params.NodeResourceUtilizationThresholds == nil {
+		return fmt.Errorf("NodeResourceUtilizationThresholds not set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
+}
+
+// validateThresholds checks if thresholds have valid resource name and resource percentage configured
+func validateThresholds(thresholds api.ResourceThresholds) error {
+	if len(thresholds) == 0 {
+		return fmt.Errorf("no resource threshold is configured")
+	}
+	for name, percent := range thresholds {
+		if percent < MinResourcePercentage || percent > MaxResourcePercentage {
+			return fmt.Errorf("%v threshold not in [%v, %v] range", name, MinResourcePercentage, MaxResourcePercentage)
+		}
+	}
+	return nil
+}
+
 func normalizePercentage(percent api.Percentage) api.Percentage {
 	if percent > MaxResourcePercentage {
 		return MaxResourcePercentage
@@ -213,11 +236,11 @@ func classifyNodes(
 // TODO: @ravig Break this function into smaller functions.
 func evictPodsFromSourceNodes(
 	ctx context.Context,
-	evictableNamespaces *api.Namespaces,
 	sourceNodes, destinationNodes []NodeInfo,
-	podEvictor framework.Evictor,
+	podEvictor *evictions.PodEvictor,
 	podFilter func(pod *v1.Pod) bool,
 	resourceNames []v1.ResourceName,
+	strategy string,
 	continueEviction continueEvictionCond,
 ) {
 	// upper bound on total number of pods/cpu/memory and optional extended resources to be moved
@@ -227,7 +250,7 @@ func evictPodsFromSourceNodes(
 		v1.ResourceMemory: {},
 	}
 
-	taintsOfDestinationNodes := make(map[string][]v1.Taint, len(destinationNodes))
+	var taintsOfDestinationNodes = make(map[string][]v1.Taint, len(destinationNodes))
 	for _, node := range destinationNodes {
 		taintsOfDestinationNodes[node.node.Name] = node.node.Spec.Taints
 
@@ -267,25 +290,21 @@ func evictPodsFromSourceNodes(
 		klog.V(1).InfoS("Evicting pods based on priority, if they have same priority, they'll be evicted based on QoS tiers")
 		// sort the evictable Pods based on priority. This also sorts them based on QoS. If there are multiple pods with same priority, they are sorted based on QoS tiers.
 		podutil.SortPodsBasedOnPriorityLowToHigh(removablePods)
-		evictPods(ctx, evictableNamespaces, removablePods, node, totalAvailableUsage, taintsOfDestinationNodes, podEvictor, continueEviction)
-
+		evictPods(ctx, removablePods, node, totalAvailableUsage, taintsOfDestinationNodes, podEvictor, strategy, continueEviction)
+		klog.V(1).InfoS("Evicted pods from node", "node", klog.KObj(node.node), "evictedPods", podEvictor.NodeEvicted(node.node), "usage", node.usage)
 	}
 }
 
 func evictPods(
 	ctx context.Context,
-	evictableNamespaces *api.Namespaces,
 	inputPods []*v1.Pod,
 	nodeInfo NodeInfo,
 	totalAvailableUsage map[v1.ResourceName]*resource.Quantity,
 	taintsOfLowNodes map[string][]v1.Taint,
-	podEvictor framework.Evictor,
+	podEvictor *evictions.PodEvictor,
+	strategy string,
 	continueEviction continueEvictionCond,
 ) {
-	var excludedNamespaces sets.String
-	if evictableNamespaces != nil {
-		excludedNamespaces = sets.NewString(evictableNamespaces.Exclude...)
-	}
 
 	if continueEviction(nodeInfo, totalAvailableUsage) {
 		for _, pod := range inputPods {
@@ -294,57 +313,49 @@ func evictPods(
 				continue
 			}
 
-			preEvictionFilterWithOptions, err := podutil.NewOptions().
-				WithFilter(podEvictor.PreEvictionFilter).
-				WithoutNamespaces(excludedNamespaces).
-				BuildFilterFunc()
+			success, err := podEvictor.EvictPod(ctx, pod, nodeInfo.node, strategy)
 			if err != nil {
-				klog.ErrorS(err, "could not build preEvictionFilter with namespace exclusion")
-				continue
+				klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+				break
 			}
 
-			if preEvictionFilterWithOptions(pod) {
-				if podEvictor.Evict(ctx, pod, evictions.EvictOptions{}) {
-					klog.V(3).InfoS("Evicted pods", "pod", klog.KObj(pod))
+			if success {
+				klog.V(3).InfoS("Evicted pods", "pod", klog.KObj(pod), "err", err)
 
-					for name := range totalAvailableUsage {
-						if name == v1.ResourcePods {
-							nodeInfo.usage[name].Sub(*resource.NewQuantity(1, resource.DecimalSI))
-							totalAvailableUsage[name].Sub(*resource.NewQuantity(1, resource.DecimalSI))
-						} else {
-							quantity := utils.GetResourceRequestQuantity(pod, name)
-							nodeInfo.usage[name].Sub(quantity)
-							totalAvailableUsage[name].Sub(quantity)
-						}
-					}
-
-					keysAndValues := []interface{}{
-						"node", nodeInfo.node.Name,
-						"CPU", nodeInfo.usage[v1.ResourceCPU].MilliValue(),
-						"Mem", nodeInfo.usage[v1.ResourceMemory].Value(),
-						"Pods", nodeInfo.usage[v1.ResourcePods].Value(),
-					}
-					for name := range totalAvailableUsage {
-						if !nodeutil.IsBasicResource(name) {
-							keysAndValues = append(keysAndValues, string(name), totalAvailableUsage[name].Value())
-						}
-					}
-
-					klog.V(3).InfoS("Updated node usage", keysAndValues...)
-					// check if pods can be still evicted
-					if !continueEviction(nodeInfo, totalAvailableUsage) {
-						break
+				for name := range totalAvailableUsage {
+					if name == v1.ResourcePods {
+						nodeInfo.usage[name].Sub(*resource.NewQuantity(1, resource.DecimalSI))
+						totalAvailableUsage[name].Sub(*resource.NewQuantity(1, resource.DecimalSI))
+					} else {
+						quantity := utils.GetResourceRequestQuantity(pod, name)
+						nodeInfo.usage[name].Sub(quantity)
+						totalAvailableUsage[name].Sub(quantity)
 					}
 				}
-			}
-			if podEvictor.NodeLimitExceeded(nodeInfo.node) {
-				return
+
+				keysAndValues := []interface{}{
+					"node", nodeInfo.node.Name,
+					"CPU", nodeInfo.usage[v1.ResourceCPU].MilliValue(),
+					"Mem", nodeInfo.usage[v1.ResourceMemory].Value(),
+					"Pods", nodeInfo.usage[v1.ResourcePods].Value(),
+				}
+				for name := range totalAvailableUsage {
+					if !nodeutil.IsBasicResource(name) {
+						keysAndValues = append(keysAndValues, string(name), totalAvailableUsage[name].Value())
+					}
+				}
+
+				klog.V(3).InfoS("Updated node usage", keysAndValues...)
+				// check if pods can be still evicted
+				if !continueEviction(nodeInfo, totalAvailableUsage) {
+					break
+				}
 			}
 		}
 	}
 }
 
-// sortNodesByUsage sorts nodes based on usage according to the given plugin.
+// sortNodesByUsage sorts nodes based on usage according to the given strategy.
 func sortNodesByUsage(nodes []NodeInfo, ascending bool) {
 	sort.Slice(nodes, func(i, j int) bool {
 		ti := nodes[i].usage[v1.ResourceMemory].Value() + nodes[i].usage[v1.ResourceCPU].MilliValue() + nodes[i].usage[v1.ResourcePods].Value()
@@ -358,12 +369,12 @@ func sortNodesByUsage(nodes []NodeInfo, ascending bool) {
 			}
 		}
 
-		// Return ascending order for HighNodeUtilization plugin
+		// Return ascending order for HighNodeUtilization strategy
 		if ascending {
 			return ti < tj
 		}
 
-		// Return descending order for LowNodeUtilization plugin
+		// Return descending order for LowNodeUtilization strategy
 		return ti > tj
 	})
 }
@@ -437,6 +448,7 @@ func averageNodeBasicresources(nodes []*v1.Node, getPodsAssignedToNode podutil.G
 				total[resource] += api.Percentage(value.MilliValue()) / api.Percentage(nodeCapacityValue.MilliValue()) * 100.0
 			} else {
 				total[resource] += api.Percentage(value.Value()) / api.Percentage(nodeCapacityValue.Value()) * 100.0
+
 			}
 		}
 	}

pkg/descheduler/strategies/nodeutilization/nodeutilization_test.go

@@ -17,12 +17,14 @@ limitations under the License.
 package nodeutilization
 
 import (
+	"fmt"
 	"math"
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/descheduler/pkg/api"
 )
 
 var (
@@ -103,6 +105,94 @@ var (
 	}
 )
 
+func TestValidateThresholds(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   api.ResourceThresholds
+		errInfo error
+	}{
+		{
+			name:    "passing nil map for threshold",
+			input:   nil,
+			errInfo: fmt.Errorf("no resource threshold is configured"),
+		},
+		{
+			name:    "passing no threshold",
+			input:   api.ResourceThresholds{},
+			errInfo: fmt.Errorf("no resource threshold is configured"),
+		},
+		{
+			name: "passing extended resource name other than cpu/memory/pods",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU:   40,
+				extendedResource: 50,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing invalid resource value",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU:    110,
+				v1.ResourceMemory: 80,
+			},
+			errInfo: fmt.Errorf("%v threshold not in [%v, %v] range", v1.ResourceCPU, MinResourcePercentage, MaxResourcePercentage),
+		},
+		{
+			name: "passing a valid threshold with max and min resource value",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU:    100,
+				v1.ResourceMemory: 0,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing a valid threshold with only cpu",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU: 80,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing a valid threshold with cpu, memory and pods",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 30,
+				v1.ResourcePods:   40,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing a valid threshold with only extended resource",
+			input: api.ResourceThresholds{
+				extendedResource: 80,
+			},
+			errInfo: nil,
+		},
+		{
+			name: "passing a valid threshold with cpu, memory, pods and extended resource",
+			input: api.ResourceThresholds{
+				v1.ResourceCPU:    20,
+				v1.ResourceMemory: 30,
+				v1.ResourcePods:   40,
+				extendedResource:  50,
+			},
+			errInfo: nil,
+		},
+	}
+
+	for _, test := range tests {
+		validateErr := validateThresholds(test.input)
+
+		if validateErr == nil || test.errInfo == nil {
+			if validateErr != test.errInfo {
+				t.Errorf("expected validity of threshold: %#v to be %v but got %v instead", test.input, test.errInfo, validateErr)
+			}
+		} else if validateErr.Error() != test.errInfo.Error() {
+			t.Errorf("expected validity of threshold: %#v to be %v but got %v instead", test.input, test.errInfo, validateErr)
+		}
+	}
+}
+
 func TestResourceUsagePercentages(t *testing.T) {
 	resourceUsagePercentage := resourceUsagePercentages(NodeUsage{
 		node: &v1.Node{

pkg/descheduler/strategies/pod_antiaffinity.go

@@ -14,85 +14,98 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removepodsviolatinginterpodantiaffinity
+package strategies
 
 import (
 	"context"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
 	"sigs.k8s.io/descheduler/pkg/utils"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 )
 
-const PluginName = "RemovePodsViolatingInterPodAntiAffinity"
+func validateRemovePodsViolatingInterPodAntiAffinityParams(params *api.StrategyParameters) error {
+	if params == nil {
+		return nil
+	}
 
-// RemovePodsViolatingInterPodAntiAffinity evicts pods on the node which violate inter pod anti affinity
-type RemovePodsViolatingInterPodAntiAffinity struct {
-	handle    framework.Handle
-	args      *RemovePodsViolatingInterPodAntiAffinityArgs
-	podFilter podutil.FilterFunc
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
 }
 
-var _ framework.DeschedulePlugin = &RemovePodsViolatingInterPodAntiAffinity{}
-
-// New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	interPodAntiAffinityArgs, ok := args.(*RemovePodsViolatingInterPodAntiAffinityArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type RemovePodsViolatingInterPodAntiAffinityArgs, got %T", args)
+// RemovePodsViolatingInterPodAntiAffinity evicts pods on the node which are having a pod affinity rules.
+func RemovePodsViolatingInterPodAntiAffinity(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validateRemovePodsViolatingInterPodAntiAffinityParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid RemovePodsViolatingInterPodAntiAffinity parameters")
+		return
 	}
 
 	var includedNamespaces, excludedNamespaces sets.String
-	if interPodAntiAffinityArgs.Namespaces != nil {
-		includedNamespaces = sets.NewString(interPodAntiAffinityArgs.Namespaces.Include...)
-		excludedNamespaces = sets.NewString(interPodAntiAffinityArgs.Namespaces.Exclude...)
+	var labelSelector *metav1.LabelSelector
+	if strategy.Params != nil {
+		if strategy.Params.Namespaces != nil {
+			includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+			excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
+		}
+		labelSelector = strategy.Params.LabelSelector
 	}
 
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
+	}
+
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
 	podFilter, err := podutil.NewOptions().
 		WithNamespaces(includedNamespaces).
 		WithoutNamespaces(excludedNamespaces).
-		WithLabelSelector(interPodAntiAffinityArgs.LabelSelector).
+		WithLabelSelector(labelSelector).
 		BuildFilterFunc()
 	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
 	}
 
-	return &RemovePodsViolatingInterPodAntiAffinity{
-		handle:    handle,
-		podFilter: podFilter,
-		args:      interPodAntiAffinityArgs,
-	}, nil
-}
-
-// Name retrieves the plugin name
-func (d *RemovePodsViolatingInterPodAntiAffinity) Name() string {
-	return PluginName
-}
-
-func (d *RemovePodsViolatingInterPodAntiAffinity) Deschedule(ctx context.Context, nodes []*v1.Node) *framework.Status {
-loop:
 	for _, node := range nodes {
 		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
-		pods, err := podutil.ListPodsOnANode(node.Name, d.handle.GetPodsAssignedToNodeFunc(), d.podFilter)
+		pods, err := podutil.ListPodsOnANode(node.Name, getPodsAssignedToNode, podFilter)
 		if err != nil {
-			return &framework.Status{
-				Err: fmt.Errorf("error listing pods: %v", err),
-			}
+			return
 		}
 		// sort the evictable Pods based on priority, if there are multiple pods with same priority, they are sorted based on QoS tiers.
 		podutil.SortPodsBasedOnPriorityLowToHigh(pods)
 		totalPods := len(pods)
 		for i := 0; i < totalPods; i++ {
-			if checkPodsWithAntiAffinityExist(pods[i], pods) && d.handle.Evictor().Filter(pods[i]) && d.handle.Evictor().PreEvictionFilter(pods[i]) {
-				if d.handle.Evictor().Evict(ctx, pods[i], evictions.EvictOptions{}) {
+			if checkPodsWithAntiAffinityExist(pods[i], pods) && evictable.IsEvictable(pods[i]) {
+				success, err := podEvictor.EvictPod(ctx, pods[i], node, "InterPodAntiAffinity")
+				if err != nil {
+					klog.ErrorS(err, "Error evicting pod")
+					break
+				}
+
+				if success {
 					// Since the current pod is evicted all other pods which have anti-affinity with this
 					// pod need not be evicted.
 					// Update pods.
@@ -101,12 +114,8 @@ loop:
 					totalPods--
 				}
 			}
-			if d.handle.Evictor().NodeLimitExceeded(node) {
-				continue loop
-			}
 		}
 	}
-	return nil
 }
 
 // checkPodsWithAntiAffinityExist checks if there are other pods on the node that the current pod cannot tolerate.

pkg/descheduler/strategies/pod_antiaffinity_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removepodsviolatinginterpodantiaffinity
+package strategies
 
 import (
 	"context"
@@ -26,13 +26,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
-	"sigs.k8s.io/descheduler/pkg/framework"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -190,6 +187,7 @@ func TestPodAntiAffinity(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
+
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
@@ -203,7 +201,7 @@ func TestPodAntiAffinity(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -213,8 +211,6 @@ func TestPodAntiAffinity(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -222,43 +218,20 @@ func TestPodAntiAffinity(t *testing.T) {
 				test.maxPodsToEvictPerNode,
 				test.maxNoOfPodsToEvictPerNamespace,
 				test.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
-
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 test.nodeFit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
+			strategy := api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: test.nodeFit,
 				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
 
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-			}
-			plugin, err := New(
-				&RemovePodsViolatingInterPodAntiAffinityArgs{},
-				handle,
-			)
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, test.nodes)
+			RemovePodsViolatingInterPodAntiAffinity(ctx, fakeClient, strategy, test.nodes, podEvictor, getPodsAssignedToNode)
 			podsEvicted := podEvictor.TotalEvicted()
 			if podsEvicted != test.expectedEvictedPodCount {
 				t.Errorf("Unexpected no of pods evicted: pods evicted: %d, expected: %d", podsEvicted, test.expectedEvictedPodCount)

pkg/descheduler/strategies/pod_lifetime.go

@@ -0,0 +1,142 @@
+/*
+Copyright 2020 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 strategies
+
+import (
+	"context"
+	"fmt"
+
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
+)
+
+func validatePodLifeTimeParams(params *api.StrategyParameters) error {
+	if params == nil || params.PodLifeTime == nil || params.PodLifeTime.MaxPodLifeTimeSeconds == nil {
+		return fmt.Errorf("MaxPodLifeTimeSeconds not set")
+	}
+
+	if params.PodLifeTime.PodStatusPhases != nil {
+		for _, phase := range params.PodLifeTime.PodStatusPhases {
+			if phase != string(v1.PodPending) && phase != string(v1.PodRunning) {
+				return fmt.Errorf("only Pending and Running phases are supported in PodLifeTime")
+			}
+		}
+	}
+
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
+}
+
+// PodLifeTime evicts pods on nodes that were created more than strategy.Params.MaxPodLifeTimeSeconds seconds ago.
+func PodLifeTime(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validatePodLifeTimeParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid PodLifeTime parameters")
+		return
+	}
+
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
+	}
+
+	var includedNamespaces, excludedNamespaces sets.String
+	if strategy.Params.Namespaces != nil {
+		includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+		excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
+	}
+
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority))
+
+	filter := evictable.IsEvictable
+	if strategy.Params.PodLifeTime.PodStatusPhases != nil {
+		filter = func(pod *v1.Pod) bool {
+			for _, phase := range strategy.Params.PodLifeTime.PodStatusPhases {
+				if string(pod.Status.Phase) == phase {
+					return evictable.IsEvictable(pod)
+				}
+			}
+			return false
+		}
+	}
+
+	podFilter, err := podutil.NewOptions().
+		WithFilter(filter).
+		WithNamespaces(includedNamespaces).
+		WithoutNamespaces(excludedNamespaces).
+		WithLabelSelector(strategy.Params.LabelSelector).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+
+	for _, node := range nodes {
+		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
+
+		pods := listOldPodsOnNode(node.Name, getPodsAssignedToNode, podFilter, *strategy.Params.PodLifeTime.MaxPodLifeTimeSeconds)
+		for _, pod := range pods {
+			success, err := podEvictor.EvictPod(ctx, pod, node, "PodLifeTime")
+			if success {
+				klog.V(1).InfoS("Evicted pod because it exceeded its lifetime", "pod", klog.KObj(pod), "maxPodLifeTime", *strategy.Params.PodLifeTime.MaxPodLifeTimeSeconds)
+			}
+
+			if err != nil {
+				klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+				break
+			}
+		}
+
+	}
+}
+
+func listOldPodsOnNode(
+	nodeName string,
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
+	filter podutil.FilterFunc,
+	maxPodLifeTimeSeconds uint,
+) []*v1.Pod {
+	pods, err := podutil.ListPodsOnANode(nodeName, getPodsAssignedToNode, filter)
+	if err != nil {
+		return nil
+	}
+
+	var oldPods []*v1.Pod
+	for _, pod := range pods {
+		podAgeSeconds := uint(metav1.Now().Sub(pod.GetCreationTimestamp().Local()).Seconds())
+		if podAgeSeconds > maxPodLifeTimeSeconds {
+			oldPods = append(oldPods, pod)
+		}
+	}
+
+	return oldPods
+}

pkg/descheduler/strategies/pod_lifetime_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2020 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.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package podlifetime
+package strategies
 
 import (
 	"context"
@@ -27,12 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
+
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/test"
 )
 
@@ -141,19 +139,20 @@ func TestPodLifeTime(t *testing.T) {
 
 	var maxLifeTime uint = 600
 	testCases := []struct {
-		description                string
-		args                       *PodLifeTimeArgs
-		pods                       []*v1.Pod
-		nodes                      []*v1.Node
-		expectedEvictedPodCount    uint
-		ignorePvcPods              bool
-		maxPodsToEvictPerNode      *uint
-		maxPodsToEvictPerNamespace *uint
+		description             string
+		strategy                api.DeschedulerStrategy
+		pods                    []*v1.Pod
+		nodes                   []*v1.Node
+		expectedEvictedPodCount uint
+		ignorePvcPods           bool
 	}{
 		{
 			description: "Two pods in the `dev` Namespace, 1 is new and 1 very is old. 1 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p1, p2},
 			nodes:                   []*v1.Node{node1},
@@ -161,8 +160,11 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "Two pods in the `dev` Namespace, 2 are new and 0 are old. 0 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p3, p4},
 			nodes:                   []*v1.Node{node1},
@@ -170,8 +172,11 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "Two pods in the `dev` Namespace, 1 created 605 seconds ago. 1 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p5, p6},
 			nodes:                   []*v1.Node{node1},
@@ -179,64 +184,26 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "Two pods in the `dev` Namespace, 1 created 595 seconds ago. 0 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p7, p8},
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 0,
 		},
 		{
-			description: "Two pods, one with ContainerCreating state. 1 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-				States:                []string{"ContainerCreating"},
-			},
-			pods: []*v1.Pod{
-				p9,
-				test.BuildTestPod("container-creating-stuck", 0, 0, node1.Name, func(pod *v1.Pod) {
-					pod.Status.ContainerStatuses = []v1.ContainerStatus{
-						{
-							State: v1.ContainerState{
-								Waiting: &v1.ContainerStateWaiting{Reason: "ContainerCreating"},
-							},
-						},
-					}
-					pod.OwnerReferences = ownerRef1
-					pod.ObjectMeta.CreationTimestamp = olderPodCreationTime
-				}),
-			},
-			nodes:                   []*v1.Node{node1},
-			expectedEvictedPodCount: 1,
-		},
-		{
-			description: "Two pods, one with PodInitializing state. 1 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-				States:                []string{"PodInitializing"},
-			},
-			pods: []*v1.Pod{
-				p9,
-				test.BuildTestPod("pod-initializing-stuck", 0, 0, node1.Name, func(pod *v1.Pod) {
-					pod.Status.ContainerStatuses = []v1.ContainerStatus{
-						{
-							State: v1.ContainerState{
-								Waiting: &v1.ContainerStateWaiting{Reason: "PodInitializing"},
-							},
-						},
-					}
-					pod.OwnerReferences = ownerRef1
-					pod.ObjectMeta.CreationTimestamp = olderPodCreationTime
-				}),
-			},
-			nodes:                   []*v1.Node{node1},
-			expectedEvictedPodCount: 1,
-		},
-		{
-			description: "Two old pods with different states. 1 should be evicted.",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-				States:                []string{"Pending"},
+			description: "Two old pods with different status phases. 1 should be evicted.",
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{
+						MaxPodLifeTimeSeconds: &maxLifeTime,
+						PodStatusPhases:       []string{"Pending"},
+					},
+				},
 			},
 			pods:                    []*v1.Pod{p9, p10},
 			nodes:                   []*v1.Node{node1},
@@ -244,8 +211,11 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "does not evict pvc pods with ignorePvcPods set to true",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p11},
 			nodes:                   []*v1.Node{node1},
@@ -254,8 +224,11 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "evicts pvc pods with ignorePvcPods set to false (or unset)",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+				},
 			},
 			pods:                    []*v1.Pod{p11},
 			nodes:                   []*v1.Node{node1},
@@ -263,10 +236,13 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "No pod to evicted since all pod terminating",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-				LabelSelector: &metav1.LabelSelector{
-					MatchLabels: map[string]string{"foo": "bar"},
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+					LabelSelector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{"foo": "bar"},
+					},
 				},
 			},
 			pods:                    []*v1.Pod{p12, p13},
@@ -275,47 +251,19 @@ func TestPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "No pod should be evicted since pod terminating",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-				LabelSelector: &metav1.LabelSelector{
-					MatchLabels: map[string]string{"foo": "bar"},
+			strategy: api.DeschedulerStrategy{
+				Enabled: true,
+				Params: &api.StrategyParameters{
+					PodLifeTime: &api.PodLifeTime{MaxPodLifeTimeSeconds: &maxLifeTime},
+					LabelSelector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{"foo": "bar"},
+					},
 				},
 			},
 			pods:                    []*v1.Pod{p14, p15},
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 0,
 		},
-		{
-			description: "2 Oldest pods should be evicted when maxPodsToEvictPerNode and maxPodsToEvictPerNamespace are not set",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-			},
-			pods:                       []*v1.Pod{p1, p2, p9},
-			nodes:                      []*v1.Node{node1},
-			expectedEvictedPodCount:    2,
-			maxPodsToEvictPerNode:      nil,
-			maxPodsToEvictPerNamespace: nil,
-		},
-		{
-			description: "1 Oldest pod should be evicted when maxPodsToEvictPerNamespace is set to 1",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-			},
-			pods:                       []*v1.Pod{p1, p2, p9},
-			nodes:                      []*v1.Node{node1},
-			maxPodsToEvictPerNamespace: func(i uint) *uint { return &i }(1),
-			expectedEvictedPodCount:    1,
-		},
-		{
-			description: "1 Oldest pod should be evicted when maxPodsToEvictPerNode is set to 1",
-			args: &PodLifeTimeArgs{
-				MaxPodLifeTimeSeconds: &maxLifeTime,
-			},
-			pods:                    []*v1.Pod{p1, p2, p9},
-			nodes:                   []*v1.Node{node1},
-			maxPodsToEvictPerNode:   func(i uint) *uint { return &i }(1),
-			expectedEvictedPodCount: 1,
-		},
 	}
 
 	for _, tc := range testCases {
@@ -333,7 +281,7 @@ func TestPodLifeTime(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -343,49 +291,22 @@ func TestPodLifeTime(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
 				false,
-				tc.maxPodsToEvictPerNode,
-				tc.maxPodsToEvictPerNamespace,
+				nil,
+				nil,
 				tc.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				tc.ignorePvcPods,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultEvictorFilterArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           tc.ignorePvcPods,
-				EvictFailedBarePods:     false,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultEvictorFilterArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin, err := New(tc.args, &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-			})
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, tc.nodes)
+			PodLifeTime(ctx, fakeClient, tc.strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			podsEvicted := podEvictor.TotalEvicted()
 			if podsEvicted != tc.expectedEvictedPodCount {
 				t.Errorf("Test error for description: %s. Expected evicted pods count %v, got %v", tc.description, tc.expectedEvictedPodCount, podsEvicted)

pkg/descheduler/strategies/toomanyrestarts.go

@@ -0,0 +1,127 @@
+/*
+Copyright 2018 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 strategies
+
+import (
+	"context"
+	"fmt"
+
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
+)
+
+func validateRemovePodsHavingTooManyRestartsParams(params *api.StrategyParameters) error {
+	if params == nil || params.PodsHavingTooManyRestarts == nil || params.PodsHavingTooManyRestarts.PodRestartThreshold < 1 {
+		return fmt.Errorf("PodsHavingTooManyRestarts threshold not set")
+	}
+
+	// At most one of include/exclude can be set
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return fmt.Errorf("only one of thresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	return nil
+}
+
+// RemovePodsHavingTooManyRestarts removes the pods that have too many restarts on node.
+// There are too many cases leading this issue: Volume mount failed, app error due to nodes' different settings.
+// As of now, this strategy won't evict daemonsets, mirror pods, critical pods and pods with local storages.
+func RemovePodsHavingTooManyRestarts(ctx context.Context, client clientset.Interface, strategy api.DeschedulerStrategy, nodes []*v1.Node, podEvictor *evictions.PodEvictor, getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc) {
+	if err := validateRemovePodsHavingTooManyRestartsParams(strategy.Params); err != nil {
+		klog.ErrorS(err, "Invalid RemovePodsHavingTooManyRestarts parameters")
+		return
+	}
+
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, strategy.Params)
+	if err != nil {
+		klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+		return
+	}
+
+	var includedNamespaces, excludedNamespaces sets.String
+	if strategy.Params.Namespaces != nil {
+		includedNamespaces = sets.NewString(strategy.Params.Namespaces.Include...)
+		excludedNamespaces = sets.NewString(strategy.Params.Namespaces.Exclude...)
+	}
+
+	nodeFit := false
+	if strategy.Params != nil {
+		nodeFit = strategy.Params.NodeFit
+	}
+
+	evictable := podEvictor.Evictable(evictions.WithPriorityThreshold(thresholdPriority), evictions.WithNodeFit(nodeFit))
+
+	podFilter, err := podutil.NewOptions().
+		WithFilter(evictable.IsEvictable).
+		WithNamespaces(includedNamespaces).
+		WithoutNamespaces(excludedNamespaces).
+		WithLabelSelector(strategy.Params.LabelSelector).
+		BuildFilterFunc()
+	if err != nil {
+		klog.ErrorS(err, "Error initializing pod filter function")
+		return
+	}
+
+	for _, node := range nodes {
+		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
+		pods, err := podutil.ListPodsOnANode(node.Name, getPodsAssignedToNode, podFilter)
+		if err != nil {
+			klog.ErrorS(err, "Error listing a nodes pods", "node", klog.KObj(node))
+			continue
+		}
+
+		for i, pod := range pods {
+			restarts, initRestarts := calcContainerRestarts(pod)
+			if strategy.Params.PodsHavingTooManyRestarts.IncludingInitContainers {
+				if restarts+initRestarts < strategy.Params.PodsHavingTooManyRestarts.PodRestartThreshold {
+					continue
+				}
+			} else if restarts < strategy.Params.PodsHavingTooManyRestarts.PodRestartThreshold {
+				continue
+			}
+			if _, err := podEvictor.EvictPod(ctx, pods[i], node, "TooManyRestarts"); err != nil {
+				klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+				break
+			}
+		}
+	}
+}
+
+// calcContainerRestarts get container restarts and init container restarts.
+func calcContainerRestarts(pod *v1.Pod) (int32, int32) {
+	var restarts, initRestarts int32
+
+	for _, cs := range pod.Status.ContainerStatuses {
+		restarts += cs.RestartCount
+	}
+
+	for _, cs := range pod.Status.InitContainerStatuses {
+		initRestarts += cs.RestartCount
+	}
+
+	return restarts, initRestarts
+}

pkg/descheduler/strategies/toomanyrestarts_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2018 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.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removepodshavingtoomanyrestarts
+package strategies
 
 import (
 	"context"
@@ -27,13 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/events"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/test"
 )
 
@@ -74,8 +71,7 @@ func initPods(node *v1.Node) []*v1.Pod {
 			VolumeSource: v1.VolumeSource{
 				HostPath: &v1.HostPathVolumeSource{Path: "somePath"},
 				EmptyDir: &v1.EmptyDirVolumeSource{
-					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI),
-				},
+					SizeLimit: resource.NewQuantity(int64(10), resource.BinarySI)},
 			},
 		},
 	}
@@ -106,13 +102,16 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
 
 	pods := append(append(initPods(node1), test.BuildTestPod("CPU-consumer-1", 150, 100, node4.Name, nil)), test.BuildTestPod("CPU-consumer-2", 150, 100, node5.Name, nil))
 
-	createRemovePodsHavingTooManyRestartsAgrs := func(
-		podRestartThresholds int32,
-		includingInitContainers bool,
-	) RemovePodsHavingTooManyRestartsArgs {
-		return RemovePodsHavingTooManyRestartsArgs{
-			PodRestartThreshold:     podRestartThresholds,
-			IncludingInitContainers: includingInitContainers,
+	createStrategy := func(enabled, includingInitContainers bool, restartThresholds int32, nodeFit bool) api.DeschedulerStrategy {
+		return api.DeschedulerStrategy{
+			Enabled: enabled,
+			Params: &api.StrategyParameters{
+				PodsHavingTooManyRestarts: &api.PodsHavingTooManyRestarts{
+					PodRestartThreshold:     restartThresholds,
+					IncludingInitContainers: includingInitContainers,
+				},
+				NodeFit: nodeFit,
+			},
 		}
 	}
 
@@ -121,111 +120,106 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
 	tests := []struct {
 		description                    string
 		nodes                          []*v1.Node
-		args                           RemovePodsHavingTooManyRestartsArgs
+		strategy                       api.DeschedulerStrategy
 		expectedEvictedPodCount        uint
 		maxPodsToEvictPerNode          *uint
 		maxNoOfPodsToEvictPerNamespace *uint
-		nodeFit                        bool
 	}{
 		{
 			description:             "All pods have total restarts under threshold, no pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(10000, true),
+			strategy:                createStrategy(true, true, 10000, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 0,
 		},
 		{
 			description:             "Some pods have total restarts bigger than threshold",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 6,
 		},
 		{
 			description:             "Nine pods have total restarts equals threshold(includingInitContainers=true), 6 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1*25, true),
+			strategy:                createStrategy(true, true, 1*25, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 6,
 		},
 		{
 			description:             "Nine pods have total restarts equals threshold(includingInitContainers=false), 5 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1*25, false),
+			strategy:                createStrategy(true, false, 1*25, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 5,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(includingInitContainers=true), 6 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1*20, true),
+			strategy:                createStrategy(true, true, 1*20, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 6,
 		},
 		{
 			description:             "Nine pods have total restarts equals threshold(includingInitContainers=false), 6 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1*20, false),
+			strategy:                createStrategy(true, false, 1*20, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 6,
 		},
 		{
 			description:             "Five pods have total restarts bigger than threshold(includingInitContainers=true), but only 1 pod eviction",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(5*25+1, true),
+			strategy:                createStrategy(true, true, 5*25+1, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 1,
 		},
 		{
 			description:             "Five pods have total restarts bigger than threshold(includingInitContainers=false), but only 1 pod eviction",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(5*20+1, false),
+			strategy:                createStrategy(true, false, 5*20+1, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 1,
-			nodeFit:                 false,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(maxPodsToEvictPerNode=3), 3 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, false),
 			nodes:                   []*v1.Node{node1},
 			expectedEvictedPodCount: 3,
 			maxPodsToEvictPerNode:   &uint3,
 		},
 		{
 			description:                    "All pods have total restarts equals threshold(maxNoOfPodsToEvictPerNamespace=3), 3 pod evictions",
-			args:                           createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                       createStrategy(true, true, 1, false),
 			nodes:                          []*v1.Node{node1},
 			expectedEvictedPodCount:        3,
 			maxNoOfPodsToEvictPerNamespace: &uint3,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(maxPodsToEvictPerNode=3) but the only other node is tained, 0 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, true),
 			nodes:                   []*v1.Node{node1, node2},
 			expectedEvictedPodCount: 0,
 			maxPodsToEvictPerNode:   &uint3,
-			nodeFit:                 true,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(maxPodsToEvictPerNode=3) but the only other node is not schedulable, 0 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, true),
 			nodes:                   []*v1.Node{node1, node3},
 			expectedEvictedPodCount: 0,
 			maxPodsToEvictPerNode:   &uint3,
-			nodeFit:                 true,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(maxPodsToEvictPerNode=3) but the only other node does not have enough CPU, 0 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, true),
 			nodes:                   []*v1.Node{node1, node4},
 			expectedEvictedPodCount: 0,
 			maxPodsToEvictPerNode:   &uint3,
-			nodeFit:                 true,
 		},
 		{
 			description:             "All pods have total restarts equals threshold(maxPodsToEvictPerNode=3) but the only other node has enough CPU, 3 pod evictions",
-			args:                    createRemovePodsHavingTooManyRestartsAgrs(1, true),
+			strategy:                createStrategy(true, true, 1, true),
 			nodes:                   []*v1.Node{node1, node5},
 			expectedEvictedPodCount: 3,
 			maxPodsToEvictPerNode:   &uint3,
-			nodeFit:                 true,
 		},
 	}
 
 	for _, tc := range tests {
 		t.Run(tc.description, func(t *testing.T) {
+
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
@@ -239,7 +233,7 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -249,8 +243,6 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				policyv1.SchemeGroupVersion.String(),
@@ -258,44 +250,15 @@ func TestRemovePodsHavingTooManyRestarts(t *testing.T) {
 				tc.maxPodsToEvictPerNode,
 				tc.maxNoOfPodsToEvictPerNamespace,
 				tc.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
 
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 tc.nodeFit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin, err := New(
-				&tc.args,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					PodEvictorImpl:                podEvictor,
-					EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				})
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.DeschedulePlugin).Deschedule(ctx, tc.nodes)
+			RemovePodsHavingTooManyRestarts(ctx, fakeClient, tc.strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			actualEvictedPodCount := podEvictor.TotalEvicted()
 			if actualEvictedPodCount != tc.expectedEvictedPodCount {
 				t.Errorf("Test %#v failed, expected %v pod evictions, but got %v pod evictions\n", tc.description, tc.expectedEvictedPodCount, actualEvictedPodCount)

pkg/descheduler/strategies/topologyspreadconstraint.go

@@ -1,9 +1,12 @@
 /*
 Copyright 2020 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.
@@ -11,31 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package removepodsviolatingtopologyspreadconstraint
+package strategies
 
 import (
 	"context"
-	"fmt"
 	"math"
-	"reflect"
 	"sort"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 
+	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	"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/descheduler/strategies/validation"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
-const PluginName = "RemovePodsViolatingTopologySpreadConstraint"
-
 // AntiAffinityTerm's topology key value used in predicate metadata
 type topologyPair struct {
 	key   string
@@ -47,44 +46,26 @@ type topology struct {
 	pods []*v1.Pod
 }
 
-// RemovePodsViolatingTopologySpreadConstraint evicts pods which violate their topology spread constraints
-type RemovePodsViolatingTopologySpreadConstraint struct {
-	handle    framework.Handle
-	args      *RemovePodsViolatingTopologySpreadConstraintArgs
-	podFilter podutil.FilterFunc
-}
-
-var _ framework.BalancePlugin = &RemovePodsViolatingTopologySpreadConstraint{}
-
-// New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
-	pluginArgs, ok := args.(*RemovePodsViolatingTopologySpreadConstraintArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type RemovePodsViolatingTopologySpreadConstraintArgs, got %T", args)
-	}
-
-	podFilter, err := podutil.NewOptions().
-		WithFilter(handle.Evictor().Filter).
-		WithLabelSelector(pluginArgs.LabelSelector).
-		BuildFilterFunc()
+func RemovePodsViolatingTopologySpreadConstraint(
+	ctx context.Context,
+	client clientset.Interface,
+	strategy api.DeschedulerStrategy,
+	nodes []*v1.Node,
+	podEvictor *evictions.PodEvictor,
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
+) {
+	strategyParams, err := validation.ValidateAndParseStrategyParams(ctx, client, strategy.Params)
 	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
+		klog.ErrorS(err, "Invalid RemovePodsViolatingTopologySpreadConstraint parameters")
+		return
 	}
 
-	return &RemovePodsViolatingTopologySpreadConstraint{
-		handle:    handle,
-		podFilter: podFilter,
-		args:      pluginArgs,
-	}, nil
-}
+	evictable := podEvictor.Evictable(
+		evictions.WithPriorityThreshold(strategyParams.ThresholdPriority),
+		evictions.WithNodeFit(strategyParams.NodeFit),
+		evictions.WithLabelSelector(strategyParams.LabelSelector),
+	)
 
-// Name retrieves the plugin name
-func (d *RemovePodsViolatingTopologySpreadConstraint) Name() string {
-	return PluginName
-}
-
-// nolint: gocyclo
-func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
 	nodeMap := make(map[string]*v1.Node, len(nodes))
 	for _, node := range nodes {
 		nodeMap[node.Name] = node
@@ -103,26 +84,17 @@ func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Contex
 	// if diff > maxSkew, add this pod in the current bucket for eviction
 
 	// First record all of the constraints by namespace
-	client := d.handle.ClientSet()
 	namespaces, err := client.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
 	if err != nil {
 		klog.ErrorS(err, "Couldn't list namespaces")
-		return &framework.Status{
-			Err: fmt.Errorf("list namespace: %w", err),
-		}
+		return
 	}
 	klog.V(1).InfoS("Processing namespaces for topology spread constraints")
 	podsForEviction := make(map[*v1.Pod]struct{})
-	var includedNamespaces, excludedNamespaces sets.String
-	if d.args.Namespaces != nil {
-		includedNamespaces = sets.NewString(d.args.Namespaces.Include...)
-		excludedNamespaces = sets.NewString(d.args.Namespaces.Exclude...)
-	}
-
 	// 1. for each namespace...
 	for _, namespace := range namespaces.Items {
-		if (len(includedNamespaces) > 0 && !includedNamespaces.Has(namespace.Name)) ||
-			(len(excludedNamespaces) > 0 && excludedNamespaces.Has(namespace.Name)) {
+		if (len(strategyParams.IncludedNamespaces) > 0 && !strategyParams.IncludedNamespaces.Has(namespace.Name)) ||
+			(len(strategyParams.ExcludedNamespaces) > 0 && strategyParams.ExcludedNamespaces.Has(namespace.Name)) {
 			continue
 		}
 		namespacePods, err := client.CoreV1().Pods(namespace.Name).List(ctx, metav1.ListOptions{})
@@ -132,20 +104,14 @@ func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Contex
 		}
 
 		// ...where there is a topology constraint
-		namespaceTopologySpreadConstraints := []v1.TopologySpreadConstraint{}
+		namespaceTopologySpreadConstraints := make(map[v1.TopologySpreadConstraint]struct{})
 		for _, pod := range namespacePods.Items {
 			for _, constraint := range pod.Spec.TopologySpreadConstraints {
 				// Ignore soft topology constraints if they are not included
-				if constraint.WhenUnsatisfiable == v1.ScheduleAnyway && (d.args == nil || !d.args.IncludeSoftConstraints) {
+				if constraint.WhenUnsatisfiable == v1.ScheduleAnyway && (strategy.Params == nil || !strategy.Params.IncludeSoftConstraints) {
 					continue
 				}
-				// Need to check v1.TopologySpreadConstraint deepEquality because
-				// v1.TopologySpreadConstraint has pointer fields
-				// and we don't need to go over duplicated constraints later on
-				if hasIdenticalConstraints(constraint, namespaceTopologySpreadConstraints) {
-					continue
-				}
-				namespaceTopologySpreadConstraints = append(namespaceTopologySpreadConstraints, constraint)
+				namespaceTopologySpreadConstraints[constraint] = struct{}{}
 			}
 		}
 		if len(namespaceTopologySpreadConstraints) == 0 {
@@ -153,7 +119,7 @@ func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Contex
 		}
 
 		// 2. for each topologySpreadConstraint in that namespace
-		for _, constraint := range namespaceTopologySpreadConstraints {
+		for constraint := range namespaceTopologySpreadConstraints {
 			constraintTopologies := make(map[topologyPair][]*v1.Pod)
 			// pre-populate the topologyPair map with all the topologies available from the nodeMap
 			// (we can't just build it from existing pods' nodes because a topology may have 0 pods)
@@ -182,7 +148,7 @@ func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Contex
 					continue
 				}
 
-				// 5. If the pod's node matches this constraint's topologyKey, create a topoPair and add the pod
+				// 5. If the pod's node matches this constraint'selector topologyKey, create a topoPair and add the pod
 				node, ok := nodeMap[namespacePods.Items[i].Spec.NodeName]
 				if !ok {
 					// If ok is false, node is nil in which case node.Labels will panic. In which case a pod is yet to be scheduled. So it's safe to just continue here.
@@ -202,38 +168,19 @@ func (d *RemovePodsViolatingTopologySpreadConstraint) Balance(ctx context.Contex
 				klog.V(2).InfoS("Skipping topology constraint because it is already balanced", "constraint", constraint)
 				continue
 			}
-			balanceDomains(d.handle.GetPodsAssignedToNodeFunc(), podsForEviction, constraint, constraintTopologies, sumPods, d.handle.Evictor().Filter, nodes)
+			balanceDomains(client, getPodsAssignedToNode, podsForEviction, constraint, constraintTopologies, sumPods, evictable.IsEvictable, nodes)
 		}
 	}
 
-	nodeLimitExceeded := map[string]bool{}
 	for pod := range podsForEviction {
-		if nodeLimitExceeded[pod.Spec.NodeName] {
+		if !evictable.IsEvictable(pod) {
 			continue
 		}
-		if !d.podFilter(pod) {
-			continue
-		}
-
-		if d.handle.Evictor().PreEvictionFilter(pod) {
-			d.handle.Evictor().Evict(ctx, pod, evictions.EvictOptions{})
-		}
-		if d.handle.Evictor().NodeLimitExceeded(nodeMap[pod.Spec.NodeName]) {
-			nodeLimitExceeded[pod.Spec.NodeName] = true
+		if _, err := podEvictor.EvictPod(ctx, pod, nodeMap[pod.Spec.NodeName], "PodTopologySpread"); err != nil {
+			klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod))
+			break
 		}
 	}
-
-	return nil
-}
-
-// hasIdenticalConstraints checks if we already had an identical TopologySpreadConstraint in namespaceTopologySpreadConstraints slice
-func hasIdenticalConstraints(newConstraint v1.TopologySpreadConstraint, namespaceTopologySpreadConstraints []v1.TopologySpreadConstraint) bool {
-	for _, constraint := range namespaceTopologySpreadConstraints {
-		if reflect.DeepEqual(newConstraint, constraint) {
-			return true
-		}
-	}
-	return false
 }
 
 // topologyIsBalanced checks if any domains in the topology differ by more than the MaxSkew
@@ -268,7 +215,7 @@ func topologyIsBalanced(topology map[topologyPair][]*v1.Pod, constraint v1.Topol
 // whichever number is less.
 //
 // (Note, we will only move as many pods from a domain as possible without bringing it below the ideal average,
-// and we will not bring any smaller domain above the average)
+//  and we will not bring any smaller domain above the average)
 // If the diff is within the skew, we move to the next highest domain.
 // If the higher domain can't give any more without falling below the average, we move to the next lowest "high" domain
 //
@@ -276,19 +223,17 @@ func topologyIsBalanced(topology map[topologyPair][]*v1.Pod, constraint v1.Topol
 // [5, 5, 5, 5, 5, 5]
 // (assuming even distribution by the scheduler of the evicted pods)
 func balanceDomains(
+	client clientset.Interface,
 	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
 	podsForEviction map[*v1.Pod]struct{},
 	constraint v1.TopologySpreadConstraint,
 	constraintTopologies map[topologyPair][]*v1.Pod,
 	sumPods float64,
 	isEvictable func(pod *v1.Pod) bool,
-	nodes []*v1.Node,
-) {
+	nodes []*v1.Node) {
+
 	idealAvg := sumPods / float64(len(constraintTopologies))
 	sortedDomains := sortDomains(constraintTopologies, isEvictable)
-
-	nodesBelowIdealAvg := filterNodesBelowIdealAvg(nodes, sortedDomains, constraint.TopologyKey, idealAvg)
-
 	// i is the index for belowOrEqualAvg
 	// j is the index for aboveAvg
 	i := 0
@@ -339,8 +284,7 @@ func balanceDomains(
 			// In other words, PTS can perform suboptimally if some of its chosen pods don't fit on other nodes.
 			// This is because the chosen pods aren't sorted, but immovable pods still count as "evicted" toward the PTS algorithm.
 			// So, a better selection heuristic could improve performance.
-
-			if !node.PodFitsAnyOtherNode(getPodsAssignedToNode, aboveToEvict[k], nodesBelowIdealAvg) {
+			if !node.PodFitsAnyOtherNode(getPodsAssignedToNode, aboveToEvict[k], nodes) {
 				klog.V(2).InfoS("ignoring pod for eviction as it does not fit on any other node", "pod", klog.KObj(aboveToEvict[k]))
 				continue
 			}
@@ -352,25 +296,6 @@ func balanceDomains(
 	}
 }
 
-// filterNodesBelowIdealAvg will return nodes that have fewer pods matching topology domain than the idealAvg count.
-// the desired behavior is to not consider nodes in a given topology domain that are already packed.
-func filterNodesBelowIdealAvg(nodes []*v1.Node, sortedDomains []topology, topologyKey string, idealAvg float64) []*v1.Node {
-	topologyNodesMap := make(map[string][]*v1.Node, len(sortedDomains))
-	for _, node := range nodes {
-		if topologyDomain, ok := node.Labels[topologyKey]; ok {
-			topologyNodesMap[topologyDomain] = append(topologyNodesMap[topologyDomain], node)
-		}
-	}
-
-	var nodesBelowIdealAvg []*v1.Node
-	for _, domain := range sortedDomains {
-		if float64(len(domain.pods)) < idealAvg {
-			nodesBelowIdealAvg = append(nodesBelowIdealAvg, topologyNodesMap[domain.pair.value]...)
-		}
-	}
-	return nodesBelowIdealAvg
-}
-
 // sortDomains sorts and splits the list of topology domains based on their size
 // it also sorts the list of pods within the domains based on their node affinity/selector and priority in the following order:
 // 1. non-evictable pods

pkg/descheduler/strategies/topologyspreadconstraint_test.go

@@ -1,4 +1,4 @@
-package removepodsviolatingtopologyspreadconstraint
+package strategies
 
 import (
 	"context"
@@ -6,21 +6,14 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	core "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/events"
 
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/test"
 )
 
@@ -29,11 +22,9 @@ func TestTopologySpreadConstraint(t *testing.T) {
 		name                 string
 		pods                 []*v1.Pod
 		expectedEvictedCount uint
-		expectedEvictedPods  []string // if specified, will assert specific pods were evicted
 		nodes                []*v1.Node
+		strategy             api.DeschedulerStrategy
 		namespaces           []string
-		args                 RemovePodsViolatingTopologySpreadConstraintArgs
-		nodeFit              bool
 	}{
 		{
 			name: "2 domains, sizes [2,1], maxSkew=1, move 0 pods",
@@ -67,8 +58,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [3,1], maxSkew=1, move 1 pod to achieve [2,2]",
@@ -95,8 +90,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [3,1], maxSkew=1, move 1 pod to achieve [2,2] (soft constraints)",
@@ -130,8 +129,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
+			strategy:             api.DeschedulerStrategy{Params: &api.StrategyParameters{IncludeSoftConstraints: true}},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{IncludeSoftConstraints: true},
 		},
 		{
 			name: "2 domains, sizes [3,1], maxSkew=1, no pods eligible, move 0 pods",
@@ -161,8 +160,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [3,1], maxSkew=1, move 1 pod to achieve [2,2], exclude kube-system namespace",
@@ -189,9 +192,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
+			strategy:             api.DeschedulerStrategy{Enabled: true, Params: &api.StrategyParameters{NodeFit: true, Namespaces: &api.Namespaces{Exclude: []string{"kube-system"}}}},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{Namespaces: &api.Namespaces{Exclude: []string{"kube-system"}}},
-			nodeFit:              true,
 		},
 		{
 			name: "2 domains, sizes [5,2], maxSkew=1, move 1 pod to achieve [4,3]",
@@ -218,8 +220,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [4,0], maxSkew=1, move 2 pods to achieve [2,2]",
@@ -241,8 +247,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 2,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [4,0], maxSkew=1, only move 1 pod since pods with nodeSelector and nodeAffinity aren't evicted",
@@ -281,9 +291,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: true,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [4,0], maxSkew=1, move 2 pods since selector matches multiple nodes",
@@ -325,8 +338,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 2,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "3 domains, sizes [0, 1, 100], maxSkew=1, move 66 pods to get [34, 33, 34]",
@@ -349,8 +366,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 66,
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
 			name: "4 domains, sizes [0, 1, 3, 5], should move 3 to get [2, 2, 3, 2]",
@@ -379,8 +396,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 3,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains size [2 6], maxSkew=2, should move 1 to get [3 5]",
@@ -407,8 +428,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: false,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains size [2 6], maxSkew=2, can't move any because of node taints",
@@ -451,9 +476,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: true,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains size [2 6], maxSkew=2, can't move any because node1 does not have enough CPU",
@@ -480,9 +508,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: true,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			// see https://github.com/kubernetes-sigs/descheduler/issues/564
@@ -586,8 +617,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
+			strategy:             api.DeschedulerStrategy{Params: &api.StrategyParameters{IncludeSoftConstraints: true}},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{IncludeSoftConstraints: true},
 		},
 		{
 			name: "3 domains size [8 7 0], maxSkew=1, should move 5 to get [5 5 5]",
@@ -611,9 +642,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 5,
-			expectedEvictedPods:  []string{"pod-5", "pod-6", "pod-7", "pod-8"},
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
 			name: "3 domains size [5 5 5], maxSkew=1, should move 0 to retain [5 5 5]",
@@ -643,8 +673,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 1 pod since pod tolerates the node with taint",
@@ -684,12 +714,11 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			expectedEvictedPods:  []string{"pod-0"},
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
-			name: "2 domains, sizes [2,0], maxSkew=1, move 0 pods since pod does not tolerate the tainted node",
+			name: "2 domains, sizes [2,0], maxSkew=1, move 1 pods since pod does not tolerate the tainted node",
 			nodes: []*v1.Node{
 				test.BuildTestNode("n1", 2000, 3000, 10, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
 				test.BuildTestNode("n2", 2000, 3000, 10, func(n *v1.Node) {
@@ -718,8 +747,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 0 pods since pod does not tolerate the tainted node, and NodeFit is enabled",
@@ -751,9 +780,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					NodeFit: true,
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 1 pod for node with PreferNoSchedule Taint",
@@ -785,9 +817,8 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			expectedEvictedPods:  []string{"pod-0"},
+			strategy:             api.DeschedulerStrategy{},
 			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 0 pod for node with unmatched label filtering",
@@ -809,8 +840,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{LabelSelector: getLabelSelector("foo", []string{"baz"}, metav1.LabelSelectorOpIn)},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					LabelSelector: getLabelSelector("foo", []string{"baz"}, metav1.LabelSelectorOpIn),
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 1 pod for node with matched label filtering",
@@ -832,9 +867,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			expectedEvictedPods:  []string{"pod-1"},
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{LabelSelector: getLabelSelector("foo", []string{"bar"}, metav1.LabelSelectorOpIn)},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					LabelSelector: getLabelSelector("foo", []string{"bar"}, metav1.LabelSelectorOpIn),
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [2,0], maxSkew=1, move 1 pod for node with matched label filtering (NotIn op)",
@@ -856,9 +894,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 1,
-			expectedEvictedPods:  []string{"pod-1"},
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{LabelSelector: getLabelSelector("foo", []string{"baz"}, metav1.LabelSelectorOpNotIn)},
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					LabelSelector: getLabelSelector("foo", []string{"baz"}, metav1.LabelSelectorOpNotIn),
+				},
+			},
+			namespaces: []string{"ns1"},
 		},
 		{
 			name: "2 domains, sizes [4,2], maxSkew=1, 2 pods in termination; nothing should be moved",
@@ -888,234 +929,12 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				},
 			}),
 			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{LabelSelector: getLabelSelector("foo", []string{"bar"}, metav1.LabelSelectorOpIn)},
-		},
-		{
-			name: "3 domains, sizes [2,3,4], maxSkew=1, NodeFit is enabled, and not enough cpu on zoneA; nothing should be moved",
-			nodes: []*v1.Node{
-				test.BuildTestNode("n1", 250, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
-				test.BuildTestNode("n2", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneB" }),
-				test.BuildTestNode("n3", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneC" }),
+			strategy: api.DeschedulerStrategy{
+				Params: &api.StrategyParameters{
+					LabelSelector: getLabelSelector("foo", []string{"bar"}, metav1.LabelSelectorOpIn),
+				},
 			},
-			pods: createTestPods([]testPodList{
-				{
-					count:       2,
-					node:        "n1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       3,
-					node:        "n2",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       4,
-					node:        "n3",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-			}),
-			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
-		},
-		{
-			name: "3 domains, sizes [[1,0], [1,1], [2,1]], maxSkew=1, NodeFit is enabled, and not enough cpu on ZoneA; nothing should be moved",
-			nodes: []*v1.Node{
-				test.BuildTestNode("A1", 150, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
-				test.BuildTestNode("B1", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneB" }),
-				test.BuildTestNode("C1", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneC" }),
-				test.BuildTestNode("A2", 50, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
-				test.BuildTestNode("B2", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneB" }),
-				test.BuildTestNode("C2", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneC" }),
-			},
-			pods: createTestPods([]testPodList{
-				{
-					count:       1,
-					node:        "A1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       1,
-					node:        "B1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       1,
-					node:        "B2",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       2,
-					node:        "C1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       1,
-					node:        "C2",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-			}),
-			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
-		},
-		{
-			name: "2 domains, sizes [[1,4], [2,1]], maxSkew=1, NodeFit is enabled; should move 1",
-			nodes: []*v1.Node{
-				test.BuildTestNode("A1", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
-				test.BuildTestNode("A2", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneA" }),
-				test.BuildTestNode("B1", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneB" }),
-				test.BuildTestNode("B2", 1000, 2000, 9, func(n *v1.Node) { n.Labels["zone"] = "zoneB" }),
-			},
-			pods: createTestPods([]testPodList{
-				{
-					count:       1,
-					node:        "A1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       4,
-					node:        "A2",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       2,
-					node:        "B1",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-				{
-					count:       1,
-					node:        "B2",
-					labels:      map[string]string{"foo": "bar"},
-					constraints: getDefaultTopologyConstraints(1),
-				},
-			}),
-			expectedEvictedCount: 1,
-			expectedEvictedPods:  []string{"pod-4"},
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
-		},
-		{
-			// https://github.com/kubernetes-sigs/descheduler/issues/839
-			name: "2 domains, sizes [3, 1], maxSkew=1, Tainted nodes; nothing should be moved",
-			nodes: []*v1.Node{
-				test.BuildTestNode("controlplane1", 2000, 3000, 10, func(n *v1.Node) {
-					n.Labels["zone"] = "zoneA"
-					n.Labels["kubernetes.io/hostname"] = "cp-1"
-					n.Spec.Taints = []v1.Taint{
-						{
-							Effect: v1.TaintEffectNoSchedule,
-							Key:    "node-role.kubernetes.io/controlplane",
-							Value:  "true",
-						},
-						{
-							Effect: v1.TaintEffectNoSchedule,
-							Key:    "node-role.kubernetes.io/etcd",
-							Value:  "true",
-						},
-					}
-				}),
-				test.BuildTestNode("infraservices1", 2000, 3000, 10, func(n *v1.Node) {
-					n.Labels["zone"] = "zoneA"
-					n.Labels["infra_service"] = "true"
-					n.Labels["kubernetes.io/hostname"] = "infra-1"
-					n.Spec.Taints = []v1.Taint{
-						{
-							Effect: v1.TaintEffectNoSchedule,
-							Key:    "infra_service",
-						},
-					}
-				}),
-				test.BuildTestNode("app1", 2000, 3000, 10, func(n *v1.Node) {
-					n.Labels["zone"] = "zoneA"
-					n.Labels["app_service"] = "true"
-					n.Labels["kubernetes.io/hostname"] = "app-1"
-				}),
-				test.BuildTestNode("app2", 2000, 3000, 10, func(n *v1.Node) {
-					n.Labels["zone"] = "zoneB"
-					n.Labels["app_service"] = "true"
-					n.Labels["kubernetes.io/hostname"] = "app-2"
-				}),
-			},
-			pods: createTestPods([]testPodList{
-				{
-					count:  2,
-					node:   "app1",
-					labels: map[string]string{"app.kubernetes.io/name": "service"},
-					constraints: []v1.TopologySpreadConstraint{
-						{
-							MaxSkew:           1,
-							TopologyKey:       "kubernetes.io/hostname",
-							WhenUnsatisfiable: v1.DoNotSchedule,
-							LabelSelector:     &metav1.LabelSelector{MatchLabels: map[string]string{"app.kubernetes.io/name": "service"}},
-						},
-					},
-					nodeAffinity: &v1.Affinity{
-						NodeAffinity: &v1.NodeAffinity{
-							RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
-								NodeSelectorTerms: []v1.NodeSelectorTerm{
-									{
-										MatchExpressions: []v1.NodeSelectorRequirement{
-											{
-												Key:      "app_service",
-												Operator: v1.NodeSelectorOpExists,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-				{
-					count:  2,
-					node:   "app2",
-					labels: map[string]string{"app.kubernetes.io/name": "service"},
-					constraints: []v1.TopologySpreadConstraint{
-						{
-							MaxSkew:           1,
-							TopologyKey:       "kubernetes.io/hostname",
-							WhenUnsatisfiable: v1.DoNotSchedule,
-							LabelSelector:     &metav1.LabelSelector{MatchLabels: map[string]string{"app.kubernetes.io/name": "service"}},
-						},
-					},
-					nodeAffinity: &v1.Affinity{
-						NodeAffinity: &v1.NodeAffinity{
-							RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
-								NodeSelectorTerms: []v1.NodeSelectorTerm{
-									{
-										MatchExpressions: []v1.NodeSelectorRequirement{
-											{
-												Key:      "app_service",
-												Operator: v1.NodeSelectorOpExists,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			}),
-			expectedEvictedCount: 0,
-			namespaces:           []string{"ns1"},
-			args:                 RemovePodsViolatingTopologySpreadConstraintArgs{},
-			nodeFit:              true,
+			namespaces: []string{"ns1"},
 		},
 	}
 
@@ -1135,7 +954,7 @@ func TestTopologySpreadConstraint(t *testing.T) {
 			fakeClient := fake.NewSimpleClientset(objs...)
 
 			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+			podInformer := sharedInformerFactory.Core().V1().Pods()
 
 			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 			if err != nil {
@@ -1145,22 +964,6 @@ func TestTopologySpreadConstraint(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			var evictedPods []string
-			fakeClient.PrependReactor("create", "pods", func(action core.Action) (bool, runtime.Object, error) {
-				if action.GetSubresource() == "eviction" {
-					createAct, matched := action.(core.CreateActionImpl)
-					if !matched {
-						return false, nil, fmt.Errorf("unable to convert action to core.CreateActionImpl")
-					}
-					if eviction, matched := createAct.Object.(*policy.Eviction); matched {
-						evictedPods = append(evictedPods, eviction.GetName())
-					}
-				}
-				return false, nil, nil // fallback to the default reactor
-			})
-
-			eventRecorder := &events.FakeRecorder{}
-
 			podEvictor := evictions.NewPodEvictor(
 				fakeClient,
 				"v1",
@@ -1168,63 +971,18 @@ func TestTopologySpreadConstraint(t *testing.T) {
 				nil,
 				nil,
 				tc.nodes,
+				getPodsAssignedToNode,
+				false,
+				false,
+				false,
+				false,
 				false,
-				eventRecorder,
 			)
-
-			defaultevictorArgs := &defaultevictor.DefaultEvictorArgs{
-				EvictLocalStoragePods:   false,
-				EvictSystemCriticalPods: false,
-				IgnorePvcPods:           false,
-				EvictFailedBarePods:     false,
-				NodeFit:                 tc.nodeFit,
-			}
-
-			evictorFilter, err := defaultevictor.New(
-				defaultevictorArgs,
-				&frameworkfake.HandleImpl{
-					ClientsetImpl:                 fakeClient,
-					GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-					SharedInformerFactoryImpl:     sharedInformerFactory,
-				},
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			handle := &frameworkfake.HandleImpl{
-				ClientsetImpl:                 fakeClient,
-				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
-				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
-				SharedInformerFactoryImpl:     sharedInformerFactory,
-			}
-
-			plugin, err := New(
-				&tc.args,
-				handle,
-			)
-			if err != nil {
-				t.Fatalf("Unable to initialize the plugin: %v", err)
-			}
-
-			plugin.(framework.BalancePlugin).Balance(ctx, tc.nodes)
+			RemovePodsViolatingTopologySpreadConstraint(ctx, fakeClient, tc.strategy, tc.nodes, podEvictor, getPodsAssignedToNode)
 			podsEvicted := podEvictor.TotalEvicted()
 			if podsEvicted != tc.expectedEvictedCount {
 				t.Errorf("Test error for description: %s. Expected evicted pods count %v, got %v", tc.name, tc.expectedEvictedCount, podsEvicted)
 			}
-
-			if tc.expectedEvictedPods != nil {
-				diff := sets.NewString(tc.expectedEvictedPods...).Difference(sets.NewString(evictedPods...))
-				if diff.Len() > 0 {
-					t.Errorf(
-						"Expected pods %v to be evicted but %v were not evicted. Actual pods evicted: %v",
-						tc.expectedEvictedPods,
-						diff.List(),
-						evictedPods,
-					)
-				}
-			}
 		})
 	}
 }
@@ -1283,54 +1041,3 @@ func getDefaultTopologyConstraints(maxSkew int32) []v1.TopologySpreadConstraint
 		},
 	}
 }
-
-func TestCheckIdenticalConstraints(t *testing.T) {
-	newConstraintSame := v1.TopologySpreadConstraint{
-		MaxSkew:           2,
-		TopologyKey:       "zone",
-		WhenUnsatisfiable: v1.DoNotSchedule,
-		LabelSelector:     &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
-	}
-	newConstraintDifferent := v1.TopologySpreadConstraint{
-		MaxSkew:           3,
-		TopologyKey:       "node",
-		WhenUnsatisfiable: v1.DoNotSchedule,
-		LabelSelector:     &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
-	}
-	namespaceTopologySpreadConstraint := []v1.TopologySpreadConstraint{}
-	namespaceTopologySpreadConstraint = []v1.TopologySpreadConstraint{
-		{
-			MaxSkew:           2,
-			TopologyKey:       "zone",
-			WhenUnsatisfiable: v1.DoNotSchedule,
-			LabelSelector:     &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
-		},
-	}
-	testCases := []struct {
-		name                               string
-		namespaceTopologySpreadConstraints []v1.TopologySpreadConstraint
-		newConstraint                      v1.TopologySpreadConstraint
-		expectedResult                     bool
-	}{
-		{
-			name:                               "new constraint is identical",
-			namespaceTopologySpreadConstraints: namespaceTopologySpreadConstraint,
-			newConstraint:                      newConstraintSame,
-			expectedResult:                     true,
-		},
-		{
-			name:                               "new constraint is different",
-			namespaceTopologySpreadConstraints: namespaceTopologySpreadConstraint,
-			newConstraint:                      newConstraintDifferent,
-			expectedResult:                     false,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			isIdentical := hasIdenticalConstraints(tc.newConstraint, tc.namespaceTopologySpreadConstraints)
-			if isIdentical != tc.expectedResult {
-				t.Errorf("Test error for description: %s. Expected result %v, got %v", tc.name, tc.expectedResult, isIdentical)
-			}
-		})
-	}
-}

pkg/descheduler/strategies/validation/strategyparams.go

@@ -0,0 +1,71 @@
+package validation
+
+import (
+	"context"
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/sets"
+	clientset "k8s.io/client-go/kubernetes"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/utils"
+)
+
+// ValidatedStrategyParams contains validated common strategy parameters
+type ValidatedStrategyParams struct {
+	ThresholdPriority  int32
+	IncludedNamespaces sets.String
+	ExcludedNamespaces sets.String
+	LabelSelector      labels.Selector
+	NodeFit            bool
+}
+
+func DefaultValidatedStrategyParams() ValidatedStrategyParams {
+	return ValidatedStrategyParams{ThresholdPriority: utils.SystemCriticalPriority}
+}
+
+func ValidateAndParseStrategyParams(
+	ctx context.Context,
+	client clientset.Interface,
+	params *api.StrategyParameters,
+) (*ValidatedStrategyParams, error) {
+	if params == nil {
+		defaultValidatedStrategyParams := DefaultValidatedStrategyParams()
+		return &defaultValidatedStrategyParams, nil
+	}
+
+	// At most one of include/exclude can be set
+	var includedNamespaces, excludedNamespaces sets.String
+	if params.Namespaces != nil && len(params.Namespaces.Include) > 0 && len(params.Namespaces.Exclude) > 0 {
+		return nil, fmt.Errorf("only one of Include/Exclude namespaces can be set")
+	}
+	if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
+		return nil, fmt.Errorf("only one of ThresholdPriority and thresholdPriorityClassName can be set")
+	}
+
+	thresholdPriority, err := utils.GetPriorityFromStrategyParams(ctx, client, params)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get threshold priority from strategy's params: %+v", err)
+	}
+	if params.Namespaces != nil {
+		includedNamespaces = sets.NewString(params.Namespaces.Include...)
+		excludedNamespaces = sets.NewString(params.Namespaces.Exclude...)
+	}
+	var selector labels.Selector
+	if params.LabelSelector != nil {
+		selector, err = metav1.LabelSelectorAsSelector(params.LabelSelector)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get label selectors from strategy's params: %+v", err)
+		}
+	}
+
+	return &ValidatedStrategyParams{
+		ThresholdPriority:  thresholdPriority,
+		IncludedNamespaces: includedNamespaces,
+		ExcludedNamespaces: excludedNamespaces,
+		LabelSelector:      selector,
+		NodeFit:            params.NodeFit,
+	}, nil
+}

pkg/descheduler/strategies/validation/strategyparams_test.go

@@ -0,0 +1,79 @@
+package validation
+
+import (
+	"context"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes/fake"
+
+	"sigs.k8s.io/descheduler/pkg/api"
+)
+
+var (
+	thresholdPriority int32 = 1000
+)
+
+func TestValidStrategyParams(t *testing.T) {
+	ctx := context.Background()
+	fakeClient := &fake.Clientset{}
+	testCases := []struct {
+		name   string
+		params *api.StrategyParameters
+	}{
+		{name: "validate nil params", params: nil},
+		{name: "validate empty params", params: &api.StrategyParameters{}},
+		{name: "validate params with NodeFit", params: &api.StrategyParameters{NodeFit: true}},
+		{name: "validate params with ThresholdPriority", params: &api.StrategyParameters{ThresholdPriority: &thresholdPriority}},
+		{name: "validate params with priorityClassName", params: &api.StrategyParameters{ThresholdPriorityClassName: "high-priority"}},
+		{name: "validate params with excluded namespace", params: &api.StrategyParameters{Namespaces: &api.Namespaces{Exclude: []string{"excluded-ns"}}}},
+		{name: "validate params with included namespace", params: &api.StrategyParameters{Namespaces: &api.Namespaces{Include: []string{"include-ns"}}}},
+		{name: "validate params with empty label selector", params: &api.StrategyParameters{LabelSelector: &metav1.LabelSelector{}}},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			params, err := ValidateAndParseStrategyParams(ctx, fakeClient, tc.params)
+			if err != nil {
+				t.Errorf("strategy params should be valid but got err: %v", err.Error())
+			}
+			if params == nil {
+				t.Errorf("strategy params should return a strategyParams but got nil")
+			}
+		})
+	}
+}
+
+func TestInvalidStrategyParams(t *testing.T) {
+	ctx := context.Background()
+	fakeClient := &fake.Clientset{}
+	testCases := []struct {
+		name   string
+		params *api.StrategyParameters
+	}{
+		{
+			name:   "invalid params with both included and excluded namespaces nil params",
+			params: &api.StrategyParameters{Namespaces: &api.Namespaces{Include: []string{"include-ns"}, Exclude: []string{"exclude-ns"}}},
+		},
+		{
+			name:   "invalid params with both threshold priority and priority class name",
+			params: &api.StrategyParameters{ThresholdPriorityClassName: "high-priority", ThresholdPriority: &thresholdPriority},
+		},
+		{
+			name:   "invalid params with bad label selector",
+			params: &api.StrategyParameters{LabelSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"": "missing-label"}}},
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			params, err := ValidateAndParseStrategyParams(ctx, fakeClient, tc.params)
+			if err == nil {
+				t.Errorf("strategy params should be invalid but did not get err")
+			}
+			if params != nil {
+				t.Errorf("strategy params should return a nil strategyParams but got %v", params)
+			}
+		})
+	}
+}

pkg/descheduler/strategy_migration.go

@@ -1,250 +0,0 @@
-/*
-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 descheduler
-
-import (
-	"fmt"
-
-	"k8s.io/klog/v2"
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
-)
-
-// Once all strategies are migrated the arguments get read from the configuration file
-// without any wiring. Keeping the wiring here so the descheduler can still use
-// the v1alpha1 configuration during the strategy migration to plugins.
-
-var strategyParamsToPluginArgs = map[string]func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error){
-	"RemovePodsViolatingNodeTaints": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		args := &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{
-			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:           params.LabelSelector,
-			IncludePreferNoSchedule: params.IncludePreferNoSchedule,
-			ExcludedTaints:          params.ExcludedTaints,
-		}
-		if err := removepodsviolatingnodetaints.ValidateRemovePodsViolatingNodeTaintsArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodsviolatingnodetaints.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removepodsviolatingnodetaints.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removepodsviolatingnodetaints.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemoveFailedPods": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		failedPodsParams := params.FailedPods
-		if failedPodsParams == nil {
-			failedPodsParams = &v1alpha1.FailedPods{}
-		}
-		args := &removefailedpods.RemoveFailedPodsArgs{
-			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:           params.LabelSelector,
-			IncludingInitContainers: failedPodsParams.IncludingInitContainers,
-			MinPodLifetimeSeconds:   failedPodsParams.MinPodLifetimeSeconds,
-			ExcludeOwnerKinds:       failedPodsParams.ExcludeOwnerKinds,
-			Reasons:                 failedPodsParams.Reasons,
-		}
-		if err := removefailedpods.ValidateRemoveFailedPodsArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removefailedpods.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removefailedpods.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removefailedpods.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemovePodsViolatingNodeAffinity": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		args := &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{
-			Namespaces:       v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:    params.LabelSelector,
-			NodeAffinityType: params.NodeAffinityType,
-		}
-		if err := removepodsviolatingnodeaffinity.ValidateRemovePodsViolatingNodeAffinityArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodsviolatingnodeaffinity.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removepodsviolatingnodeaffinity.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removepodsviolatingnodeaffinity.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemovePodsViolatingInterPodAntiAffinity": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		args := &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{
-			Namespaces:    v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector: params.LabelSelector,
-		}
-		if err := removepodsviolatinginterpodantiaffinity.ValidateRemovePodsViolatingInterPodAntiAffinityArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodsviolatinginterpodantiaffinity.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removepodsviolatinginterpodantiaffinity.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removepodsviolatinginterpodantiaffinity.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemovePodsHavingTooManyRestarts": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		tooManyRestartsParams := params.PodsHavingTooManyRestarts
-		if tooManyRestartsParams == nil {
-			tooManyRestartsParams = &v1alpha1.PodsHavingTooManyRestarts{}
-		}
-		args := &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
-			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:           params.LabelSelector,
-			PodRestartThreshold:     tooManyRestartsParams.PodRestartThreshold,
-			IncludingInitContainers: tooManyRestartsParams.IncludingInitContainers,
-		}
-		if err := removepodshavingtoomanyrestarts.ValidateRemovePodsHavingTooManyRestartsArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodshavingtoomanyrestarts.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removepodshavingtoomanyrestarts.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removepodshavingtoomanyrestarts.PluginName,
-			Args: args,
-		}, nil
-	},
-	"PodLifeTime": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		podLifeTimeParams := params.PodLifeTime
-		if podLifeTimeParams == nil {
-			podLifeTimeParams = &v1alpha1.PodLifeTime{}
-		}
-
-		var states []string
-		if podLifeTimeParams.PodStatusPhases != nil {
-			states = append(states, podLifeTimeParams.PodStatusPhases...)
-		}
-		if podLifeTimeParams.States != nil {
-			states = append(states, podLifeTimeParams.States...)
-		}
-
-		args := &podlifetime.PodLifeTimeArgs{
-			Namespaces:            v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:         params.LabelSelector,
-			MaxPodLifeTimeSeconds: podLifeTimeParams.MaxPodLifeTimeSeconds,
-			States:                states,
-		}
-		if err := podlifetime.ValidatePodLifeTimeArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", podlifetime.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", podlifetime.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: podlifetime.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemoveDuplicates": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		args := &removeduplicates.RemoveDuplicatesArgs{
-			Namespaces: v1alpha1NamespacesToInternal(params.Namespaces),
-		}
-		if params.RemoveDuplicates != nil {
-			args.ExcludeOwnerKinds = params.RemoveDuplicates.ExcludeOwnerKinds
-		}
-		if err := removeduplicates.ValidateRemoveDuplicatesArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removeduplicates.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removeduplicates.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removeduplicates.PluginName,
-			Args: args,
-		}, nil
-	},
-	"RemovePodsViolatingTopologySpreadConstraint": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		args := &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-			Namespaces:             v1alpha1NamespacesToInternal(params.Namespaces),
-			LabelSelector:          params.LabelSelector,
-			IncludeSoftConstraints: params.IncludeSoftConstraints,
-		}
-		if err := removepodsviolatingtopologyspreadconstraint.ValidateRemovePodsViolatingTopologySpreadConstraintArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodsviolatingtopologyspreadconstraint.PluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", removepodsviolatingtopologyspreadconstraint.PluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-			Args: args,
-		}, nil
-	},
-	"HighNodeUtilization": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		if params.NodeResourceUtilizationThresholds == nil {
-			params.NodeResourceUtilizationThresholds = &v1alpha1.NodeResourceUtilizationThresholds{}
-		}
-		args := &nodeutilization.HighNodeUtilizationArgs{
-			EvictableNamespaces: v1alpha1NamespacesToInternal(params.Namespaces),
-			Thresholds:          v1alpha1ThresholdToInternal(params.NodeResourceUtilizationThresholds.Thresholds),
-			NumberOfNodes:       params.NodeResourceUtilizationThresholds.NumberOfNodes,
-		}
-		if err := nodeutilization.ValidateHighNodeUtilizationArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", nodeutilization.HighNodeUtilizationPluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", nodeutilization.HighNodeUtilizationPluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: nodeutilization.HighNodeUtilizationPluginName,
-			Args: args,
-		}, nil
-	},
-	"LowNodeUtilization": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
-		if params.NodeResourceUtilizationThresholds == nil {
-			params.NodeResourceUtilizationThresholds = &v1alpha1.NodeResourceUtilizationThresholds{}
-		}
-		args := &nodeutilization.LowNodeUtilizationArgs{
-			EvictableNamespaces:    v1alpha1NamespacesToInternal(params.Namespaces),
-			Thresholds:             v1alpha1ThresholdToInternal(params.NodeResourceUtilizationThresholds.Thresholds),
-			TargetThresholds:       v1alpha1ThresholdToInternal(params.NodeResourceUtilizationThresholds.TargetThresholds),
-			UseDeviationThresholds: params.NodeResourceUtilizationThresholds.UseDeviationThresholds,
-			NumberOfNodes:          params.NodeResourceUtilizationThresholds.NumberOfNodes,
-		}
-
-		if err := nodeutilization.ValidateLowNodeUtilizationArgs(args); err != nil {
-			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", nodeutilization.LowNodeUtilizationPluginName)
-			return nil, fmt.Errorf("strategy %q param validation failed: %v", nodeutilization.LowNodeUtilizationPluginName, err)
-		}
-		return &api.PluginConfig{
-			Name: nodeutilization.LowNodeUtilizationPluginName,
-			Args: args,
-		}, nil
-	},
-}
-
-func v1alpha1NamespacesToInternal(namespaces *v1alpha1.Namespaces) *api.Namespaces {
-	internal := &api.Namespaces{}
-	if namespaces != nil {
-		if namespaces.Exclude != nil {
-			internal.Exclude = namespaces.Exclude
-		}
-		if namespaces.Include != nil {
-			internal.Include = namespaces.Include
-		}
-	} else {
-		internal = nil
-	}
-	return internal
-}
-
-func v1alpha1ThresholdToInternal(thresholds v1alpha1.ResourceThresholds) api.ResourceThresholds {
-	internal := make(api.ResourceThresholds, len(thresholds))
-	for k, v := range thresholds {
-		internal[k] = api.Percentage(float64(v))
-	}
-	return internal
-}