descheduler: wire the metrics collector with the framework handle

.copilotignore

@@ -1 +0,0 @@
-vendor/**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,22 +0,0 @@
-## Description
-<!-- Please include a summary of the change and which issue is fixed -->
-
-## Checklist
-Please ensure your pull request meets the following criteria before submitting
-for review, these items will be used by reviewers to assess the quality and
-completeness of your changes:
-
-- [ ] **Code Readability**: Is the code easy to understand, well-structured, and consistent with project conventions?
-- [ ] **Naming Conventions**: Are variable, function, and structs descriptive and consistent?
-- [ ] **Code Duplication**: Is there any repeated code that should be refactored?
-- [ ] **Function/Method Size**: Are functions/methods short and focused on a single task?
-- [ ] **Comments & Documentation**: Are comments clear, useful, and not excessive? Were comments updated where necessary?
-- [ ] **Error Handling**: Are errors handled appropriately ?
-- [ ] **Testing**: Are there sufficient unit/integration tests?
-- [ ] **Performance**: Are there any obvious performance issues or unnecessary computations?
-- [ ] **Dependencies**: Are new dependencies justified ?
-- [ ] **Logging & Monitoring**: Is logging used appropriately (not too verbose, not too silent)?
-- [ ] **Backward Compatibility**: Does this change break any existing functionality or APIs?
-- [ ] **Resource Management**: Are resources (files, connections, memory) managed and released properly?
-- [ ] **PR Description**: Is the PR description clear, providing enough context and explaining the motivation for the change?
-- [ ] **Documentation & Changelog**: Are README and docs updated if necessary?

.github/workflows/helm.yaml

@@ -20,31 +20,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.15.1
 
-      - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
+      - uses: actions/setup-python@v5.1.1
         with:
           python-version: 3.12
 
-      - uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0
+        uses: helm/chart-testing-action@v2.6.1
         with:
           version: v3.11.0
 
       - name: Install Helm Unit Test Plugin
         run: |
-          helm plugin install --version 1.0.3 https://github.com/helm-unittest/helm-unittest
+          helm plugin install https://github.com/helm-unittest/helm-unittest
 
       - name: Run Helm Unit Tests
         run: |

.github/workflows/manifests.yaml

@@ -7,35 +7,21 @@ jobs:
   deploy:
     strategy:
       matrix:
-        k8s-version: ["v1.36.1"]
-        build-kind-node-image: [true]
-        kind-node-image: ["localhost/kindest/node:v1.36.1"]
-        descheduler-version: ["v0.36.0"]
+        k8s-version: ["v1.31.0"]
+        descheduler-version: ["v0.31.0"]
         descheduler-api: ["v1alpha2"]
         manifest: ["deployment"]
-        kind-version: ["v0.31.0"] # keep in sync with test/run-e2e-tests.sh
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # git ls-remote https://github.com/actions/checkout.git refs/tags/v6.0.2
-      - name: Install kind
-        uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # git ls-remote https://github.com/helm/kind-action.git refs/tags/v1.14.0
-        with:
-          version: ${{ matrix.kind-version }}
-          kubectl_version: ${{ matrix.k8s-version }}
-          install_only: true
-      - name: Build kind node image
-        if: ${{ matrix.build-kind-node-image == true }}
-        run: |
-          kind build node-image ${{ matrix.k8s-version }} --image ${{ matrix.kind-node-image }}
+        uses: actions/checkout@v4
       - name: Create kind cluster
-        uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # git ls-remote https://github.com/helm/kind-action.git refs/tags/v1.14.0
+        uses: helm/kind-action@v1.10.0
         with:
-          node_image: ${{ matrix.kind-node-image }}
+          node_image: kindest/node:${{ matrix.k8s-version }}
           kubectl_version: ${{ matrix.k8s-version }}
           config: test/kind-config.yaml
-          version: ${{ matrix.kind-version }}
-      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # git ls-remote https://github.com/actions/setup-go.git refs/tags/v6.4.0
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true

.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
@@ -23,12 +23,12 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        uses: azure/setup-helm@v4.2.0
         with:
           version: v3.15.1
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_RELEASE_NAME_TEMPLATE: "descheduler-helm-chart-{{ .Version }}"

.github/workflows/security.yaml

@@ -17,9 +17,12 @@ jobs:
       actions: read
       contents: read
       security-events: write
+
+    strategy:
+      fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -29,7 +32,7 @@ jobs:
           IMAGE_TAG=${HELM_IMAGE_TAG:-security-test}
           VERSION=security-test make image
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1  # v0.35.0
+        uses: aquasecurity/trivy-action@master
         with:
           image-ref: 'descheduler:security-test'
           format: 'sarif'
@@ -38,6 +41,7 @@ jobs:
           output: 'trivy-results.sarif'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@7c1e4cf0b20d7c1872b26569c00ba908797a59bf # v4
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-results.sarif'
+          exit-code: '0'

.golangci.yml

@@ -1,36 +1,18 @@
-version: "2"
+run:
+  timeout: 2m
+
 linters:
-  default: none
-  enable:
-    - gocyclo
-    - govet
-    - misspell
-    # - staticcheck // TODO: enable later once the code is properly updated
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
+  disable-all: true
   enable:
     - gofmt
     - gofumpt
-    #- goimports // TODO: enable later once the code is properly updated
-  settings:
-    gofumpt:
-      extra-rules: true
-    goimports:
-      local-prefixes:
-        - sigs.k8s.io/descheduler
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    - gosimple
+    - gocyclo
+    - misspell
+    - govet
+
+linters-settings:
+  gofumpt:
+    extra-rules: true
+  goimports:
+    local-prefixes: sigs.k8s.io/descheduler

CONTRIBUTING-descheduler.md

@@ -1,30 +0,0 @@
-# Descheduler Design Constraints
-
-This is a slowly growing document that lists good practices, conventions, and design decisions.
-
-## Overview
-
-TBD
-
-## Code convention
-
-* *formatting code*: running `make fmt` before committing each change to avoid ci failing
-
-## Unit Test Conventions
-
-These are the known conventions that are useful to practice whenever reasonable:
-
-* *single pod creation*: each pod variable built using `test.BuildTestPod` is updated only through the `apply` argument of `BuildTestPod`
-* *single node creation*: each node variable built using `test.BuildTestNode` is updated only through the `apply` argument of `BuildTestNode`
-* *no object instance sharing*: each object built through `test.BuildXXX` functions is newly created in each unit test to avoid accidental object mutations
-* *no object instance duplication*: avoid duplication by no creating two objects with the same passed values at two different places. E.g. two nodes created with the same memory, cpu and pods requests. Rather create a single function wrapping test.BuildTestNode and invoke this wrapper multiple times.
-
-The aim is to reduce cognitive load when reading and debugging the test code.
-
-## Design Decisions FAQ
-
-This section documents common questions about design decisions in the descheduler codebase and the rationale behind them.
-
-### Why doesn't the framework provide helpers for registering and retrieving indexers for plugins?
-
-In general, each plugin can have many indexers—for example, for nodes, namespaces, pods, and other resources. Each plugin, depending on its internal optimizations, may choose a different indexing function. Indexers are currently used very rarely in the framework and default plugins. Therefore, extending the framework interface with additional helpers for registering and retrieving indexers might introduce an unnecessary and overly restrictive layer without first understanding how indexers will be used. For the moment, I suggest avoiding any restrictions on how many indexers can be registered or which ones can be registered. Instead, we should extend the framework handle to provide a unique ID for each profile, so that indexers within the same profile share a unique prefix. This avoids collisions when the same profile is instantiated more than once. Later, once we learn more about indexer usage, we can revisit whether it makes sense to impose additional restrictions.

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.26.0
+FROM golang:1.22.5
 
 WORKDIR /go/src/sigs.k8s.io/descheduler
 COPY . .
@@ -21,7 +21,7 @@ RUN VERSION=${VERSION} make build.$ARCH
 
 FROM scratch
 
-MAINTAINER Kubernetes SIG Scheduling <sig-scheduling@kubernetes.io>
+MAINTAINER Kubernetes SIG Scheduling <kubernetes-sig-scheduling@googlegroups.com>
 
 LABEL org.opencontainers.image.source https://github.com/kubernetes-sigs/descheduler
 

Dockerfile.dev

@@ -13,7 +13,7 @@
 # limitations under the License.
 FROM scratch
 
-MAINTAINER Kubernetes SIG Scheduling <sig-scheduling@kubernetes.io>
+MAINTAINER Kubernetes SIG Scheduling <kubernetes-sig-scheduling@googlegroups.com>
 
 USER 1000
 

Makefile

@@ -26,10 +26,10 @@ 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 := v2.8.0
+GOLANGCI_VERSION := v1.61.0
 HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null)
 
-GOFUMPT_VERSION := v0.10.0
+GOFUMPT_VERSION := v0.7.0
 HAS_GOFUMPT := $(shell command -v gofumpt 2> /dev/null)
 
 GO_VERSION := $(shell (command -v jq > /dev/null && (go mod edit -json | jq -r .Go)) || (sed -En 's/^go (.*)$$/\1/p' go.mod))
@@ -146,17 +146,15 @@ verify-gen:
 
 lint:
 ifndef HAS_GOLANGCI
-	GOBIN=$(CURRENT_DIR)/_output/bin go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_VERSION}
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./_output/bin ${GOLANGCI_VERSION}
 endif
-	./_output/bin/golangci-lint run -v
-	./_output/bin/golangci-lint fmt -v
+	./_output/bin/golangci-lint run
 
 fmt:
 ifndef HAS_GOFUMPT
 	go install mvdan.cc/gofumpt@${GOFUMPT_VERSION}
 endif
 	gofumpt -w -extra .
-	goimports -w pkg metrics test
 
 # helm
 

OWNERS

@@ -4,7 +4,6 @@ approvers:
 - seanmalloy
 - a7i
 - knelasevero
-- ricardomaraschini
 reviewers:
 - damemi
 - seanmalloy
@@ -14,8 +13,6 @@ reviewers:
 - janeliul
 - knelasevero
 - jklaw90
-- googs1025
-- ricardomaraschini
 emeritus_approvers:
 - aveshagarwal
 - k82cn

README.md

@@ -33,18 +33,15 @@ but relies on the default scheduler for that.
 ## ⚠️  Documentation Versions by Release
 
 If you are using a published release of Descheduler (such as
-`registry.k8s.io/descheduler/descheduler:v0.36.0`), follow the documentation in
+`registry.k8s.io/descheduler/descheduler:v0.31.0`), follow the documentation in
 that version's release branch, as listed below:
 
 |Descheduler Version|Docs link|
 |---|---|
-|v0.36.x|[`release-1.36`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.36/README.md)|
-|v0.35.x|[`release-1.35`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.35/README.md)|
-|v0.34.x|[`release-1.34`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.34/README.md)|
-|v0.33.x|[`release-1.33`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.33/README.md)|
-|v0.32.x|[`release-1.32`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.32/README.md)|
 |v0.31.x|[`release-1.31`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.31/README.md)|
 |v0.30.x|[`release-1.30`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.30/README.md)|
+|v0.29.x|[`release-1.29`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.29/README.md)|
+|v0.28.x|[`release-1.28`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.28/README.md)|
 
 The
 [`master`](https://github.com/kubernetes-sigs/descheduler/blob/master/README.md)
@@ -96,17 +93,17 @@ See the [resources | Kustomize](https://kubectl.docs.kubernetes.io/references/ku
 
 Run As A Job
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=release-1.34' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=release-1.31' | kubectl apply -f -
 ```
 
 Run As A CronJob
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=release-1.34' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=release-1.31' | kubectl apply -f -
 ```
 
 Run As A Deployment
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=release-1.34' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=release-1.31' | kubectl apply -f -
 ```
 
 ## User Guide
@@ -121,101 +118,29 @@ The Descheduler Policy is configurable and includes default strategy plugins tha
 
 These are top level keys in the Descheduler Policy that you can use to configure all evictions.
 
-| Name                               | type     | Default Value | Description                                                                                                                |
-|------------------------------------|----------|---------------|----------------------------------------------------------------------------------------------------------------------------|
-| `nodeSelector`                     | `string` | `nil`         | Limiting the nodes which are processed. Only used when `nodeFit`=`true` and only by the PreEvictionFilter Extension Point. |
-| `maxNoOfPodsToEvictPerNode`        | `int`    | `nil`         | Maximum number of pods evicted from each node (summed through all strategies).                                             |
-| `maxNoOfPodsToEvictPerNamespace`   | `int`    | `nil`         | Maximum number of pods evicted from each namespace (summed through all strategies).                                        |
-| `maxNoOfPodsToEvictTotal`          | `int`    | `nil`         | Maximum number of pods evicted per rescheduling cycle (summed through all strategies).                                     |
-| `metricsCollector` (deprecated)    | `object` | `nil`         | Configures collection of metrics for actual resource utilization.                                                          |
-| `metricsCollector.enabled`         | `bool`   | `false`       | Enables Kubernetes [Metrics Server](https://kubernetes-sigs.github.io/metrics-server/) collection.                         |
-| `metricsProviders`                 | `[]object` | `nil`       | Enables various metrics providers like Kubernetes [Metrics Server](https://kubernetes-sigs.github.io/metrics-server/)      |
-| `evictionFailureEventNotification` | `bool`   | `false`       | Enables eviction failure event notification.                                                                               |
-| `gracePeriodSeconds`               | `int`    | `nil`           | The duration in seconds before the object should be deleted. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used.            |
-| `prometheus` |`object`| `nil` | Configures collection of Prometheus metrics for actual resource utilization |
-| `prometheus.url` |`string`| `nil` | Points to a Prometheus server url |
-| `prometheus.authToken` |`object`| `nil` | Sets Prometheus server authentication token. If not specified in cluster authentication token from the container's file system is read. |
-| `prometheus.authToken.secretReference` |`object`| `nil` | Read the authentication token from a kubernetes secret (the secret is expected to contain the token under `prometheusAuthToken` data key) |
-| `prometheus.authToken.secretReference.namespace` |`string`| `nil` | Authentication token kubernetes secret namespace (currently, the RBAC configuration permits retrieving secrets from the `kube-system` namespace. If the secret needs to be accessed from a different namespace, the existing RBAC rules must be explicitly extended. |
-| `prometheus.authToken.secretReference.name` |`string`| `nil` | Authentication token kubernetes secret name |
-
-The descheduler currently allows to configure a metric collection of Kubernetes Metrics through `metricsProviders` field.
-The previous way of setting `metricsCollector` field is deprecated. There are currently two sources to configure:
-- `KubernetesMetrics`: enables metrics collection from Kubernetes Metrics server
-- `Prometheus`: enables metrics collection from Prometheus server
-
-In general, each plugin can consume metrics from a different provider so multiple distinct providers can be configured in parallel.
-
+| Name |type| Default Value | Description |
+|------|----|---------------|-------------|
+| `nodeSelector` |`string`| `nil` | limiting the nodes which are processed. Only used when `nodeFit`=`true` and only by the PreEvictionFilter Extension Point |
+| `maxNoOfPodsToEvictPerNode` |`int`| `nil` | maximum number of pods evicted from each node (summed through all strategies) |
+| `maxNoOfPodsToEvictPerNamespace` |`int`| `nil` | maximum number of pods evicted from each namespace (summed through all strategies) |
+| `maxNoOfPodsToEvictTotal` |`int`| `nil` | maximum number of pods evicted per rescheduling cycle (summed through all strategies) |
 
 ### Evictor Plugin configuration (Default Evictor)
 
 The Default Evictor Plugin is used by default for filtering pods before processing them in an strategy plugin, or for applying a PreEvictionFilter of pods before eviction. You can also create your own Evictor Plugin or use the Default one provided by Descheduler.  Other uses for the Evictor plugin can be to sort, filter, validate or group pods by different criteria, and that's why this is handled by a plugin and not configured in the top level config.
 
-| Name                      | Type                   | Default Value | Description                                                                                                                                                                                                         |
-|---------------------------|------------------------|---------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `nodeSelector`            | `string`               | `nil`         | Limits the nodes that are processed.                                                                                                                                                                                |
-| `evictLocalStoragePods`   | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"PodsWithLocalStorage"` instead]**<br>Allows eviction of pods using local storage.                                                                                        |
-| `evictDaemonSetPods`      | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"DaemonSetPods"` instead]**<br>Allows eviction of DaemonSet managed Pods.                                                                                                 |
-| `evictSystemCriticalPods` | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"SystemCriticalPods"` instead]**<br>[Warning: Will evict Kubernetes system pods] Allows eviction of pods with any priority, including system-critical pods like kube-dns. |
-| `ignorePvcPods`           | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"PodsWithPVC"` instead]**<br>Sets whether PVC pods should be evicted or ignored.                                                                                          |
-| `evictFailedBarePods`     | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"FailedBarePods"` instead]**<br>Allows eviction of pods without owner references and in a failed phase.                                                                   |
-| `ignorePodsWithoutPDB`    | `bool`                 | `false`       | **[Deprecated: Use `podProtections` with `"PodsWithoutPDB"` instead]**<br>Sets whether pods without PodDisruptionBudget should be evicted or ignored.                                                               |
-| `namespaceLabelSelector`  | `metav1.LabelSelector` |               | limiting the pods which are processed by namespace (see [label filtering](#label-filtering))                                                                                                                        |
-| `labelSelector`           | `metav1.LabelSelector` |               | (See [label filtering](#label-filtering))                                                                                                                                                                           |
-| `priorityThreshold`       | `priorityThreshold`    |               | (See [priority filtering](#priority-filtering))                                                                                                                                                                     |
-| `nodeFit`                 | `bool`                 | `false`       | (See [node fit filtering](#node-fit-filtering))                                                                                                                                                                     |
-| `minReplicas`             | `uint`                 | `0`           | Ignores eviction of pods where the owner (e.g., `ReplicaSet`) replicas are below this threshold.                                                                                                                    |
-| `minPodAge`               | `metav1.Duration`      | `0`           | Ignores eviction of pods with a creation time within this threshold.                                                                                                                                                |
-| `noEvictionPolicy`        | `enum`                 | ``            | sets whether a `descheduler.alpha.kubernetes.io/prefer-no-eviction` pod annotation is considered preferred or mandatory. Accepted values: "", "Preferred", "Mandatory". Defaults to "Preferred".                    |
-| `podProtections`          | `PodProtections`       | `{}`          | Holds the list of enabled and disabled protection pod policies.<br>Users can selectively disable certain default protection rules or enable extra ones. See below for supported values.                             |
-
-#### Supported Values for `podProtections.DefaultDisabled`
-
-> Setting a value in `defaultDisabled` **disables the corresponding default protection rule**. This means the specified type of Pods will **no longer be protected** from eviction and may be evicted if they meet other criteria.
-
-| Value                    | Meaning                                                                 |
-|--------------------------|-------------------------------------------------------------------------|
-| `"PodsWithLocalStorage"` | Allow eviction of Pods using local storage.                             |
-| `"DaemonSetPods"`        | Allow eviction of DaemonSet-managed Pods.                               |
-| `"SystemCriticalPods"`   | Allow eviction of system-critical Pods.                                 |
-| `"FailedBarePods"`       | Allow eviction of failed bare Pods (without controllers).               |
-
----
-
-#### Supported Values for `podProtections.ExtraEnabled`
-
-> Setting a value in `extraEnabled` **enables an additional protection rule**. This means the specified type of Pods will be **protected** from eviction.
-
-| Value                      | Meaning                                                          |
-|----------------------------|------------------------------------------------------------------|
-| `"PodsWithPVC"`            | Prevents eviction of Pods using Persistent Volume Claims (PVCs). |
-| `"PodsWithoutPDB"`         | Prevents eviction of Pods without a PodDisruptionBudget (PDB).   |
-| `"PodsWithResourceClaims"` | Prevents eviction of Pods using ResourceClaims.                  |
-
-
-#### Protecting pods using specific Storage Classes
-
-With the `PodsWithPVC` protection enabled all pods using PVCs are protected from eviction by default, if needed you can restrict the protection by filtering by PVC storage class. When filtering out by storage class, only pods using PVCs with the specified storage classes are protected from eviction. For example:
-
-```yaml
-apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-- name: ProfileName
-  pluginConfig:
-  - name: "DefaultEvictor"
-    args:
-      podProtections:
-        extraEnabled:
-        - PodsWithPVC
-        config:
-          PodsWithPVC:
-            protectedStorageClasses:
-            - name: storage-class-0
-            - name: storage-class-1
-
-```
-This example will protect pods using PVCs with storage classes `storage-class-0` and `storage-class-1` from eviction.
+| Name |type| Default Value | Description |
+|------|----|---------------|-------------|
+| `nodeSelector` |`string`| `nil` | limiting the nodes which are processed |
+| `evictLocalStoragePods` |`bool`| `false` | allows eviction of pods with local storage |
+| `evictSystemCriticalPods` |`bool`| `false` | [Warning: Will evict Kubernetes system pods] allows eviction of pods with any priority, including system pods like kube-dns |
+| `ignorePvcPods` |`bool`| `false` | set whether PVC pods should be evicted or ignored |
+| `evictFailedBarePods` |`bool`| `false` | allow eviction of pods without owner references and in failed phase |
+|`labelSelector`|`metav1.LabelSelector`||(see [label filtering](#label-filtering))|
+|`priorityThreshold`|`priorityThreshold`||(see [priority filtering](#priority-filtering))|
+|`nodeFit`|`bool`|`false`|(see [node fit filtering](#node-fit-filtering))|
+|`minReplicas`|`uint`|`0`| ignore eviction of pods where owner (e.g. `ReplicaSet`) replicas is below this threshold |
+|`minPodAge`|`metav1.Duration`|`0`| ignore eviction of pods with a creation time within this threshold |
 
 ### Example policy
 
@@ -232,32 +157,14 @@ nodeSelector: "node=node1" # you don't need to set this, if not set all will be
 maxNoOfPodsToEvictPerNode: 5000 # you don't need to set this, unlimited if not set
 maxNoOfPodsToEvictPerNamespace: 5000 # you don't need to set this, unlimited if not set
 maxNoOfPodsToEvictTotal: 5000 # you don't need to set this, unlimited if not set
-gracePeriodSeconds: 60 # you don't need to set this, 0 if not set
-# you don't need to set this, metrics are not collected if not set
-metricsProviders:
-- source: Prometheus
-  prometheus:
-    url: http://prometheus-kube-prometheus-prometheus.prom.svc.cluster.local
-    authToken:
-      secretReference:
-        namespace: "kube-system"
-        name: "authtoken"
 profiles:
   - name: ProfileName
     pluginConfig:
     - name: "DefaultEvictor"
       args:
-        podProtections:
-          defaultDisabled:
-            #- "PodsWithLocalStorage"
-            #- "SystemCriticalPods"
-            #- "DaemonSetPods"
-            #- "FailedBarePods"
-          extraEnabled:
-            #- "PodsWithPVC"
-            #- "PodsWithoutPDB"
-            #- "PodsWithResourceClaims"
-          config: {}
+        evictSystemCriticalPods: true
+        evictFailedBarePods: true
+        evictLocalStoragePods: true
         nodeFit: true
         minReplicas: 2
     plugins:
@@ -298,7 +205,7 @@ Balance Plugins: These plugins process all pods, or groups of pods, and determin
 | [RemovePodsViolatingNodeTaints](#removepodsviolatingnodetaints) |Deschedule|Evicts pods violating node taints|
 | [RemovePodsViolatingTopologySpreadConstraint](#removepodsviolatingtopologyspreadconstraint) |Balance|Evicts pods violating TopologySpreadConstraints|
 | [RemovePodsHavingTooManyRestarts](#removepodshavingtoomanyrestarts) |Deschedule|Evicts pods having too many restarts|
-| [PodLifeTime](#podlifetime) |Deschedule|Evicts pods based on age, status transitions, conditions, states, exit codes, and owner kinds|
+| [PodLifeTime](#podlifetime) |Deschedule|Evicts pods that have exceeded a specified age limit|
 | [RemoveFailedPods](#removefailedpods) |Deschedule|Evicts pods with certain failed reasons and exit codes|
 
 
@@ -369,18 +276,11 @@ If that parameter is set to `true`, the thresholds are considered as percentage
 `thresholds` will be deducted from the mean among all nodes and `targetThresholds` will be added to the mean.
 A resource consumption above (resp. below) this window is considered as overutilization (resp. underutilization).
 
-**NOTE:** By default node resource consumption is determined by the requests and limits of pods, not actual usage.
+**NOTE:** Node resource consumption is determined by the requests and limits of pods, not actual usage.
 This approach is chosen in order to maintain consistency with the kube-scheduler, which follows the same
 design for scheduling pods onto nodes. This means that resource usage as reported by Kubelet (or commands
 like `kubectl top`) may differ from the calculated consumption, due to these components reporting
-actual usage metrics. Metrics-based descheduling can be enabled by setting `metricsUtilization.metricsServer` field (deprecated)
-or `metricsUtilization.source` field to `KubernetesMetrics`.
-In order to have the plugin consume the metrics the metric provider needs to be configured as well.
-Alternatively, it is possible to create a prometheus client and configure a prometheus query to consume
-metrics outside of the kubernetes metrics server. The query is expected to return a vector of values for
-each node. The values are expected to be any real number within <0; 1> interval. During eviction only
-a single pod is evicted at most from each overutilized node. There's currently no support for evicting more.
-See `metricsProviders` field at [Top Level configuration](#top-level-configuration) for available options.
+actual usage metrics. Implementing metrics-based descheduling is currently TODO for the project.
 
 **Parameters:**
 
@@ -390,13 +290,7 @@ See `metricsProviders` field at [Top Level configuration](#top-level-configurati
 |`thresholds`|map(string:int)|
 |`targetThresholds`|map(string:int)|
 |`numberOfNodes`|int|
-|`evictionLimits`|object|
 |`evictableNamespaces`|(see [namespace filtering](#namespace-filtering))|
-|`metricsUtilization`|object|
-|`metricsUtilization.metricsServer` (deprecated)|bool|
-|`metricsUtilization.source`|string|
-|`metricsUtilization.prometheus.query`|string|
-
 
 **Example:**
 
@@ -416,12 +310,6 @@ profiles:
           "cpu" : 50
           "memory": 50
           "pods": 50
-        # metricsUtilization:
-        #   source: Prometheus
-        #   prometheus:
-        #     query: instance:node_cpu:rate:sum
-        evictionLimits:
-          node: 5
     plugins:
       balance:
         enabled:
@@ -437,12 +325,10 @@ and will not be used to compute node's usage if it's not specified in `threshold
 * The valid range of the resource's percentage value is \[0, 100\]
 * Percentage value of `thresholds` can not be greater than `targetThresholds` for the same resource.
 
-There are two more parameters associated with the `LowNodeUtilization` strategy, called `numberOfNodes` and `evictionLimits`.
-The first parameter can be configured to activate the strategy only when the number of under utilized nodes
+There is another parameter associated with the `LowNodeUtilization` strategy, called `numberOfNodes`.
+This parameter can be configured to activate the strategy only when the number of under utilized nodes
 are above the configured value. This could be helpful in large clusters where a few nodes could go
 under utilized frequently or for a short period of time. By default, `numberOfNodes` is set to zero.
-The second parameter is useful when a number of evictions per the plugin per a descheduling cycle needs to be limited.
-The parameter currently enables to limit the number of evictions per node through `node` field.
 
 ### HighNodeUtilization
 
@@ -468,12 +354,6 @@ strategy evicts pods from `underutilized nodes` (those with usage below `thresho
 so that they can be recreated in appropriately utilized nodes.
 The strategy will abort if any number of `underutilized nodes` or `appropriately utilized nodes` is zero.
 
-To control pod eviction from underutilized nodes, use the `evictionModes`
-array. A lenient policy, which evicts pods regardless of their resource
-requests, is the default. To enable a stricter policy that only evicts pods
-with resource requests defined for the provided threshold resources, add the
-option `OnlyThresholdingResources` to the `evictionModes` configuration.
-
 **NOTE:** Node resource consumption is determined by the requests and limits of pods, not actual usage.
 This approach is chosen in order to maintain consistency with the kube-scheduler, which follows the same
 design for scheduling pods onto nodes. This means that resource usage as reported by Kubelet (or commands
@@ -486,15 +366,8 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 |---|---|
 |`thresholds`|map(string:int)|
 |`numberOfNodes`|int|
-|`evictionModes`|list(string)|
 |`evictableNamespaces`|(see [namespace filtering](#namespace-filtering))|
 
-**Supported Eviction Modes:**
-
-|Name|Description|
-|---|---|
-|`OnlyThresholdingResources`|Evict only pods that have resource requests defined for the provided threshold resources.|
-
 **Example:**
 
 ```yaml
@@ -513,8 +386,6 @@ profiles:
           exclude:
           - "kube-system"
           - "namespace1"
-        evictionModes:
-          - "OnlyThresholdingResources"
     plugins:
       balance:
         enabled:
@@ -786,52 +657,28 @@ profiles:
 
 ### PodLifeTime
 
-This strategy evicts pods based on their age, status transitions, conditions, states, exit codes, and owner kinds. It supports both simple age-based eviction and fine-grained cleanup of pods matching specific transition criteria.
+This strategy evicts pods that are older than `maxPodLifeTimeSeconds`.
 
-All non-empty filter categories are ANDed (a pod must satisfy every specified filter). Within each category, items are ORed (matching any one entry satisfies that filter). For `conditions`, a pod is eligible for eviction if **any** of the listed condition filters match — each filter is evaluated independently against the pod's `status.conditions[]` entries. Pods are processed from oldest to newest based on their creation time.
+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`, `Unknown`
+  - [Pod Reason](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-conditions) reasons of: `NodeAffinity`, `NodeLost`, `Shutdown`, `UnexpectedAdmissionError`
+  - [Container State Waiting](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-waiting) condition of: `PodInitializing`, `ContainerCreating`, `ImagePullBackOff`, `CrashLoopBackOff`, `CreateContainerConfigError`, `ErrImagePull`, `ImagePullBackOff`, `CreateContainerError`, `InvalidImageName`
 
-See the [plugin README](pkg/framework/plugins/podlifetime/README.md) for detailed documentation and advanced use cases.
+If a value for `states` or `podStatusPhases` is not specified,
+Pods in any state (even `Running`) are considered for eviction.
 
 **Parameters:**
 
-| Name | Type | Notes |
-|------|------|-------|
-| `conditions` | list(object) | Each with optional `type`, `status`, `reason`, `minTimeSinceLastTransitionSeconds` fields |
-| `exitCodes` | list(int32) | Container terminated exit codes |
-| `includingEphemeralContainers` | bool | Extend state filtering to ephemeral containers |
-| `includingInitContainers` | bool | Extend state/exitCode filtering to init containers |
-| `labelSelector` | (see [label filtering](#label-filtering)) | |
-| `maxPodLifeTimeSeconds` | uint | Pods older than this many seconds are evicted |
-| `namespaces` | (see [namespace filtering](#namespace-filtering)) | |
-| `ownerKinds` | object | `include` or `exclude` list of owner reference kinds |
-| `states` | list(string) | Pod phases, pod status reasons, container waiting/terminated reasons |
+| Name                           | Type                                              | Notes                    |
+|--------------------------------|---------------------------------------------------|--------------------------|
+| `maxPodLifeTimeSeconds`        | int                                               |                          |
+| `states`                       | list(string)                                      | Only supported in v0.25+ |
+| `includingInitContainers`      | bool                                              | Only supported in v0.31+ |
+| `includingEphemeralContainers` | bool                                              | Only supported in v0.31+ |
+| `namespaces`                   | (see [namespace filtering](#namespace-filtering)) |                          |
+| `labelSelector`                | (see [label filtering](#label-filtering))         |                          |
 
-**Example (transition-based eviction):**
-
-```yaml
-apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "PodLifeTime"
-      args:
-        states:
-        - "Succeeded"
-        conditions:
-        - reason: "PodCompleted"
-          status: "True"
-          minTimeSinceLastTransitionSeconds: 14400
-        ownerKinds:
-          exclude:
-          - "Job"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
-```
-
-**Example (age-based eviction):**
+**Example:**
 
 ```yaml
 apiVersion: "descheduler/v1alpha2"
@@ -852,7 +699,6 @@ profiles:
 ```
 
 ### RemoveFailedPods
-
 This strategy evicts pods that are in failed status phase.
 You can provide optional parameters to filter by failed pods' and containters' `reasons`. and `exitCodes`. `exitCodes` apply to failed pods' containers with `terminated` state only. `reasons` and `exitCodes` can be expanded to include those of InitContainers as well by setting the optional parameter `includingInitContainers` to `true`.
 You can specify an optional parameter `minPodLifetimeSeconds` to evict pods that are older than specified seconds.
@@ -1012,7 +858,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.33/#labelselector-v1-meta)
+The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#labelselector-v1-meta)
 to filter pods by their labels:
 
 * `PodLifeTime`
@@ -1098,16 +944,12 @@ never evicted because these pods won't be recreated. (Standalone pods in failed
 * Pods with PVCs are evicted (unless `ignorePvcPods: true` is set).
 * In `LowNodeUtilization` and `RemovePodsViolatingInterPodAntiAffinity`, pods are evicted by their priority from low to high, and if they have same priority,
 best effort pods are evicted before burstable and guaranteed pods.
-* All types of pods with the `descheduler.alpha.kubernetes.io/evict` annotation are eligible for eviction. This
+* 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 the `descheduler.alpha.kubernetes.io/prefer-no-eviction` annotation voice their preference not to be evicted.
-  Each plugin decides whether the annotation gets respected or not. When the `DefaultEvictor` plugin sets `noEvictionPolicy`
-  to `Mandatory` all such pods are excluded from eviction. Needs to be used with caution as some plugins may enfore
-  various policies that are expected to be always met.
 * 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.
@@ -1136,15 +978,10 @@ To get best results from HA mode some additional configurations might require:
 
 ## Metrics
 
-| name	                                 | type	        | description                                                                       |
-|---------------------------------------|--------------|-----------------------------------------------------------------------------------|
-| build_info                            | 	gauge       | 	constant 1                                                                       |
-| pods_evicted                          | CounterVec   | total number of pods evicted, is deprecated in version v0.34.0                    |
-| pods_evicted_total                    | CounterVec   | total number of pods evicted                                                      |
-| descheduler_loop_duration_seconds     | HistogramVec | time taken to complete a whole descheduling cycle (support _bucket, _sum, _count), is deprecated in version v0.34.0  |
-| loop_duration_seconds                 | HistogramVec | time taken to complete a whole descheduling cycle (support _bucket, _sum, _count) |
-| descheduler_strategy_duration_seconds | HistogramVec | time taken to complete each stragtegy of descheduling operation (support _bucket, _sum, _count), is deprecated in version v0.34.0  |
-| strategy_duration_seconds             | HistogramVec | time taken to complete each stragtegy of descheduling operation (support _bucket, _sum, _count) |
+| name	| type	| description |
+|-------|-------|----------------|
+| build_info |	gauge |	constant 1 |
+| pods_evicted | CounterVec | total number of pods evicted |
 
 The metrics are served through https://localhost:10258/metrics by default.
 The address and port can be changed by setting `--binding-address` and `--secure-port` flags.
@@ -1160,15 +997,6 @@ packages that it is compiled with.
 
 | Descheduler | Supported Kubernetes Version |
 |-------------|------------------------------|
-| v0.36       | v1.36                        |
-| v0.35       | v1.35                        |
-| v0.34       | v1.34                        |
-| v0.33       | v1.33                        |
-| v0.32       | v1.32                        |
-| v0.31       | v1.31                        |
-| v0.30       | v1.30                        |
-| v0.29       | v1.29                        |
-| v0.28       | v1.28                        |
 | v0.27       | v1.27                        |
 | v0.26       | v1.26                        |
 | v0.25       | v1.25                        |
@@ -1206,7 +1034,7 @@ that the only people who can get things done around here are the "maintainers".
 We also would love to add more "official" maintainers, so show us what you can
 do!
 
-This repository uses the Kubernetes bots. See a full list of the commands [here](https://go.k8s.io/bot-commands).
+This repository uses the Kubernetes bots. See a full list of the commands [here][prow].
 
 ### Communicating With Contributors
 

charts/descheduler/Chart.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 name: descheduler
-version: 0.36.0
-appVersion: 0.36.0
+version: 0.31.0
+appVersion: 0.31.0
 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
 - descheduler
 - kube-scheduler
 home: https://github.com/kubernetes-sigs/descheduler
-icon: https://raw.githubusercontent.com/kubernetes-sigs/descheduler/master/assets/logo/descheduler-stacked-color.png
+icon: https://kubernetes.io/images/favicon.png
 sources:
 - https://github.com/kubernetes-sigs/descheduler
 maintainers:
 - name: Kubernetes SIG Scheduling
-  email: sig-scheduling@kubernetes.io
+  email: kubernetes-sig-scheduling@googlegroups.com

charts/descheduler/README.md

@@ -11,7 +11,7 @@ helm install my-release --namespace kube-system descheduler/descheduler
 
 ## Introduction
 
-This chart bootstraps a [descheduler](https://github.com/kubernetes-sigs/descheduler/) cron job with a default DeschedulerPolicy on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. To preview what changes descheduler would make without actually going forward with the changes, you can install descheduler in dry run mode by providing the flag `--set cmdOptions.dry-run=true` to the `helm install` command below.
+This chart bootstraps a [descheduler](https://github.com/kubernetes-sigs/descheduler/) cron job on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Prerequisites
 
@@ -64,22 +64,18 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `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                                                                   | `{}`                                      |
-| `cronJobAnnotations`                | Annotations to add to the descheduler CronJob                                                                         | `{}`                                      |
-| `cronJobLabels`                     | Labels to add to the descheduler CronJob                                                                              | `{}`                                      |
-| `jobAnnotations`                    | Annotations to add to the descheduler Job resources (created by CronJob)                                              | `{}`                                      |
-| `jobLabels`                         | Labels to add to the descheduler Job resources (created by CronJob)                                                   | `{}`                                      |
 | `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.apiVersion`         | API version used by the ServiceMonitor resource                                                                       | `monitoring.coreos.com/v1`                |
 | `serviceMonitor.namespace`          | The namespace where Prometheus expects to find service monitors                                                       | `nil`                                     |
 | `serviceMonitor.additionalLabels`   | Add custom labels to the ServiceMonitor resource                                                                      | `{}`                                      |
 | `serviceMonitor.interval`           | The scrape interval. If not set, the Prometheus default scrape interval is used                                       | `nil`                                     |

charts/descheduler/templates/NOTES.txt

@@ -10,13 +10,3 @@ WARNING: You enabled DryRun mode, you can't use Leader Election.
 {{- end}}
 {{- end}}
 {{- end}}
-{{- if .Values.deschedulerPolicy }}
-A DeschedulerPolicy has been applied for you. You can view the policy with:
-
-kubectl get configmap -n {{ include "descheduler.namespace" . }} {{ template "descheduler.fullname" . }} -o yaml
-
-If you wish to define your own policies out of band from this chart, you may define a configmap named {{ template "descheduler.fullname" . }}.
-To avoid a conflict between helm and your out of band method to deploy the configmap, please set deschedulerPolicy in values.yaml to an empty object as below.
-
-deschedulerPolicy: {}
-{{- end }}

charts/descheduler/templates/clusterrole.yaml

@@ -24,9 +24,6 @@ rules:
 - apiGroups: ["scheduling.k8s.io"]
   resources: ["priorityclasses"]
   verbs: ["get", "watch", "list"]
-- apiGroups: ["policy"]
-  resources: ["poddisruptionbudgets"]
-  verbs: ["get", "watch", "list"]
 {{- if .Values.leaderElection.enabled }}
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
@@ -36,16 +33,4 @@ rules:
   resourceNames: ["{{ .Values.leaderElection.resourceName | default "descheduler" }}"]
   verbs: ["get", "patch", "delete"]
 {{- end }}
-- apiGroups: [""]
-  resources: ["persistentvolumeclaims"]
-  verbs: ["get", "watch", "list"]
-{{- if and .Values.deschedulerPolicy }}
-{{- range .Values.deschedulerPolicy.metricsProviders }}
-{{- if and (hasKey . "source") (eq .source "KubernetesMetrics") }}
-- apiGroups: ["metrics.k8s.io"]
-  resources: ["pods", "nodes"]
-  verbs: ["get", "list"]
-{{- end }}
-{{- end }}
-{{- end }}
 {{- end -}}

charts/descheduler/templates/configmap.yaml

@@ -10,5 +10,5 @@ data:
   policy.yaml: |
     apiVersion: "{{ .Values.deschedulerPolicyAPIVersion }}"
     kind: "DeschedulerPolicy"
-{{ tpl (toYaml .Values.deschedulerPolicy) . | trim | indent 4 }}
+{{ toYaml .Values.deschedulerPolicy | trim | indent 4 }}
 {{- end }}

charts/descheduler/templates/cronjob.yaml

@@ -4,15 +4,8 @@ kind: CronJob
 metadata:
   name: {{ template "descheduler.fullname" . }}
   namespace: {{ include "descheduler.namespace" . }}
-  {{- if .Values.cronJobAnnotations }}
-  annotations:
-    {{- .Values.cronJobAnnotations | toYaml | nindent 4 }}
-  {{- end }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
-    {{- if .Values.cronJobLabels }}
-    {{- .Values.cronJobLabels | toYaml | nindent 4 }}
-    {{- end }}
 spec:
   schedule: {{ .Values.schedule | quote }}
   {{- if .Values.suspend }}
@@ -22,34 +15,20 @@ spec:
   {{- if .Values.startingDeadlineSeconds }}
   startingDeadlineSeconds: {{ .Values.startingDeadlineSeconds }}
   {{- end }}
-  {{- if ne .Values.successfulJobsHistoryLimit nil }}
+  {{- if .Values.successfulJobsHistoryLimit }}
   successfulJobsHistoryLimit: {{ .Values.successfulJobsHistoryLimit }}
   {{- end }}
-  {{- if ne .Values.failedJobsHistoryLimit nil }}
+  {{- if .Values.failedJobsHistoryLimit }}
   failedJobsHistoryLimit: {{ .Values.failedJobsHistoryLimit }}
   {{- end }}
   {{- if .Values.timeZone }}
   timeZone: {{ .Values.timeZone }}
   {{- end }}
   jobTemplate:
-    {{- if or .Values.jobAnnotations .Values.jobLabels }}
-    metadata:
-      {{- if .Values.jobAnnotations }}
-      annotations:
-        {{- .Values.jobAnnotations | toYaml | nindent 8 }}
-      {{- end }}
-      {{- if .Values.jobLabels }}
-      labels:
-        {{- .Values.jobLabels | toYaml | nindent 8 }}
-      {{- end }}
-    {{- end }}
     spec:
       {{- if .Values.ttlSecondsAfterFinished }}
       ttlSecondsAfterFinished: {{ .Values.ttlSecondsAfterFinished }}
       {{- end }}
-      {{- if .Values.activeDeadlineSeconds }}
-      activeDeadlineSeconds: {{ .Values.activeDeadlineSeconds }}
-      {{- end }}
       template:
         metadata:
           name: {{ template "descheduler.fullname" . }}
@@ -88,18 +67,11 @@ spec:
           priorityClassName: {{ .Values.priorityClassName }}
           {{- end }}
           serviceAccountName: {{ template "descheduler.serviceAccountName" . }}
-          {{- if kindIs "bool" .Values.automountServiceAccountToken }}
-          automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-          {{- end }}
           restartPolicy: "Never"
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- with .Values.initContainers }}
-          initContainers:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           containers:
             - name: {{ .Chart.Name }}
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
@@ -117,8 +89,6 @@ spec:
                 {{- end }}
               livenessProbe:
                 {{- toYaml .Values.livenessProbe | nindent 16 }}
-              ports:
-                {{- toYaml .Values.ports | nindent 16 }}
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
               {{- if .Values.securityContext }}
@@ -128,9 +98,6 @@ spec:
               volumeMounts:
                 - mountPath: /policy-dir
                   name: policy-volume
-                {{- if and .Values.extraServiceAccountVolumeMounts (not .Values.automountServiceAccountToken) }}
-                  {{ toYaml .Values.extraServiceAccountVolumeMounts | nindent 16 }}
-                {{- end }}
           {{- if .Values.podSecurityContext }}
           securityContext:
             {{- toYaml .Values.podSecurityContext | nindent 12 }}
@@ -139,7 +106,4 @@ spec:
           - name: policy-volume
             configMap:
               name: {{ template "descheduler.fullname" . }}
-          {{- if and .Values.extraServiceAccountVolumes (not .Values.automountServiceAccountToken) }}
-            {{ toYaml .Values.extraServiceAccountVolumes | nindent 10 }}
-          {{- end }}
 {{- end }}

charts/descheduler/templates/deployment.yaml

@@ -6,9 +6,6 @@ metadata:
   namespace: {{ include "descheduler.namespace" . }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations: {{- toYaml .Values.deploymentAnnotations | nindent 4 }}
-  {{- end }}
 spec:
   {{- if gt (.Values.replicas | int) 1 }}
   {{- if not .Values.leaderElection.enabled }}
@@ -42,17 +39,10 @@ spec:
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
       serviceAccountName: {{ template "descheduler.serviceAccountName" . }}
-      {{- if kindIs "bool" .Values.automountServiceAccountToken }}
-      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
       {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
@@ -69,11 +59,10 @@ spec:
             - {{ printf "--%s" $key }}
             {{- end }}
             {{- end }}
-            {{- if .Values.leaderElection.enabled }}
             {{- include "descheduler.leaderElection" . | nindent 12 }}
-            {{- end }}
           ports:
-            {{- toYaml .Values.ports | nindent 12 }}
+            - containerPort: 10258
+              protocol: TCP
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           resources:
@@ -85,9 +74,6 @@ spec:
           volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume
-            {{- if and .Values.extraServiceAccountVolumeMounts (not .Values.automountServiceAccountToken) }}
-              {{ toYaml .Values.extraServiceAccountVolumeMounts | nindent 12 }}
-            {{- end }}
       {{- if .Values.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -96,9 +82,6 @@ spec:
         - name: policy-volume
           configMap:
             name: {{ template "descheduler.fullname" . }}
-        {{- if and .Values.extraServiceAccountVolumes (not .Values.automountServiceAccountToken) }}
-          {{ toYaml .Values.extraServiceAccountVolumes | nindent 8}}
-        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/descheduler/templates/serviceaccount.yaml

@@ -1,9 +1,6 @@
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
-{{- if kindIs "bool" .Values.serviceAccount.automountServiceAccountToken }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
-{{- end }}
 metadata:
   name: {{ template "descheduler.serviceAccountName" . }}
   namespace: {{ include "descheduler.namespace" . }}

charts/descheduler/templates/servicemonitor.yaml

@@ -1,6 +1,6 @@
 {{- if eq .Values.kind "Deployment" }}
 {{- if eq .Values.serviceMonitor.enabled true }}
-apiVersion: {{ .Values.serviceMonitor.apiVersion | default "monitoring.coreos.com/v1" }}
+apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "descheduler.fullname" . }}-servicemonitor

charts/descheduler/tests/cronjob_annotations_test.yaml

@@ -1,109 +0,0 @@
-suite: Test Descheduler CronJob and Job Annotations and Labels
-
-templates:
-  - "*.yaml"
-
-release:
-  name: descheduler
-
-set:
-  kind: CronJob
-
-tests:
-  - it: adds cronJob and job annotations and labels when set
-    template: templates/cronjob.yaml
-    set:
-      cronJobAnnotations:
-        monitoring.company.com/scrape: "true"
-        description: "test cronjob"
-      cronJobLabels:
-        environment: "test"
-        team: "platform"
-      jobAnnotations:
-        sidecar.istio.io/inject: "false"
-        job.company.com/retry-limit: "3"
-      jobLabels:
-        job-type: "maintenance"
-        priority: "high"
-    asserts:
-      - equal:
-          path: metadata.annotations["monitoring.company.com/scrape"]
-          value: "true"
-      - equal:
-          path: metadata.annotations.description
-          value: "test cronjob"
-      - equal:
-          path: metadata.labels.environment
-          value: "test"
-      - equal:
-          path: metadata.labels.team
-          value: "platform"
-      - equal:
-          path: spec.jobTemplate.metadata.annotations["sidecar.istio.io/inject"]
-          value: "false"
-      - equal:
-          path: spec.jobTemplate.metadata.annotations["job.company.com/retry-limit"]
-          value: "3"
-      - equal:
-          path: spec.jobTemplate.metadata.labels.job-type
-          value: "maintenance"
-      - equal:
-          path: spec.jobTemplate.metadata.labels.priority
-          value: "high"
-
-  - it: does not add cronJob and job metadata when not set
-    template: templates/cronjob.yaml
-    asserts:
-      - isNull:
-          path: metadata.annotations
-      - isNotNull:
-          path: metadata.labels
-      - equal:
-          path: metadata.labels["app.kubernetes.io/name"]
-          value: descheduler
-      - isNull:
-          path: spec.jobTemplate.metadata
-
-  - it: does not add job metadata when job annotations and labels are empty
-    template: templates/cronjob.yaml
-    set:
-      jobAnnotations: {}
-      jobLabels: {}
-    asserts:
-      - isNull:
-          path: spec.jobTemplate.metadata
-
-  - it: works with all annotation and label types together
-    template: templates/cronjob.yaml
-    set:
-      cronJobAnnotations:
-        cron-annotation: "cron-value"
-      cronJobLabels:
-        cron-label: "cron-value"
-      jobAnnotations:
-        job-annotation: "job-value"
-      jobLabels:
-        job-label: "job-value"
-      podAnnotations:
-        pod-annotation: "pod-value"
-      podLabels:
-        pod-label: "pod-value"
-    asserts:
-      - equal:
-          path: metadata.annotations.cron-annotation
-          value: "cron-value"
-      - equal:
-          path: metadata.labels.cron-label
-          value: "cron-value"
-      - equal:
-          path: spec.jobTemplate.metadata.annotations.job-annotation
-          value: "job-value"
-      - equal:
-          path: spec.jobTemplate.metadata.labels.job-label
-          value: "job-value"
-      - equal:
-          path: spec.jobTemplate.spec.template.metadata.annotations.pod-annotation
-          value: "pod-value"
-      - equal:
-          path: spec.jobTemplate.spec.template.metadata.labels.pod-label
-          value: "pod-value"

charts/descheduler/tests/servicemonitor_test.yaml

@@ -1,31 +0,0 @@
-suite: Test ServiceMonitor
-
-templates:
-  - "*.yaml"
-
-release:
-  name: descheduler
-
-set:
-  kind: Deployment
-  serviceMonitor:
-    enabled: true
-
-tests:
-  - it: uses default ServiceMonitor apiVersion
-    template: templates/servicemonitor.yaml
-    asserts:
-      - equal:
-          path: apiVersion
-          value: monitoring.coreos.com/v1
-
-  - it: supports overriding ServiceMonitor apiVersion
-    set:
-      serviceMonitor:
-        enabled: true
-        apiVersion: azmonitoring.coreos.com/v1
-    template: templates/servicemonitor.yaml
-    asserts:
-      - equal:
-          path: apiVersion
-          value: azmonitoring.coreos.com/v1

charts/descheduler/values.yaml

@@ -18,13 +18,9 @@ resources:
   requests:
     cpu: 500m
     memory: 256Mi
-  limits:
-    cpu: 500m
-    memory: 256Mi
-
-ports:
-  - containerPort: 10258
-    protocol: TCP
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -55,8 +51,7 @@ suspend: false
 # startingDeadlineSeconds: 200
 # successfulJobsHistoryLimit: 3
 # failedJobsHistoryLimit: 1
-# ttlSecondsAfterFinished: 600
-# activeDeadlineSeconds: 60 # Make sure this value is SHORTER than the cron interval.
+# ttlSecondsAfterFinished 600
 # timeZone: Etc/UTC
 
 # Required when running as a Deployment
@@ -90,12 +85,16 @@ cmdOptions:
 deschedulerPolicyAPIVersion: "descheduler/v1alpha2"
 
 # deschedulerPolicy contains the policies the descheduler will execute.
+# To use policies stored in an existing configMap use:
+# NOTE: The name of the cm should comply to {{ template "descheduler.fullname" . }}
+# deschedulerPolicy: {}
 deschedulerPolicy:
   # nodeSelector: "key1=value1,key2=value2"
   # maxNoOfPodsToEvictPerNode: 10
   # maxNoOfPodsToEvictPerNamespace: 10
-  # metricsProviders:
-  # - source: KubernetesMetrics
+  # ignorePvcPods: true
+  # evictLocalStoragePods: true
+  # evictDaemonSetPods: true
   # tracing:
   #   collectorEndpoint: otel-collector.observability.svc.cluster.local:4317
   #   transportCert: ""
@@ -108,11 +107,8 @@ deschedulerPolicy:
       pluginConfig:
         - name: DefaultEvictor
           args:
-            podProtections:
-              defaultDisabled:
-              - "PodsWithLocalStorage"
-              extraEnabled:
-              - "PodsWithPVC"
+            ignorePvcPods: true
+            evictLocalStoragePods: true
         - name: RemoveDuplicates
         - name: RemovePodsHavingTooManyRestarts
           args:
@@ -197,25 +193,6 @@ serviceAccount:
   name:
   # Specifies custom annotations for the serviceAccount
   annotations: {}
-  # Opt out of API credential automounting
-  #
-  # automountServiceAccountToken Default is not set
-  # automountServiceAccountToken: true
-
-# Mount the ServiceAccountToken in the Pod of a CronJob or Deployment
-# Default is not set - but only implied by the ServiceAccount
-# automountServiceAccountToken: true
-
-# Annotations that'll be applied to deployment
-deploymentAnnotations: {}
-
-cronJobAnnotations: {}
-
-cronJobLabels: {}
-
-jobAnnotations: {}
-
-jobLabels: {}
 
 podAnnotations: {}
 
@@ -229,16 +206,8 @@ livenessProbe:
     path: /healthz
     port: 10258
     scheme: HTTPS
-  initialDelaySeconds: 5
-  periodSeconds: 20
-  timeoutSeconds: 5
-
-# Init containers to run before the main descheduler container
-initContainers: []
-# Example:
-# - name: init-myservice
-#   image: busybox:1.28
-#   command: ['sh', '-c', 'echo The app is running! && sleep 10']
+  initialDelaySeconds: 3
+  periodSeconds: 10
 
 service:
   enabled: false
@@ -255,7 +224,6 @@ service:
 
 serviceMonitor:
   enabled: false
-  apiVersion: "monitoring.coreos.com/v1"
   # The namespace where Prometheus expects to find service monitors.
   # namespace: ""
   # Add custom labels to the ServiceMonitor resource
@@ -276,30 +244,3 @@ serviceMonitor:
     #   targetLabel: nodename
     #   replacement: $1
     #   action: replace
-
-## Additional Volume mounts when automountServiceAccountToken is false
-# extraServiceAccountVolumeMounts:
-# - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-#   name: kube-api-access
-#   readOnly: true
-
-## Additional Volumes when automountServiceAccountToken is false
-# extraServiceAccountVolumes:
-# - name: kube-api-access
-#   projected:
-#     defaultMode: 0444
-#     sources:
-#     - configMap:
-#         items:
-#         - key: ca.crt
-#           path: ca.crt
-#         name: kube-root-ca.crt
-#     - downwardAPI:
-#         items:
-#         - fieldRef:
-#             apiVersion: v1
-#             fieldPath: metadata.namespace
-#           path: namespace
-#     - serviceAccountToken:
-#         expirationSeconds: 3600
-#         path: token

cloudbuild.yaml

@@ -7,7 +7,7 @@ timeout: 3600s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:ff388e0dc16351e96f8464e2e185b74a7578a5ccb7a112cf3393468e59e6e2d2' # v20260205-38cfa9523f
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
     entrypoint: make
     env:
     - DOCKER_CLI_EXPERIMENTAL=enabled

cmd/descheduler/app/options/options.go

@@ -18,29 +18,19 @@ limitations under the License.
 package options
 
 import (
-	"strings"
 	"time"
 
-	promapi "github.com/prometheus/client_golang/api"
 	"github.com/spf13/pflag"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	apiserver "k8s.io/apiserver/pkg/server"
 	apiserveroptions "k8s.io/apiserver/pkg/server/options"
 	clientset "k8s.io/client-go/kubernetes"
-
-	restclient "k8s.io/client-go/rest"
-	cliflag "k8s.io/component-base/cli/flag"
 	componentbaseconfig "k8s.io/component-base/config"
 	componentbaseoptions "k8s.io/component-base/config/options"
-	"k8s.io/component-base/featuregate"
-	"k8s.io/klog/v2"
 	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
 
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig/v1alpha1"
 	deschedulerscheme "sigs.k8s.io/descheduler/pkg/descheduler/scheme"
-	"sigs.k8s.io/descheduler/pkg/features"
 	"sigs.k8s.io/descheduler/pkg/tracing"
 )
 
@@ -52,18 +42,12 @@ const (
 type DeschedulerServer struct {
 	componentconfig.DeschedulerConfiguration
 
-	Client            clientset.Interface
-	EventClient       clientset.Interface
-	MetricsClient     metricsclient.Interface
-	PrometheusClient  promapi.Client
-	SecureServing     *apiserveroptions.SecureServingOptionsWithLoopback
-	SecureServingInfo *apiserver.SecureServingInfo
-	DisableMetrics    bool
-	EnableHTTP2       bool
-	// FeatureGates enabled by the user
-	FeatureGates map[string]bool
-	// DefaultFeatureGates for internal accessing so unit tests can enable/disable specific features
-	DefaultFeatureGates featuregate.FeatureGate
+	Client         clientset.Interface
+	EventClient    clientset.Interface
+	MetricsClient  metricsclient.Interface
+	SecureServing  *apiserveroptions.SecureServingOptionsWithLoopback
+	DisableMetrics bool
+	EnableHTTP2    bool
 }
 
 // NewDeschedulerServer creates a new DeschedulerServer with default parameters
@@ -121,33 +105,8 @@ func (rs *DeschedulerServer) AddFlags(fs *pflag.FlagSet) {
 	fs.Float64Var(&rs.Tracing.SampleRate, "otel-sample-rate", 1.0, "Sample rate to collect the Traces")
 	fs.BoolVar(&rs.Tracing.FallbackToNoOpProviderOnError, "otel-fallback-no-op-on-error", false, "Fallback to NoOp Tracer in case of error")
 	fs.BoolVar(&rs.EnableHTTP2, "enable-http2", false, "If http/2 should be enabled for the metrics and health check")
-	fs.Var(cliflag.NewMapStringBool(&rs.FeatureGates), "feature-gates", "A set of key=value pairs that describe feature gates for alpha/experimental features. "+
-		"Options are:\n"+strings.Join(features.DefaultMutableFeatureGate.KnownFeatures(), "\n"))
 
 	componentbaseoptions.BindLeaderElectionFlags(&rs.LeaderElection, fs)
 
 	rs.SecureServing.AddFlags(fs)
 }
-
-func (rs *DeschedulerServer) Apply() error {
-	err := features.DefaultMutableFeatureGate.SetFromMap(rs.FeatureGates)
-	if err != nil {
-		return err
-	}
-	rs.DefaultFeatureGates = features.DefaultMutableFeatureGate
-
-	// loopbackClientConfig is a config for a privileged loopback connection
-	var loopbackClientConfig *restclient.Config
-	var secureServing *apiserver.SecureServingInfo
-	if err := rs.SecureServing.ApplyTo(&secureServing, &loopbackClientConfig); err != nil {
-		klog.ErrorS(err, "failed to apply secure server configuration")
-		return err
-	}
-
-	if secureServing != nil {
-		secureServing.DisableHTTP2 = !rs.EnableHTTP2
-		rs.SecureServingInfo = secureServing
-	}
-
-	return nil
-}

cmd/descheduler/app/server.go

@@ -22,18 +22,20 @@ import (
 	"io"
 	"os/signal"
 	"syscall"
-	"time"
 
-	"github.com/spf13/cobra"
+	"k8s.io/apiserver/pkg/server/healthz"
 
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/pkg/descheduler"
 	"sigs.k8s.io/descheduler/pkg/tracing"
 
+	"github.com/spf13/cobra"
+
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/apiserver/pkg/server/healthz"
+	apiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/mux"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/component-base/featuregate"
 	"k8s.io/component-base/logs"
 	logsapi "k8s.io/component-base/logs/api/v1"
@@ -65,16 +67,40 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err = s.Apply(); err != nil {
-				klog.ErrorS(err, "failed to apply")
+			// loopbackClientConfig is a config for a privileged loopback connection
+			var loopbackClientConfig *restclient.Config
+			var secureServing *apiserver.SecureServingInfo
+			if err := s.SecureServing.ApplyTo(&secureServing, &loopbackClientConfig); err != nil {
+				klog.ErrorS(err, "failed to apply secure server configuration")
 				return err
 			}
 
-			if err = Run(cmd.Context(), s); err != nil {
-				klog.ErrorS(err, "failed to run descheduler server")
+			secureServing.DisableHTTP2 = !s.EnableHTTP2
+
+			ctx, done := signal.NotifyContext(cmd.Context(), syscall.SIGINT, syscall.SIGTERM)
+
+			pathRecorderMux := mux.NewPathRecorderMux("descheduler")
+			if !s.DisableMetrics {
+				pathRecorderMux.Handle("/metrics", legacyregistry.HandlerWithReset())
+			}
+
+			healthz.InstallHandler(pathRecorderMux, healthz.NamedCheck("Descheduler", healthz.PingHealthz.Check))
+
+			stoppedCh, _, err := secureServing.Serve(pathRecorderMux, 0, ctx.Done())
+			if err != nil {
+				klog.Fatalf("failed to start secure server: %v", err)
 				return err
 			}
 
+			if err = Run(ctx, s); err != nil {
+				klog.ErrorS(err, "descheduler server")
+				return err
+			}
+
+			done()
+			// wait for metrics server to close
+			<-stoppedCh
+
 			return nil
 		},
 	}
@@ -88,52 +114,15 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 	return cmd
 }
 
-func Run(rootCtx context.Context, rs *options.DeschedulerServer) error {
-	ctx, done := signal.NotifyContext(rootCtx, syscall.SIGINT, syscall.SIGTERM)
-
-	pathRecorderMux := mux.NewPathRecorderMux("descheduler")
-	if !rs.DisableMetrics {
-		pathRecorderMux.Handle("/metrics", legacyregistry.HandlerWithReset())
-	}
-
-	healthz.InstallHandler(pathRecorderMux, healthz.NamedCheck("Descheduler", healthz.PingHealthz.Check))
-
-	var stoppedCh <-chan struct{}
-	var err error
-	if rs.SecureServingInfo != nil {
-		stoppedCh, _, err = rs.SecureServingInfo.Serve(pathRecorderMux, 0, ctx.Done())
-		if err != nil {
-			klog.Fatalf("failed to start secure server: %v", err)
-			return err
-		}
-	}
-
-	err = tracing.NewTracerProvider(ctx, rs.Tracing.CollectorEndpoint, rs.Tracing.TransportCert, rs.Tracing.ServiceName, rs.Tracing.ServiceNamespace, rs.Tracing.SampleRate, rs.Tracing.FallbackToNoOpProviderOnError)
+func Run(ctx context.Context, rs *options.DeschedulerServer) error {
+	err := tracing.NewTracerProvider(ctx, rs.Tracing.CollectorEndpoint, rs.Tracing.TransportCert, rs.Tracing.ServiceName, rs.Tracing.ServiceNamespace, rs.Tracing.SampleRate, rs.Tracing.FallbackToNoOpProviderOnError)
 	if err != nil {
 		klog.ErrorS(err, "failed to create tracer provider")
 	}
-	defer func() {
-		// we give the tracing.Shutdown() its own context as the
-		// original context may have been cancelled already. we
-		// have arbitrarily chosen the timeout duration.
-		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		defer cancel()
-		tracing.Shutdown(ctx)
-	}()
+	defer tracing.Shutdown(ctx)
 
 	// increase the fake watch channel so the dry-run mode can be run
 	// over a cluster with thousands of pods
 	watch.DefaultChanSize = 100000
-	err = descheduler.Run(ctx, rs)
-	if err != nil {
-		return err
-	}
-
-	done()
-	if stoppedCh != nil {
-		// wait for metrics server to close
-		<-stoppedCh
-	}
-
-	return nil
+	return descheduler.Run(ctx, rs)
 }

docs/cli/descheduler.md

@@ -23,17 +23,13 @@ descheduler [flags]
       --disable-metrics                          Disables metrics. The metrics are by default served through https://localhost:10258/metrics. Secure address, resp. port can be changed through --bind-address, resp. --secure-port flags.
       --dry-run                                  Execute descheduler in dry run mode.
       --enable-http2                             If http/2 should be enabled for the metrics and health check
-      --feature-gates mapStringBool              A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
-                                                 AllAlpha=true|false (ALPHA - default=false)
-                                                 AllBeta=true|false (BETA - default=false)
-                                                 EvictionsInBackground=true|false (ALPHA - default=false)
   -h, --help                                     help for descheduler
       --http2-max-streams-per-connection int     The limit that the server gives to clients for the maximum number of streams in an HTTP/2 connection. Zero means to use golang's default.
       --kubeconfig string                        File with kube configuration. Deprecated, use client-connection-kubeconfig instead.
       --leader-elect                             Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability.
       --leader-elect-lease-duration duration     The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled. (default 2m17s)
       --leader-elect-renew-deadline duration     The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than the lease duration. This is only applicable if leader election is enabled. (default 1m47s)
-      --leader-elect-resource-lock string        The type of resource object that is used for locking during leader election. Supported options are 'leases'. (default "leases")
+      --leader-elect-resource-lock string        The type of resource object that is used for locking during leader election. Supported options are 'leases', 'endpointsleases' and 'configmapsleases'. (default "leases")
       --leader-elect-resource-name string        The name of resource object that is used for locking during leader election. (default "descheduler")
       --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 26s)
@@ -57,7 +53,6 @@ descheduler [flags]
       --tls-cipher-suites strings                Comma-separated list of cipher suites for the server. If omitted, the default Go cipher suites will be used. 
                                                  Preferred values: TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384, TLS_CHACHA20_POLY1305_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256. 
                                                  Insecure values: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_RSA_WITH_RC4_128_SHA, TLS_RSA_WITH_3DES_EDE_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_CBC_SHA256, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_256_GCM_SHA384, TLS_RSA_WITH_RC4_128_SHA.
-      --tls-curve-preferences int32Slice         Comma-separated list of numeric Go crypto/tls CurveID values, as the allowed key exchange mechanisms for the server. The supported values depend on the Go version used. See https://pkg.go.dev/crypto/tls#CurveID for values supported for each Go version. The order of the list is ignored, and key exchange mechanisms are chosen by Go from this list using an internal preference order. If omitted, the default Go curves will be used. (default [])
       --tls-min-version string                   Minimum TLS version supported. Possible values: VersionTLS10, VersionTLS11, VersionTLS12, VersionTLS13
       --tls-private-key-file string              File containing the default x509 private key matching --tls-cert-file.
       --tls-sni-cert-key namedCertKey            A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. The domain patterns also allow IP addresses, but IPs should only be used if the apiserver has visibility to the IP address requested by a client. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.crt,example.key" or "foo.crt,foo.key:*.foo.com,foo.com". (default [])

docs/contributor-guide.md

@@ -3,7 +3,7 @@
 ## Required Tools
 
 - [Git](https://git-scm.com/downloads)
-- [Go 1.23+](https://golang.org/dl/)
+- [Go 1.16+](https://golang.org/dl/)
 - [Docker](https://docs.docker.com/install/)
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl)
 - [kind v0.10.0+](https://kind.sigs.k8s.io/)

docs/release-guide.md

@@ -26,7 +26,7 @@ When the above pre-release steps are complete and the release is ready to be cut
 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 `sig-scheduling@kubernetes.io` to announce the release
+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`
@@ -34,7 +34,7 @@ When the above pre-release steps are complete and the release is ready to be cut
 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 `sig-scheduling@kubernetes.io` to announce the release
+6. Email `kubernetes-sig-scheduling@googlegroups.com` to announce the release
 
 ### Flowchart
 

docs/user-guide.md

@@ -4,15 +4,12 @@ Starting with descheduler release v0.10.0 container images are available in the
 
 Descheduler Version | Container Image                                 | Architectures           |
 ------------------- |-------------------------------------------------|-------------------------|
-v0.36.0             | registry.k8s.io/descheduler/descheduler:v0.36.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.35.0             | registry.k8s.io/descheduler/descheduler:v0.35.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.34.0             | registry.k8s.io/descheduler/descheduler:v0.34.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.33.0             | registry.k8s.io/descheduler/descheduler:v0.33.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.32.0             | registry.k8s.io/descheduler/descheduler:v0.32.0 | AMD64<br>ARM64<br>ARMv7 |
 v0.31.0             | registry.k8s.io/descheduler/descheduler:v0.31.0 | AMD64<br>ARM64<br>ARMv7 |
 v0.30.1             | registry.k8s.io/descheduler/descheduler:v0.30.1 | AMD64<br>ARM64<br>ARMv7 |
 v0.30.0             | registry.k8s.io/descheduler/descheduler:v0.30.0 | AMD64<br>ARM64<br>ARMv7 |
 v0.29.0             | registry.k8s.io/descheduler/descheduler:v0.29.0 | AMD64<br>ARM64<br>ARMv7 |
+v0.28.1             | registry.k8s.io/descheduler/descheduler:v0.28.1 | AMD64<br>ARM64<br>ARMv7 |
+v0.28.0             | registry.k8s.io/descheduler/descheduler:v0.28.0 | AMD64<br>ARM64<br>ARMv7 |
 
 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

examples/pod-life-time-transition.yml

@@ -1,20 +0,0 @@
-apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "PodLifeTime"
-      args:
-        states:
-        - "Succeeded"
-        conditions:
-        - reason: "PodCompleted"
-          status: "True"
-          minTimeSinceLastTransitionSeconds: 14400 # 4 hours
-        namespaces:
-          include:
-          - "default"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"

go.mod

@@ -1,143 +1,116 @@
 module sigs.k8s.io/descheduler
 
-go 1.26.0
-
-godebug default=go1.26
+go 1.22.5
 
 require (
 	github.com/client9/misspell v0.3.4
-	github.com/google/go-cmp v0.7.0
-	github.com/prometheus/client_golang v1.23.2
-	github.com/prometheus/common v0.67.5
-	github.com/spf13/cobra v1.10.2
-	github.com/spf13/pflag v1.0.10
-	go.opentelemetry.io/otel v1.43.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0
-	go.opentelemetry.io/otel/sdk v1.43.0
-	go.opentelemetry.io/otel/trace v1.43.0
-	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
-	google.golang.org/grpc v1.81.1
-	k8s.io/api v0.36.1
-	k8s.io/apimachinery v0.36.1
-	k8s.io/apiserver v0.36.1
-	k8s.io/client-go v0.36.1
-	k8s.io/code-generator v0.36.1
-	k8s.io/component-base v0.36.1
-	k8s.io/component-helpers v0.36.1
-	k8s.io/klog/v2 v2.140.0
-	k8s.io/metrics v0.36.1
-	k8s.io/utils v0.0.0-20260507154919-ff6756f316d2
-	kubevirt.io/api v1.8.2
-	kubevirt.io/client-go v1.8.2
-	sigs.k8s.io/mdtoc v1.4.0
-	sigs.k8s.io/yaml v1.6.0
+	github.com/google/go-cmp v0.6.0
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5
+	go.opentelemetry.io/otel v1.28.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
+	go.opentelemetry.io/otel/sdk v1.28.0
+	go.opentelemetry.io/otel/trace v1.28.0
+	google.golang.org/grpc v1.65.0
+	k8s.io/api v0.31.0
+	k8s.io/apimachinery v0.31.0
+	k8s.io/apiserver v0.31.0
+	k8s.io/client-go v0.31.0
+	k8s.io/code-generator v0.31.0
+	k8s.io/component-base v0.31.0
+	k8s.io/component-helpers v0.31.0
+	k8s.io/klog/v2 v2.130.1
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	sigs.k8s.io/mdtoc v1.1.0
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
-	cel.dev/expr v0.25.1 // indirect
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.7.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.25.4 // indirect
-	github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
-	github.com/go-openapi/swag/conv v0.25.4 // indirect
-	github.com/go-openapi/swag/fileutils v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.4 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
-	github.com/go-openapi/swag/loading v0.25.4 // indirect
-	github.com/go-openapi/swag/mangling v0.25.4 // indirect
-	github.com/go-openapi/swag/netutils v0.25.4 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/gomarkdown/markdown v0.0.0-20260217112301-37c66b85d6ab // indirect
-	github.com/google/cel-go v0.26.0 // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect
+	github.com/google/cel-go v0.20.1 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // 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.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/openshift/custom-resource-status v1.1.2 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/procfs v0.19.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.19.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.etcd.io/etcd/api/v3 v3.6.8 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
-	go.etcd.io/etcd/client/v3 v3.6.8 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
-	go.opentelemetry.io/otel/metric v1.43.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.14 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.14 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.1 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
-	golang.org/x/oauth2 v0.36.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/term v0.41.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	k8s.io/apiextensions-apiserver v0.34.3 // indirect
-	k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
-	k8s.io/kms v0.36.1 // indirect
-	k8s.io/kube-openapi v0.31.0 // indirect
-	k8s.io/streaming v0.36.1 // indirect
-	kubevirt.io/containerized-data-importer-api v1.64.0 // indirect
-	kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
-	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
-	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/release-utils v0.8.3 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/kms v0.31.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20260512234627-ef417d054102
+replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0

go.sum

@@ -1,195 +1,115 @@
-cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
-cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
-github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
-github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
+github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw=
+github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA=
-github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
-github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
-github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
-github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
-github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
 github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
-github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-openapi/swag v0.25.4 h1:OyUPUFYDPDBMkqyxOTkqDYFnrhuhi9NR6QVUvIochMU=
-github.com/go-openapi/swag v0.25.4/go.mod h1:zNfJ9WZABGHCFg2RnY0S4IOkAcVTzJ6z2Bi+Q4i6qFQ=
-github.com/go-openapi/swag/cmdutils v0.25.4 h1:8rYhB5n6WawR192/BfUu2iVlxqVR9aRgGJP6WaBoW+4=
-github.com/go-openapi/swag/cmdutils v0.25.4/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
-github.com/go-openapi/swag/conv v0.25.4 h1:/Dd7p0LZXczgUcC/Ikm1+YqVzkEeCc9LnOWjfkpkfe4=
-github.com/go-openapi/swag/conv v0.25.4/go.mod h1:3LXfie/lwoAv0NHoEuY1hjoFAYkvlqI/Bn5EQDD3PPU=
-github.com/go-openapi/swag/fileutils v0.25.4 h1:2oI0XNW5y6UWZTC7vAxC8hmsK/tOkWXHJQH4lKjqw+Y=
-github.com/go-openapi/swag/fileutils v0.25.4/go.mod h1:cdOT/PKbwcysVQ9Tpr0q20lQKH7MGhOEb6EwmHOirUk=
-github.com/go-openapi/swag/jsonname v0.25.4 h1:bZH0+MsS03MbnwBXYhuTttMOqk+5KcQ9869Vye1bNHI=
-github.com/go-openapi/swag/jsonname v0.25.4/go.mod h1:GPVEk9CWVhNvWhZgrnvRA6utbAltopbKwDu8mXNUMag=
-github.com/go-openapi/swag/jsonutils v0.25.4 h1:VSchfbGhD4UTf4vCdR2F4TLBdLwHyUDTd1/q4i+jGZA=
-github.com/go-openapi/swag/jsonutils v0.25.4/go.mod h1:7OYGXpvVFPn4PpaSdPHJBtF0iGnbEaTk8AvBkoWnaAY=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4 h1:IACsSvBhiNJwlDix7wq39SS2Fh7lUOCJRmx/4SN4sVo=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4/go.mod h1:Mt0Ost9l3cUzVv4OEZG+WSeoHwjWLnarzMePNDAOBiM=
-github.com/go-openapi/swag/loading v0.25.4 h1:jN4MvLj0X6yhCDduRsxDDw1aHe+ZWoLjW+9ZQWIKn2s=
-github.com/go-openapi/swag/loading v0.25.4/go.mod h1:rpUM1ZiyEP9+mNLIQUdMiD7dCETXvkkC30z53i+ftTE=
-github.com/go-openapi/swag/mangling v0.25.4 h1:2b9kBJk9JvPgxr36V23FxJLdwBrpijI26Bx5JH4Hp48=
-github.com/go-openapi/swag/mangling v0.25.4/go.mod h1:6dxwu6QyORHpIIApsdZgb6wBk/DPU15MdyYj/ikn0Hg=
-github.com/go-openapi/swag/netutils v0.25.4 h1:Gqe6K71bGRb3ZQLusdI8p/y1KLgV4M/k+/HzVSqT8H0=
-github.com/go-openapi/swag/netutils v0.25.4/go.mod h1:m2W8dtdaoX7oj9rEttLyTeEFFEBvnAx9qHd5nJEBzYg=
-github.com/go-openapi/swag/stringutils v0.25.4 h1:O6dU1Rd8bej4HPA3/CLPciNBBDwZj9HiEpdVsb8B5A8=
-github.com/go-openapi/swag/stringutils v0.25.4/go.mod h1:GTsRvhJW5xM5gkgiFe0fV3PUlFm0dr8vki6/VSRaZK0=
-github.com/go-openapi/swag/typeutils v0.25.4 h1:1/fbZOUN472NTc39zpa+YGHn3jzHWhv42wAJSN91wRw=
-github.com/go-openapi/swag/typeutils v0.25.4/go.mod h1:Ou7g//Wx8tTLS9vG0UmzfCsjZjKhpjxayRKTHXf2pTE=
-github.com/go-openapi/swag/yamlutils v0.25.4 h1:6jdaeSItEUb7ioS9lFoCZ65Cne1/RZtPBZ9A56h92Sw=
-github.com/go-openapi/swag/yamlutils v0.25.4/go.mod h1:MNzq1ulQu+yd8Kl7wPOut/YHAAU/H6hL91fF+E2RFwc=
-github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4=
-github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg=
-github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
-github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
+github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/gomarkdown/markdown v0.0.0-20260217112301-37c66b85d6ab h1:VYNivV7P8IRHUam2swVUNkhIdp0LRRFKe4hXNnoZKTc=
-github.com/gomarkdown/markdown v0.0.0-20260217112301-37c66b85d6ab/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
-github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
-github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI=
-github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
-github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
-github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 h1:oKYOfNR7Hp6XpZ4JqolL5u642Js5Z0n7psPVl+S5heo=
+github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
+github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84=
+github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
-github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
+github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
-github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 h1:B+8ClL/kCQkRiU82d9xajRPKYMrB7E0MbtzWVi1K4ns=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3/go.mod h1:NbCUVmiS4foBGBHOYlCT25+YmGpJ32dZPi75pGEUpj4=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
-github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
+github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
+github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -197,523 +117,212 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mmarkdown/mmark v2.0.40+incompatible h1:vMeUeDzBK3H+/mU0oMVfMuhSXJlIA+DE/DMPQNAj5C4=
 github.com/mmarkdown/mmark v2.0.40+incompatible/go.mod h1:Uvmoz7tvsWpr7bMVxIpqZPyN3FbOtzDmnsJDFp7ltJs=
-github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
-github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
-github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
-github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
-github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
-github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
+github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
+github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
+github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
-github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
-github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
-github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
-github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
-github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
+github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
-github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
-github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
-github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk=
-github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
-go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
-go.etcd.io/etcd/api/v3 v3.6.8 h1:gqb1VN92TAI6G2FiBvWcqKtHiIjr4SU2GdXxTwyexbM=
-go.etcd.io/etcd/api/v3 v3.6.8/go.mod h1:qyQj1HZPUV3B5cbAL8scG62+fyz5dSxxu0w8pn28N6Q=
-go.etcd.io/etcd/client/pkg/v3 v3.6.8 h1:Qs/5C0LNFiqXxYf2GU8MVjYUEXJ6sZaYOz0zEqQgy50=
-go.etcd.io/etcd/client/pkg/v3 v3.6.8/go.mod h1:GsiTRUZE2318PggZkAo6sWb6l8JLVrnckTNfbG8PWtw=
-go.etcd.io/etcd/client/v3 v3.6.8 h1:B3G76t1UykqAOrbio7s/EPatixQDkQBevN8/mwiplrY=
-go.etcd.io/etcd/client/v3 v3.6.8/go.mod h1:MVG4BpSIuumPi+ELF7wYtySETmoTWBHVcDoHdVupwt8=
-go.etcd.io/etcd/pkg/v3 v3.6.8 h1:Xe+LIL974spy8b4nEx3H0KMr1ofq3r0kh6FbU3aw4es=
-go.etcd.io/etcd/pkg/v3 v3.6.8/go.mod h1:TRibVNe+FqJIe1abOAA1PsuQ4wqO87ZaOoprg09Tn8c=
-go.etcd.io/etcd/server/v3 v3.6.8 h1:U2strdSEy1U8qcSzRIdkYpvOPtBy/9i/IfaaCI9flZ4=
-go.etcd.io/etcd/server/v3 v3.6.8/go.mod h1:88dCtwUnSirkUoJbflQxxWXqtBSZa6lSG0Kuej+dois=
-go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
-go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 h1:XmiuHzgJt067+a6kwyAzkhXooYVv3/TOw9cM2VfJgUM=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0/go.mod h1:KDgtbWKTQs4bM+VPUr6WlL9m/WXcmkCcBlIzqxPGzmI=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0=
-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 h1:RAE+JPfvEmvy+0LzyUA25/SGawPwIUbZ6u0Wug54sLc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
+go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=
+go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=
+go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0=
+go.etcd.io/etcd/api/v3 v3.5.14/go.mod h1:BmtWcRlQvwa1h3G2jvKYwIQy4PkHlDej5t7uLMUdJUU=
+go.etcd.io/etcd/client/pkg/v3 v3.5.14 h1:SaNH6Y+rVEdxfpA2Jr5wkEvN6Zykme5+YnbCkxvuWxQ=
+go.etcd.io/etcd/client/pkg/v3 v3.5.14/go.mod h1:8uMgAokyG1czCtIdsq+AGyYQMvpIKnSvPjFMunkgeZI=
+go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8=
+go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg=
+go.etcd.io/etcd/client/v3 v3.5.14 h1:CWfRs4FDaDoSz81giL7zPpZH2Z35tbOrAJkkjMqOupg=
+go.etcd.io/etcd/client/v3 v3.5.14/go.mod h1:k3XfdV/VIHy/97rqWjoUzrj9tk7GgJGH9J8L4dNXmAk=
+go.etcd.io/etcd/pkg/v3 v3.5.13 h1:st9bDWNsKkBNpP4PR1MvM/9NqUPfvYZx/YXegsYEH8M=
+go.etcd.io/etcd/pkg/v3 v3.5.13/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0=
+go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA=
+go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw=
+go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok=
+go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
+go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
+go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw=
+go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
+go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
+go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE=
+go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg=
+go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
+go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
+go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
-go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
-go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
-go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
-go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
-go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
-golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
-golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
-golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=
+golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
-golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
-golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
-golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
-golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
-golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
-golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
+golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
-golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4=
-golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488/go.mod h1:fGb/2+tgXXjhjHsTNdVEEMZNWA0quBnfrO+AfoDSAKw=
-golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053/go.mod h1:+nZKN+XVh4LCiA9DV3ywrzN4gumyCnKjau3NGb9SGoE=
-golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
-golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=
-golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ=
-golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
-golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
-golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
-golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
-golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
-golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
-golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
-golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
-golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
-golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
-golang.org/x/tools v0.34.1-0.20250613162507-3f93fece84c7/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
-golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
-golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
-golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
-golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
-golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
-golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
-golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
-gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
-google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
-google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
+google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0=
+google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
+google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
-gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
+gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=
-k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY=
-k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo=
-k8s.io/apiextensions-apiserver v0.34.3 h1:p10fGlkDY09eWKOTeUSioxwLukJnm+KuDZdrW71y40g=
-k8s.io/apiextensions-apiserver v0.34.3/go.mod h1:aujxvqGFRdb/cmXYfcRTeppN7S2XV/t7WMEc64zB5A0=
-k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
-k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA=
-k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8=
-k8s.io/apiserver v0.36.1 h1:iMS5V+rPUertv5P9RaqJgmHHTuh4quWpoxchvMUY+JY=
-k8s.io/apiserver v0.36.1/go.mod h1:Cby1PbLWztu0GDOxoO6iFOyyqIsziHNEW+w9zVQ22Kw=
-k8s.io/client-go v0.36.1 h1:FN/K8QIT2CEDt+2WB2HnWrUANZ50AP5GII43/SP2JR0=
-k8s.io/client-go v0.36.1/go.mod h1:s6rAnCtTGYDQnpNjEhSaISV+2O8jwruZ6m3QOYBFbtU=
-k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
-k8s.io/code-generator v0.36.1 h1:5bHQ7NbBcFFLHcoyo/hgU3m2tQV5RLz2nv4QNDlsbXc=
-k8s.io/code-generator v0.36.1/go.mod h1:oCv8WmrW2RGdcMyvSk1aYbBfSs51ggtSFQr1YNeuAuo=
-k8s.io/component-base v0.36.1 h1:iG6GsELftXqTNG9HG6kiVjatSgAw1sf5pJ6R5a6N0kA=
-k8s.io/component-base v0.36.1/go.mod h1:nf9XPlntRdqO6WMeEWAA5F93Y4ICZQdeT9GeqLDB3JI=
-k8s.io/component-helpers v0.36.1 h1:BTrr5fzNSm8TkQfXrKT3N9ioWwiC4n2FTIwGTUo/ccg=
-k8s.io/component-helpers v0.36.1/go.mod h1:s38HnzKQRurbUnhI5IV8GwyL/a3lVuNCYZMTd+rITMM=
-k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
-k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
-k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
-k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
-k8s.io/kms v0.36.1 h1:XdvKpywoW4k7YUHDh5uYP4mahJXECswHGfCddBBYLZs=
-k8s.io/kms v0.36.1/go.mod h1:g91diTD9h0oJCCHkTb00krlF+Qm5HTnkWLi9Q/TpRoc=
-k8s.io/kube-openapi v0.0.0-20260512234627-ef417d054102 h1:xs2ux1MvyrOdfKwS3vuFWrGuLgDOHk6id975Twx2Jss=
-k8s.io/kube-openapi v0.0.0-20260512234627-ef417d054102/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY=
-k8s.io/metrics v0.36.1 h1:MQPb+G4RhrKEpt8NETPssbW8QgGUc4Jbqu1jx+kPqGk=
-k8s.io/metrics v0.36.1/go.mod h1:xqS8XcWLjDzo6E7DJm/GfjKpRKdN5/MtJAQFuV6nLUc=
-k8s.io/streaming v0.36.1 h1:L+K68n4Gg940BGNNYtUBvL1WTLL0YnKT3s+P1MNAmR4=
-k8s.io/streaming v0.36.1/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
-k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
-k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 h1:wU4tMEhLGgIbLvXQb1cfN+EcM0wf7zC6CPF+C79jroc=
-k8s.io/utils v0.0.0-20260507154919-ff6756f316d2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
-kubevirt.io/api v1.8.2 h1:h8AACJlity2n8gRE6e9PgikLAwzmNz6gzVjT1kbsDZY=
-kubevirt.io/api v1.8.2/go.mod h1:EUaPeD1GQK4IIEp8TVtk5dsFlYQGzFfcWi4CV4rs0rY=
-kubevirt.io/client-go v1.8.2 h1:jKJe5j/M7GDfpqTreoBA+BVoyQPCPTbLpuGHHaBfjdk=
-kubevirt.io/client-go v1.8.2/go.mod h1:eoH34Z/Wa1JuHeIezT/tcGDMa6zLLEf3FPRx5beJU3k=
-kubevirt.io/containerized-data-importer-api v1.64.0 h1:yBLY6qEogUp8F+XSJvabIkx9uEEDeToYDfRr0mbUxJc=
-kubevirt.io/containerized-data-importer-api v1.64.0/go.mod h1:VGp35wxpLXU18b7cnEpmcThI3AjcZUSfg/Zfql44U4o=
-kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 h1:fZYvD3/Vnitfkx6IJxjLAk8ugnZQ7CXVYcRfkSKmuZY=
-kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
-sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
-sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
-sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/mdtoc v1.4.0 h1:2pDEwJSjoVrGr5BPkG+LoLkYLKvgtGYurrBY8ul3SxQ=
-sigs.k8s.io/mdtoc v1.4.0/go.mod h1:KVnRRtK1rX9aQ95qF0rt3x2ytTxf3r7W7N41H+0KF0k=
-sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
-sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/release-utils v0.8.3 h1:KtOtA4qDmzJyeQ2zkDsFVI25+NViwms/o5eL2NftFdA=
-sigs.k8s.io/release-utils v0.8.3/go.mod h1:fp82Fma06OXBhEJ+GUJKqvcplDBomruK1R/1fWJnsrQ=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
-sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
-sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
+k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
+k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
+k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
+k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY=
+k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk=
+k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
+k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/code-generator v0.31.0 h1:w607nrMi1KeDKB3/F/J4lIoOgAwc+gV9ZKew4XRfMp8=
+k8s.io/code-generator v0.31.0/go.mod h1:84y4w3es8rOJOUUP1rLsIiGlO1JuEaPFXQPA9e/K6U0=
+k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
+k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
+k8s.io/component-helpers v0.31.0 h1:jyRUKA+GX+q19o81k4x94imjNICn+e6Gzi6T89va1/A=
+k8s.io/component-helpers v0.31.0/go.mod h1:MrNIvT4iB7wXIseYSWfHUJB/aNUiFvbilp4qDfBQi6s=
+k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
+k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kms v0.31.0 h1:KchILPfB1ZE+ka7223mpU5zeFNkmb45jl7RHnlImUaI=
+k8s.io/kms v0.31.0/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
+k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
+k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
+k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
+k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/mdtoc v1.1.0 h1:q3YtqYzmC2e0hgLXRIOm7/QLuPux1CX3ZHCwlbABxZo=
+sigs.k8s.io/mdtoc v1.1.0/go.mod h1:QZLVEdHH2iNIR4uHAZyvFRtjloHgVItk8lo/mzCtq3w=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

hack/lib/go.sh

@@ -19,7 +19,7 @@
 go::verify_version() {
   GO_VERSION=($(go version))
 
-  if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.24|go1.25|go1.26') ]]; then
+  if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.20|go1.21|go1.22') ]]; then
     echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
     exit 1
   fi

hack/verify-vendor.sh

@@ -70,7 +70,7 @@ pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1
     ret=1
   fi
 
-  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" -x "README*" vendor "${_deschedulertmp}/vendor")"; then
+  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor "${_deschedulertmp}/vendor")"; then
     echo "Your vendored results are different:" >&2
     echo "${_out}" >&2
     echo "Vendor Verify failed." >&2

kubernetes/base/rbac.yaml

@@ -22,9 +22,6 @@ rules:
 - apiGroups: ["scheduling.k8s.io"]
   resources: ["priorityclasses"]
   verbs: ["get", "watch", "list"]
-- apiGroups: ["policy"]
-  resources: ["poddisruptionbudgets"]
-  verbs: ["get", "watch", "list"]
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
   verbs: ["create", "update"]
@@ -32,21 +29,6 @@ rules:
   resources: ["leases"]
   resourceNames: ["descheduler"]
   verbs: ["get", "patch", "delete"]
-- apiGroups: ["metrics.k8s.io"]
-  resources: ["nodes", "pods"]
-  verbs: ["get", "list"]
-- apiGroups: [""]
-  resources: ["persistentvolumeclaims"]
-  verbs: ["get", "watch", "list"]
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: descheduler-role
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["get", "list", "watch"]
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -66,16 +48,3 @@ subjects:
   - name: descheduler-sa
     kind: ServiceAccount
     namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: descheduler-role-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: descheduler-role
-subjects:
-  - name: descheduler-sa
-    kind: ServiceAccount
-    namespace: kube-system

kubernetes/cronjob/cronjob.yaml

@@ -16,7 +16,7 @@ spec:
           priorityClassName: system-cluster-critical
           containers:
           - name: descheduler
-            image: registry.k8s.io/descheduler/descheduler:v0.36.0
+            image: registry.k8s.io/descheduler/descheduler:v0.31.0
             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.36.0
+          image: registry.k8s.io/descheduler/descheduler:v0.31.0
           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.36.0
+          image: registry.k8s.io/descheduler/descheduler:v0.31.0
           volumeMounts:
           - mountPath: /policy-dir
             name: policy-volume

metrics/metrics.go

@@ -31,18 +31,10 @@ const (
 
 var (
 	PodsEvicted = metrics.NewCounterVec(
-		&metrics.CounterOpts{
-			Subsystem:         DeschedulerSubsystem,
-			Name:              "pods_evicted",
-			Help:              "Number of total evicted pods, by the result, by the strategy, by the namespace, by the node name. 'error' result means a pod could not be evicted",
-			StabilityLevel:    metrics.ALPHA,
-			DeprecatedVersion: "0.34.0",
-		}, []string{"result", "strategy", "profile", "namespace", "node"})
-	PodsEvictedTotal = metrics.NewCounterVec(
 		&metrics.CounterOpts{
 			Subsystem:      DeschedulerSubsystem,
-			Name:           "pods_evicted_total",
-			Help:           "Number of total evicted pods, by the result, by the strategy, by the namespace, by the node name. 'error' result means a pod could not be evicted",
+			Name:           "pods_evicted",
+			Help:           "Number of evicted pods, by the result, by the strategy, by the namespace, by the node name. 'error' result means a pod could not be evicted",
 			StabilityLevel: metrics.ALPHA,
 		}, []string{"result", "strategy", "profile", "namespace", "node"})
 
@@ -57,36 +49,18 @@ var (
 	)
 
 	DeschedulerLoopDuration = metrics.NewHistogramVec(
-		&metrics.HistogramOpts{
-			Subsystem:         DeschedulerSubsystem,
-			Name:              "descheduler_loop_duration_seconds",
-			Help:              "Time taken to complete a full descheduling cycle",
-			StabilityLevel:    metrics.ALPHA,
-			DeprecatedVersion: "0.34.0",
-			Buckets:           []float64{0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 25, 50, 100, 250, 500},
-		}, []string{})
-	LoopDuration = metrics.NewHistogramVec(
 		&metrics.HistogramOpts{
 			Subsystem:      DeschedulerSubsystem,
-			Name:           "loop_duration_seconds",
+			Name:           "descheduler_loop_duration_seconds",
 			Help:           "Time taken to complete a full descheduling cycle",
 			StabilityLevel: metrics.ALPHA,
 			Buckets:        []float64{0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 25, 50, 100, 250, 500},
 		}, []string{})
 
 	DeschedulerStrategyDuration = metrics.NewHistogramVec(
-		&metrics.HistogramOpts{
-			Subsystem:         DeschedulerSubsystem,
-			Name:              "descheduler_strategy_duration_seconds",
-			Help:              "Time taken to complete Each strategy of the descheduling operation",
-			StabilityLevel:    metrics.ALPHA,
-			DeprecatedVersion: "0.34.0",
-			Buckets:           []float64{0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 25, 50, 100},
-		}, []string{"strategy", "profile"})
-	StrategyDuration = metrics.NewHistogramVec(
 		&metrics.HistogramOpts{
 			Subsystem:      DeschedulerSubsystem,
-			Name:           "strategy_duration_seconds",
+			Name:           "descheduler_strategy_duration_seconds",
 			Help:           "Time taken to complete Each strategy of the descheduling operation",
 			StabilityLevel: metrics.ALPHA,
 			Buckets:        []float64{0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 25, 50, 100},
@@ -94,12 +68,9 @@ var (
 
 	metricsList = []metrics.Registerable{
 		PodsEvicted,
-		PodsEvictedTotal,
 		buildInfo,
 		DeschedulerLoopDuration,
 		DeschedulerStrategyDuration,
-		LoopDuration,
-		StrategyDuration,
 	}
 )
 

pkg/api/types.go

@@ -18,7 +18,6 @@ package api
 
 import (
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -43,22 +42,8 @@ type DeschedulerPolicy struct {
 	// MaxNoOfPodsToTotal restricts maximum of pods to be evicted total.
 	MaxNoOfPodsToEvictTotal *uint
 
-	// EvictionFailureEventNotification should be set to true to enable eviction failure event notification.
-	// Default is false.
-	EvictionFailureEventNotification *bool
-
 	// MetricsCollector configures collection of metrics about actual resource utilization
-	// Deprecated. Use MetricsProviders field instead.
-	MetricsCollector *MetricsCollector
-
-	// MetricsProviders configure collection of metrics about actual resource utilization from various sources
-	MetricsProviders []MetricsProvider
-
-	// GracePeriodSeconds The duration in seconds before the object should be deleted. Value must be non-negative integer.
-	// The value zero indicates delete immediately. If this value is nil, the default grace period for the
-	// specified type will be used.
-	// Defaults to a per object value if not specified. zero means delete immediately.
-	GracePeriodSeconds *int64
+	MetricsCollector MetricsCollector
 }
 
 // Namespaces carries a list of included/excluded namespaces
@@ -68,12 +53,6 @@ type Namespaces struct {
 	Exclude []string `json:"exclude,omitempty"`
 }
 
-// EvictionLimits limits the number of evictions per domain. E.g. node, namespace, total.
-type EvictionLimits struct {
-	// node restricts the maximum number of evictions per node
-	Node *uint `json:"node,omitempty"`
-}
-
 type (
 	Percentage         float64
 	ResourceThresholds map[v1.ResourceName]Percentage
@@ -109,54 +88,9 @@ type PluginSet struct {
 	Disabled []string
 }
 
-type MetricsSource string
-
-const (
-	// KubernetesMetrics enables metrics from a Kubernetes metrics server.
-	// Please see https://kubernetes-sigs.github.io/metrics-server/ for more.
-	KubernetesMetrics MetricsSource = "KubernetesMetrics"
-
-	// KubernetesMetrics enables metrics from a Prometheus metrics server.
-	PrometheusMetrics MetricsSource = "Prometheus"
-)
-
 // MetricsCollector configures collection of metrics about actual resource utilization
 type MetricsCollector struct {
-	// Enabled metrics collection from Kubernetes metrics.
-	// Deprecated. Use MetricsProvider.Source field instead.
+	// Enabled metrics collection from kubernetes metrics.
+	// Later, the collection can be extended to other providers.
 	Enabled bool
 }
-
-// MetricsProvider configures collection of metrics about actual resource utilization from a given source
-type MetricsProvider struct {
-	// Source enables metrics from Kubernetes metrics server.
-	Source MetricsSource
-
-	// Prometheus enables metrics collection through Prometheus
-	Prometheus *Prometheus
-}
-
-// ReferencedResourceList is an adaption of v1.ResourceList with resources as references
-type ReferencedResourceList = map[v1.ResourceName]*resource.Quantity
-
-type Prometheus struct {
-	URL string
-	// authToken used for authentication with the prometheus server.
-	// If not set the in cluster authentication token for the descheduler service
-	// account is read from the container's file system.
-	AuthToken *AuthToken
-}
-
-type AuthToken struct {
-	// secretReference references an authentication token.
-	// secrets are expected to be created under the descheduler's namespace.
-	SecretReference *SecretReference
-}
-
-// SecretReference holds a reference to a Secret
-type SecretReference struct {
-	// namespace is the namespace of the secret.
-	Namespace string
-	// name is the name of the secret.
-	Name string
-}

pkg/api/v1alpha2/types.go

@@ -41,22 +41,8 @@ type DeschedulerPolicy struct {
 	// MaxNoOfPodsToTotal restricts maximum of pods to be evicted total.
 	MaxNoOfPodsToEvictTotal *uint `json:"maxNoOfPodsToEvictTotal,omitempty"`
 
-	// EvictionFailureEventNotification should be set to true to enable eviction failure event notification.
-	// Default is false.
-	EvictionFailureEventNotification *bool `json:"evictionFailureEventNotification,omitempty"`
-
-	// MetricsCollector configures collection of metrics for actual resource utilization
-	// Deprecated. Use MetricsProviders field instead.
-	MetricsCollector *MetricsCollector `json:"metricsCollector,omitempty"`
-
-	// MetricsProviders configure collection of metrics about actual resource utilization from various sources
-	MetricsProviders []MetricsProvider `json:"metricsProviders,omitempty"`
-
-	// GracePeriodSeconds The duration in seconds before the object should be deleted. Value must be non-negative integer.
-	// The value zero indicates delete immediately. If this value is nil, the default grace period for the
-	// specified type will be used.
-	// Defaults to a per object value if not specified. zero means delete immediately.
-	GracePeriodSeconds *int64 `json:"gracePeriodSeconds,omitempty"`
+	// MetricsCollector configures collection of metrics about actual resource utilization
+	MetricsCollector MetricsCollector `json:"metricsCollector,omitempty"`
 }
 
 type DeschedulerProfile struct {
@@ -84,51 +70,9 @@ type PluginSet struct {
 	Disabled []string `json:"disabled"`
 }
 
-type MetricsSource string
-
-const (
-	// KubernetesMetrics enables metrics from a Kubernetes metrics server.
-	// Please see https://kubernetes-sigs.github.io/metrics-server/ for more.
-	KubernetesMetrics MetricsSource = "KubernetesMetrics"
-
-	// KubernetesMetrics enables metrics from a Prometheus metrics server.
-	PrometheusMetrics MetricsSource = "Prometheus"
-)
-
 // MetricsCollector configures collection of metrics about actual resource utilization
 type MetricsCollector struct {
-	// Enabled metrics collection from Kubernetes metrics server.
-	// Deprecated. Use MetricsProvider.Source field instead.
-	Enabled bool `json:"enabled,omitempty"`
-}
-
-// MetricsProvider configures collection of metrics about actual resource utilization from a given source
-type MetricsProvider struct {
-	// Source enables metrics from Kubernetes metrics server.
-	Source MetricsSource `json:"source,omitempty"`
-
-	// Prometheus enables metrics collection through Prometheus
-	Prometheus *Prometheus `json:"prometheus,omitempty"`
-}
-
-type Prometheus struct {
-	URL string `json:"url,omitempty"`
-	// authToken used for authentication with the prometheus server.
-	// If not set the in cluster authentication token for the descheduler service
-	// account is read from the container's file system.
-	AuthToken *AuthToken `json:"authToken,omitempty"`
-}
-
-type AuthToken struct {
-	// secretReference references an authentication token.
-	// secrets are expected to be created under the descheduler's namespace.
-	SecretReference *SecretReference `json:"secretReference,omitempty"`
-}
-
-// SecretReference holds a reference to a Secret
-type SecretReference struct {
-	// namespace is the namespace of the secret.
-	Namespace string `json:"namespace,omitempty"`
-	// name is the name of the secret.
-	Name string `json:"name,omitempty"`
+	// Enabled metrics collection from kubernetes metrics.
+	// Later, the collection can be extended to other providers.
+	Enabled bool
 }

pkg/api/v1alpha2/zz_generated.conversion.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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.
@@ -36,16 +36,6 @@ func init() {
 // RegisterConversions adds conversion functions to the given scheme.
 // Public to allow building arbitrary schemes.
 func RegisterConversions(s *runtime.Scheme) error {
-	if err := s.AddGeneratedConversionFunc((*AuthToken)(nil), (*api.AuthToken)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_AuthToken_To_api_AuthToken(a.(*AuthToken), b.(*api.AuthToken), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.AuthToken)(nil), (*AuthToken)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_AuthToken_To_v1alpha2_AuthToken(a.(*api.AuthToken), b.(*AuthToken), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddGeneratedConversionFunc((*DeschedulerProfile)(nil), (*api.DeschedulerProfile)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(a.(*DeschedulerProfile), b.(*api.DeschedulerProfile), scope)
 	}); err != nil {
@@ -56,26 +46,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*MetricsCollector)(nil), (*api.MetricsCollector)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_MetricsCollector_To_api_MetricsCollector(a.(*MetricsCollector), b.(*api.MetricsCollector), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.MetricsCollector)(nil), (*MetricsCollector)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_MetricsCollector_To_v1alpha2_MetricsCollector(a.(*api.MetricsCollector), b.(*MetricsCollector), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*MetricsProvider)(nil), (*api.MetricsProvider)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_MetricsProvider_To_api_MetricsProvider(a.(*MetricsProvider), b.(*api.MetricsProvider), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.MetricsProvider)(nil), (*MetricsProvider)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_MetricsProvider_To_v1alpha2_MetricsProvider(a.(*api.MetricsProvider), b.(*MetricsProvider), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddGeneratedConversionFunc((*api.PluginConfig)(nil), (*PluginConfig)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_api_PluginConfig_To_v1alpha2_PluginConfig(a.(*api.PluginConfig), b.(*PluginConfig), scope)
 	}); err != nil {
@@ -101,26 +71,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*Prometheus)(nil), (*api.Prometheus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_Prometheus_To_api_Prometheus(a.(*Prometheus), b.(*api.Prometheus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.Prometheus)(nil), (*Prometheus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_Prometheus_To_v1alpha2_Prometheus(a.(*api.Prometheus), b.(*Prometheus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*SecretReference)(nil), (*api.SecretReference)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_SecretReference_To_api_SecretReference(a.(*SecretReference), b.(*api.SecretReference), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.SecretReference)(nil), (*SecretReference)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_SecretReference_To_v1alpha2_SecretReference(a.(*api.SecretReference), b.(*SecretReference), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*api.DeschedulerPolicy)(nil), (*DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(a.(*api.DeschedulerPolicy), b.(*DeschedulerPolicy), scope)
 	}); err != nil {
@@ -139,26 +89,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	return nil
 }
 
-func autoConvert_v1alpha2_AuthToken_To_api_AuthToken(in *AuthToken, out *api.AuthToken, s conversion.Scope) error {
-	out.SecretReference = (*api.SecretReference)(unsafe.Pointer(in.SecretReference))
-	return nil
-}
-
-// Convert_v1alpha2_AuthToken_To_api_AuthToken is an autogenerated conversion function.
-func Convert_v1alpha2_AuthToken_To_api_AuthToken(in *AuthToken, out *api.AuthToken, s conversion.Scope) error {
-	return autoConvert_v1alpha2_AuthToken_To_api_AuthToken(in, out, s)
-}
-
-func autoConvert_api_AuthToken_To_v1alpha2_AuthToken(in *api.AuthToken, out *AuthToken, s conversion.Scope) error {
-	out.SecretReference = (*SecretReference)(unsafe.Pointer(in.SecretReference))
-	return nil
-}
-
-// Convert_api_AuthToken_To_v1alpha2_AuthToken is an autogenerated conversion function.
-func Convert_api_AuthToken_To_v1alpha2_AuthToken(in *api.AuthToken, out *AuthToken, s conversion.Scope) error {
-	return autoConvert_api_AuthToken_To_v1alpha2_AuthToken(in, out, s)
-}
-
 func autoConvert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
 	if in.Profiles != nil {
 		in, out := &in.Profiles, &out.Profiles
@@ -175,10 +105,6 @@ func autoConvert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in *Desched
 	out.MaxNoOfPodsToEvictPerNode = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNode))
 	out.MaxNoOfPodsToEvictPerNamespace = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNamespace))
 	out.MaxNoOfPodsToEvictTotal = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictTotal))
-	out.EvictionFailureEventNotification = (*bool)(unsafe.Pointer(in.EvictionFailureEventNotification))
-	out.MetricsCollector = (*api.MetricsCollector)(unsafe.Pointer(in.MetricsCollector))
-	out.MetricsProviders = *(*[]api.MetricsProvider)(unsafe.Pointer(&in.MetricsProviders))
-	out.GracePeriodSeconds = (*int64)(unsafe.Pointer(in.GracePeriodSeconds))
 	return nil
 }
 
@@ -198,10 +124,6 @@ func autoConvert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in *api.Des
 	out.MaxNoOfPodsToEvictPerNode = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNode))
 	out.MaxNoOfPodsToEvictPerNamespace = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNamespace))
 	out.MaxNoOfPodsToEvictTotal = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictTotal))
-	out.EvictionFailureEventNotification = (*bool)(unsafe.Pointer(in.EvictionFailureEventNotification))
-	out.MetricsCollector = (*MetricsCollector)(unsafe.Pointer(in.MetricsCollector))
-	out.MetricsProviders = *(*[]MetricsProvider)(unsafe.Pointer(&in.MetricsProviders))
-	out.GracePeriodSeconds = (*int64)(unsafe.Pointer(in.GracePeriodSeconds))
 	return nil
 }
 
@@ -253,48 +175,6 @@ func Convert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(in *api.Desch
 	return autoConvert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(in, out, s)
 }
 
-func autoConvert_v1alpha2_MetricsCollector_To_api_MetricsCollector(in *MetricsCollector, out *api.MetricsCollector, s conversion.Scope) error {
-	out.Enabled = in.Enabled
-	return nil
-}
-
-// Convert_v1alpha2_MetricsCollector_To_api_MetricsCollector is an autogenerated conversion function.
-func Convert_v1alpha2_MetricsCollector_To_api_MetricsCollector(in *MetricsCollector, out *api.MetricsCollector, s conversion.Scope) error {
-	return autoConvert_v1alpha2_MetricsCollector_To_api_MetricsCollector(in, out, s)
-}
-
-func autoConvert_api_MetricsCollector_To_v1alpha2_MetricsCollector(in *api.MetricsCollector, out *MetricsCollector, s conversion.Scope) error {
-	out.Enabled = in.Enabled
-	return nil
-}
-
-// Convert_api_MetricsCollector_To_v1alpha2_MetricsCollector is an autogenerated conversion function.
-func Convert_api_MetricsCollector_To_v1alpha2_MetricsCollector(in *api.MetricsCollector, out *MetricsCollector, s conversion.Scope) error {
-	return autoConvert_api_MetricsCollector_To_v1alpha2_MetricsCollector(in, out, s)
-}
-
-func autoConvert_v1alpha2_MetricsProvider_To_api_MetricsProvider(in *MetricsProvider, out *api.MetricsProvider, s conversion.Scope) error {
-	out.Source = api.MetricsSource(in.Source)
-	out.Prometheus = (*api.Prometheus)(unsafe.Pointer(in.Prometheus))
-	return nil
-}
-
-// Convert_v1alpha2_MetricsProvider_To_api_MetricsProvider is an autogenerated conversion function.
-func Convert_v1alpha2_MetricsProvider_To_api_MetricsProvider(in *MetricsProvider, out *api.MetricsProvider, s conversion.Scope) error {
-	return autoConvert_v1alpha2_MetricsProvider_To_api_MetricsProvider(in, out, s)
-}
-
-func autoConvert_api_MetricsProvider_To_v1alpha2_MetricsProvider(in *api.MetricsProvider, out *MetricsProvider, s conversion.Scope) error {
-	out.Source = MetricsSource(in.Source)
-	out.Prometheus = (*Prometheus)(unsafe.Pointer(in.Prometheus))
-	return nil
-}
-
-// Convert_api_MetricsProvider_To_v1alpha2_MetricsProvider is an autogenerated conversion function.
-func Convert_api_MetricsProvider_To_v1alpha2_MetricsProvider(in *api.MetricsProvider, out *MetricsProvider, s conversion.Scope) error {
-	return autoConvert_api_MetricsProvider_To_v1alpha2_MetricsProvider(in, out, s)
-}
-
 func autoConvert_v1alpha2_PluginConfig_To_api_PluginConfig(in *PluginConfig, out *api.PluginConfig, s conversion.Scope) error {
 	out.Name = in.Name
 	if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Args, &out.Args, s); err != nil {
@@ -391,47 +271,3 @@ func autoConvert_api_Plugins_To_v1alpha2_Plugins(in *api.Plugins, out *Plugins,
 func Convert_api_Plugins_To_v1alpha2_Plugins(in *api.Plugins, out *Plugins, s conversion.Scope) error {
 	return autoConvert_api_Plugins_To_v1alpha2_Plugins(in, out, s)
 }
-
-func autoConvert_v1alpha2_Prometheus_To_api_Prometheus(in *Prometheus, out *api.Prometheus, s conversion.Scope) error {
-	out.URL = in.URL
-	out.AuthToken = (*api.AuthToken)(unsafe.Pointer(in.AuthToken))
-	return nil
-}
-
-// Convert_v1alpha2_Prometheus_To_api_Prometheus is an autogenerated conversion function.
-func Convert_v1alpha2_Prometheus_To_api_Prometheus(in *Prometheus, out *api.Prometheus, s conversion.Scope) error {
-	return autoConvert_v1alpha2_Prometheus_To_api_Prometheus(in, out, s)
-}
-
-func autoConvert_api_Prometheus_To_v1alpha2_Prometheus(in *api.Prometheus, out *Prometheus, s conversion.Scope) error {
-	out.URL = in.URL
-	out.AuthToken = (*AuthToken)(unsafe.Pointer(in.AuthToken))
-	return nil
-}
-
-// Convert_api_Prometheus_To_v1alpha2_Prometheus is an autogenerated conversion function.
-func Convert_api_Prometheus_To_v1alpha2_Prometheus(in *api.Prometheus, out *Prometheus, s conversion.Scope) error {
-	return autoConvert_api_Prometheus_To_v1alpha2_Prometheus(in, out, s)
-}
-
-func autoConvert_v1alpha2_SecretReference_To_api_SecretReference(in *SecretReference, out *api.SecretReference, s conversion.Scope) error {
-	out.Namespace = in.Namespace
-	out.Name = in.Name
-	return nil
-}
-
-// Convert_v1alpha2_SecretReference_To_api_SecretReference is an autogenerated conversion function.
-func Convert_v1alpha2_SecretReference_To_api_SecretReference(in *SecretReference, out *api.SecretReference, s conversion.Scope) error {
-	return autoConvert_v1alpha2_SecretReference_To_api_SecretReference(in, out, s)
-}
-
-func autoConvert_api_SecretReference_To_v1alpha2_SecretReference(in *api.SecretReference, out *SecretReference, s conversion.Scope) error {
-	out.Namespace = in.Namespace
-	out.Name = in.Name
-	return nil
-}
-
-// Convert_api_SecretReference_To_v1alpha2_SecretReference is an autogenerated conversion function.
-func Convert_api_SecretReference_To_v1alpha2_SecretReference(in *api.SecretReference, out *SecretReference, s conversion.Scope) error {
-	return autoConvert_api_SecretReference_To_v1alpha2_SecretReference(in, out, s)
-}

pkg/api/v1alpha2/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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.
@@ -25,27 +25,6 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AuthToken) DeepCopyInto(out *AuthToken) {
-	*out = *in
-	if in.SecretReference != nil {
-		in, out := &in.SecretReference, &out.SecretReference
-		*out = new(SecretReference)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthToken.
-func (in *AuthToken) DeepCopy() *AuthToken {
-	if in == nil {
-		return nil
-	}
-	out := new(AuthToken)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 	*out = *in
@@ -77,28 +56,6 @@ func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 		*out = new(uint)
 		**out = **in
 	}
-	if in.EvictionFailureEventNotification != nil {
-		in, out := &in.EvictionFailureEventNotification, &out.EvictionFailureEventNotification
-		*out = new(bool)
-		**out = **in
-	}
-	if in.MetricsCollector != nil {
-		in, out := &in.MetricsCollector, &out.MetricsCollector
-		*out = new(MetricsCollector)
-		**out = **in
-	}
-	if in.MetricsProviders != nil {
-		in, out := &in.MetricsProviders, &out.MetricsProviders
-		*out = make([]MetricsProvider, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.GracePeriodSeconds != nil {
-		in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	}
 	return
 }
 
@@ -144,43 +101,6 @@ func (in *DeschedulerProfile) DeepCopy() *DeschedulerProfile {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsCollector) DeepCopyInto(out *MetricsCollector) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsCollector.
-func (in *MetricsCollector) DeepCopy() *MetricsCollector {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsCollector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsProvider) DeepCopyInto(out *MetricsProvider) {
-	*out = *in
-	if in.Prometheus != nil {
-		in, out := &in.Prometheus, &out.Prometheus
-		*out = new(Prometheus)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsProvider.
-func (in *MetricsProvider) DeepCopy() *MetricsProvider {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsProvider)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PluginConfig) DeepCopyInto(out *PluginConfig) {
 	*out = *in
@@ -245,40 +165,3 @@ func (in *Plugins) DeepCopy() *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 *Prometheus) DeepCopyInto(out *Prometheus) {
-	*out = *in
-	if in.AuthToken != nil {
-		in, out := &in.AuthToken, &out.AuthToken
-		*out = new(AuthToken)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Prometheus.
-func (in *Prometheus) DeepCopy() *Prometheus {
-	if in == nil {
-		return nil
-	}
-	out := new(Prometheus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretReference) DeepCopyInto(out *SecretReference) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretReference.
-func (in *SecretReference) DeepCopy() *SecretReference {
-	if in == nil {
-		return nil
-	}
-	out := new(SecretReference)
-	in.DeepCopyInto(out)
-	return out
-}

pkg/api/v1alpha2/zz_generated.defaults.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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 2026 The Kubernetes Authors.
+Copyright 2024 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.
@@ -25,27 +25,6 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AuthToken) DeepCopyInto(out *AuthToken) {
-	*out = *in
-	if in.SecretReference != nil {
-		in, out := &in.SecretReference, &out.SecretReference
-		*out = new(SecretReference)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthToken.
-func (in *AuthToken) DeepCopy() *AuthToken {
-	if in == nil {
-		return nil
-	}
-	out := new(AuthToken)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 	*out = *in
@@ -77,28 +56,6 @@ func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 		*out = new(uint)
 		**out = **in
 	}
-	if in.EvictionFailureEventNotification != nil {
-		in, out := &in.EvictionFailureEventNotification, &out.EvictionFailureEventNotification
-		*out = new(bool)
-		**out = **in
-	}
-	if in.MetricsCollector != nil {
-		in, out := &in.MetricsCollector, &out.MetricsCollector
-		*out = new(MetricsCollector)
-		**out = **in
-	}
-	if in.MetricsProviders != nil {
-		in, out := &in.MetricsProviders, &out.MetricsProviders
-		*out = make([]MetricsProvider, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.GracePeriodSeconds != nil {
-		in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	}
 	return
 }
 
@@ -144,64 +101,6 @@ func (in *DeschedulerProfile) DeepCopy() *DeschedulerProfile {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EvictionLimits) DeepCopyInto(out *EvictionLimits) {
-	*out = *in
-	if in.Node != nil {
-		in, out := &in.Node, &out.Node
-		*out = new(uint)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EvictionLimits.
-func (in *EvictionLimits) DeepCopy() *EvictionLimits {
-	if in == nil {
-		return nil
-	}
-	out := new(EvictionLimits)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsCollector) DeepCopyInto(out *MetricsCollector) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsCollector.
-func (in *MetricsCollector) DeepCopy() *MetricsCollector {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsCollector)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *MetricsProvider) DeepCopyInto(out *MetricsProvider) {
-	*out = *in
-	if in.Prometheus != nil {
-		in, out := &in.Prometheus, &out.Prometheus
-		*out = new(Prometheus)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetricsProvider.
-func (in *MetricsProvider) DeepCopy() *MetricsProvider {
-	if in == nil {
-		return nil
-	}
-	out := new(MetricsProvider)
-	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
@@ -316,27 +215,6 @@ func (in *PriorityThreshold) DeepCopy() *PriorityThreshold {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Prometheus) DeepCopyInto(out *Prometheus) {
-	*out = *in
-	if in.AuthToken != nil {
-		in, out := &in.AuthToken, &out.AuthToken
-		*out = new(AuthToken)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Prometheus.
-func (in *Prometheus) DeepCopy() *Prometheus {
-	if in == nil {
-		return nil
-	}
-	out := new(Prometheus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in ResourceThresholds) DeepCopyInto(out *ResourceThresholds) {
 	{
@@ -358,19 +236,3 @@ 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 *SecretReference) DeepCopyInto(out *SecretReference) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretReference.
-func (in *SecretReference) DeepCopy() *SecretReference {
-	if in == nil {
-		return nil
-	}
-	out := new(SecretReference)
-	in.DeepCopyInto(out)
-	return out
-}

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

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

@@ -17,30 +17,18 @@ limitations under the License.
 package client
 
 import (
-	"crypto/tls"
-	"crypto/x509"
 	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"time"
 
-	promapi "github.com/prometheus/client_golang/api"
-	"github.com/prometheus/common/config"
+	clientset "k8s.io/client-go/kubernetes"
+	componentbaseconfig "k8s.io/component-base/config"
+	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
 
 	// Ensure to load all auth plugins.
-	clientset "k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/transport"
-	componentbaseconfig "k8s.io/component-base/config"
-	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
 )
 
-var K8sPodCAFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-
 func createConfig(clientConnection componentbaseconfig.ClientConnectionConfiguration, userAgt string) (*rest.Config, error) {
 	var cfg *rest.Config
 	if len(clientConnection.Kubeconfig) != 0 {
@@ -107,61 +95,3 @@ func GetMasterFromKubeconfig(filename string) (string, error) {
 	}
 	return "", fmt.Errorf("failed to get master address from kubeconfig: cluster information not found")
 }
-
-func loadCAFile(filepath string) (*x509.CertPool, error) {
-	caCert, err := os.ReadFile(filepath)
-	if err != nil {
-		return nil, err
-	}
-
-	caCertPool := x509.NewCertPool()
-	if ok := caCertPool.AppendCertsFromPEM(caCert); !ok {
-		return nil, fmt.Errorf("failed to append CA certificate to the pool")
-	}
-
-	return caCertPool, nil
-}
-
-func CreatePrometheusClient(prometheusURL, authToken string) (promapi.Client, *http.Transport, error) {
-	// Retrieve Pod CA cert
-	caCertPool, err := loadCAFile(K8sPodCAFilePath)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error loading CA file: %v", err)
-	}
-
-	// Get Prometheus Host
-	u, err := url.Parse(prometheusURL)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error parsing prometheus URL: %v", err)
-	}
-	t := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}).DialContext,
-		MaxIdleConns:        100,
-		IdleConnTimeout:     90 * time.Second,
-		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig: &tls.Config{
-			RootCAs:    caCertPool,
-			ServerName: u.Host,
-		},
-	}
-	roundTripper := transport.NewBearerAuthRoundTripper(
-		authToken,
-		t,
-	)
-
-	if authToken != "" {
-		client, err := promapi.NewClient(promapi.Config{
-			Address:      prometheusURL,
-			RoundTripper: config.NewAuthorizationCredentialsRoundTripper("Bearer", config.NewInlineSecret(authToken), roundTripper),
-		})
-		return client, t, err
-	}
-	client, err := promapi.NewClient(promapi.Config{
-		Address: prometheusURL,
-	})
-	return client, t, err
-}

pkg/descheduler/descheduler.go

@@ -23,20 +23,22 @@ import (
 	"strconv"
 	"time"
 
-	promapi "github.com/prometheus/client_golang/api"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
-
 	v1 "k8s.io/api/core/v1"
+	policy "k8s.io/api/policy/v1"
+	schedulingv1 "k8s.io/api/scheduling/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
+	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/events"
 	componentbaseconfig "k8s.io/component-base/config"
 	"k8s.io/klog/v2"
@@ -58,10 +60,6 @@ import (
 	"sigs.k8s.io/descheduler/pkg/version"
 )
 
-const (
-	indexerNodeSelectorGlobal = "indexer_node_selector_global"
-)
-
 type eprunner func(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status
 
 type profileRunner struct {
@@ -70,186 +68,163 @@ type profileRunner struct {
 }
 
 type descheduler struct {
-	rs                        *options.DeschedulerServer
-	client                    clientset.Interface
-	kubeClientSandbox         *kubeClientSandbox
-	getPodsAssignedToNode     podutil.GetPodsAssignedToNodeFunc
-	sharedInformerFactory     informers.SharedInformerFactory
-	deschedulerPolicy         *api.DeschedulerPolicy
-	eventRecorder             events.EventRecorder
-	podEvictor                *evictions.PodEvictor
-	metricsCollector          *metricscollector.MetricsCollector
-	inClusterPromClientCtrl   *inClusterPromClientController
-	secretBasedPromClientCtrl *secretBasedPromClientController
-	profileRunners            []profileRunner
+	rs                     *options.DeschedulerServer
+	ir                     *informerResources
+	getPodsAssignedToNode  podutil.GetPodsAssignedToNodeFunc
+	sharedInformerFactory  informers.SharedInformerFactory
+	deschedulerPolicy      *api.DeschedulerPolicy
+	eventRecorder          events.EventRecorder
+	podEvictor             *evictions.PodEvictor
+	podEvictionReactionFnc func(*fakeclientset.Clientset) func(action core.Action) (bool, runtime.Object, error)
+	metricsCollector       *metricscollector.MetricsCollector
 }
 
-func nodeSelectorFromPolicy(deschedulerPolicy *api.DeschedulerPolicy) (labels.Selector, error) {
-	nodeSelector := labels.Everything()
-	if deschedulerPolicy.NodeSelector != nil {
-		sel, err := labels.Parse(*deschedulerPolicy.NodeSelector)
+type informerResources struct {
+	sharedInformerFactory informers.SharedInformerFactory
+	resourceToInformer    map[schema.GroupVersionResource]informers.GenericInformer
+}
+
+func newInformerResources(sharedInformerFactory informers.SharedInformerFactory) *informerResources {
+	return &informerResources{
+		sharedInformerFactory: sharedInformerFactory,
+		resourceToInformer:    make(map[schema.GroupVersionResource]informers.GenericInformer),
+	}
+}
+
+func (ir *informerResources) Uses(resources ...schema.GroupVersionResource) error {
+	for _, resource := range resources {
+		informer, err := ir.sharedInformerFactory.ForResource(resource)
 		if err != nil {
-			return nil, err
+			return err
 		}
-		nodeSelector = sel
+
+		ir.resourceToInformer[resource] = informer
 	}
-	return nodeSelector, nil
+	return nil
 }
 
-func addNodeSelectorIndexer(sharedInformerFactory informers.SharedInformerFactory, nodeSelector labels.Selector) error {
-	return nodeutil.AddNodeSelectorIndexer(sharedInformerFactory.Core().V1().Nodes().Informer(), indexerNodeSelectorGlobal, nodeSelector)
-}
+// CopyTo Copy informer subscriptions to the new factory and objects to the fake client so that the backing caches are populated for when listers are used.
+func (ir *informerResources) CopyTo(fakeClient *fakeclientset.Clientset, newFactory informers.SharedInformerFactory) error {
+	for resource, informer := range ir.resourceToInformer {
+		_, err := newFactory.ForResource(resource)
+		if err != nil {
+			return fmt.Errorf("error getting resource %s: %w", resource, err)
+		}
 
-func metricsProviderListToMap(providersList []api.MetricsProvider) map[api.MetricsSource]*api.MetricsProvider {
-	providersMap := make(map[api.MetricsSource]*api.MetricsProvider)
-	for _, provider := range providersList {
-		provider := provider
-		providersMap[provider.Source] = &provider
+		objects, err := informer.Lister().List(labels.Everything())
+		if err != nil {
+			return fmt.Errorf("error listing %s: %w", informer, err)
+		}
+
+		for _, object := range objects {
+			fakeClient.Tracker().Add(object)
+		}
 	}
-	return providersMap
+	return nil
 }
 
-func getPrometheusConfig(providersList []api.MetricsProvider) *api.Prometheus {
-	prometheusProvider := metricsProviderListToMap(providersList)[api.PrometheusMetrics]
-	if prometheusProvider == nil {
-		return nil
-	}
-	return prometheusProvider.Prometheus
-}
-
-func configureSecretPromClientReconciler(prometheusConfig *api.Prometheus) bool {
-	return prometheusConfig.URL != "" && prometheusConfig.AuthToken != nil
-}
-
-func newDescheduler(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string, eventRecorder events.EventRecorder, client clientset.Interface, sharedInformerFactory, namespacedSharedInformerFactory informers.SharedInformerFactory, kubeClientSandbox *kubeClientSandbox) (*descheduler, error) {
+func newDescheduler(rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string, eventRecorder events.EventRecorder, sharedInformerFactory informers.SharedInformerFactory) (*descheduler, error) {
 	podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
-	// Temporarily register the PVC because it is used by the DefaultEvictor plugin during
-	// the descheduling cycle, where informer registration is ignored.
-	_ = sharedInformerFactory.Core().V1().PersistentVolumeClaims().Informer()
+
+	ir := newInformerResources(sharedInformerFactory)
+	ir.Uses(v1.SchemeGroupVersion.WithResource("pods"),
+		v1.SchemeGroupVersion.WithResource("nodes"),
+		// Future work could be to let each plugin declare what type of resources it needs; that way dry runs would stay
+		// consistent with the real runs without having to keep the list here in sync.
+		v1.SchemeGroupVersion.WithResource("namespaces"),                // Used by the defaultevictor plugin
+		schedulingv1.SchemeGroupVersion.WithResource("priorityclasses")) // Used by the defaultevictor plugin
 
 	getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
 	if err != nil {
 		return nil, fmt.Errorf("build get pods assigned to node function error: %v", err)
 	}
 
-	podEvictor, err := evictions.NewPodEvictor(
-		ctx,
-		client,
+	podEvictor := evictions.NewPodEvictor(
+		nil,
 		eventRecorder,
-		podInformer,
-		rs.DefaultFeatureGates,
 		evictions.NewOptions().
 			WithPolicyGroupVersion(evictionPolicyGroupVersion).
 			WithMaxPodsToEvictPerNode(deschedulerPolicy.MaxNoOfPodsToEvictPerNode).
 			WithMaxPodsToEvictPerNamespace(deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace).
 			WithMaxPodsToEvictTotal(deschedulerPolicy.MaxNoOfPodsToEvictTotal).
-			WithEvictionFailureEventNotification(deschedulerPolicy.EvictionFailureEventNotification).
-			WithGracePeriodSeconds(deschedulerPolicy.GracePeriodSeconds).
 			WithDryRun(rs.DryRun).
 			WithMetricsEnabled(!rs.DisableMetrics),
 	)
-	if err != nil {
-		return nil, err
+
+	var metricsCollector *metricscollector.MetricsCollector
+	if deschedulerPolicy.MetricsCollector.Enabled {
+		metricsCollector = metricscollector.NewMetricsCollector(rs.Client, rs.MetricsClient)
 	}
 
-	desch := &descheduler{
-		rs:                    rs,
-		client:                client,
-		kubeClientSandbox:     kubeClientSandbox,
-		getPodsAssignedToNode: getPodsAssignedToNode,
-		sharedInformerFactory: sharedInformerFactory,
-		deschedulerPolicy:     deschedulerPolicy,
-		eventRecorder:         eventRecorder,
-		podEvictor:            podEvictor,
-	}
-
-	prometheusConfig := getPrometheusConfig(deschedulerPolicy.MetricsProviders)
-	if prometheusConfig != nil && prometheusConfig.URL != "" {
-		if configureSecretPromClientReconciler(prometheusConfig) {
-			// Secret-based mode
-			ctrl, err := newSecretBasedPromClientController(rs.PrometheusClient, prometheusConfig, namespacedSharedInformerFactory)
-			if err != nil {
-				return nil, err
-			}
-			desch.secretBasedPromClientCtrl = ctrl
-		} else {
-			// In-cluster mode
-			desch.inClusterPromClientCtrl = newInClusterPromClientController(rs.PrometheusClient, prometheusConfig)
-		}
-	}
-
-	nodeSelector, err := nodeSelectorFromPolicy(deschedulerPolicy)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := addNodeSelectorIndexer(sharedInformerFactory, nodeSelector); err != nil {
-		return nil, err
-	}
-
-	if rs.MetricsClient != nil {
-		desch.metricsCollector = metricscollector.NewMetricsCollector(sharedInformerFactory.Core().V1().Nodes().Lister(), rs.MetricsClient, nodeSelector)
-	}
-
-	var profileRunners []profileRunner
-	for idx, profile := range deschedulerPolicy.Profiles {
-		var promClientGetter func() promapi.Client
-		if desch.inClusterPromClientCtrl != nil {
-			promClientGetter = desch.inClusterPromClientCtrl.prometheusClient
-		} else if desch.secretBasedPromClientCtrl != nil {
-			promClientGetter = desch.secretBasedPromClientCtrl.prometheusClient
-		}
-		currProfile, err := frameworkprofile.NewProfile(
-			ctx,
-			profile,
-			pluginregistry.PluginRegistry,
-			frameworkprofile.WithClientSet(desch.client),
-			frameworkprofile.WithSharedInformerFactory(desch.sharedInformerFactory),
-			frameworkprofile.WithPodEvictor(desch.podEvictor),
-			frameworkprofile.WithGetPodsAssignedToNodeFnc(desch.getPodsAssignedToNode),
-			frameworkprofile.WithMetricsCollector(desch.metricsCollector),
-			frameworkprofile.WithPrometheusClient(promClientGetter),
-			// Generate a unique instance ID using just the index to avoid long IDs
-			// when profile names are very long
-			frameworkprofile.WithProfileInstanceID(fmt.Sprintf("%d", idx)),
-		)
-		if err != nil {
-			return nil, fmt.Errorf("unable to create %q profile: %v", profile.Name, err)
-		}
-		profileRunners = append(profileRunners, profileRunner{profile.Name, currProfile.RunDeschedulePlugins, currProfile.RunBalancePlugins})
-	}
-
-	desch.profileRunners = profileRunners
-	return desch, nil
+	return &descheduler{
+		rs:                     rs,
+		ir:                     ir,
+		getPodsAssignedToNode:  getPodsAssignedToNode,
+		sharedInformerFactory:  sharedInformerFactory,
+		deschedulerPolicy:      deschedulerPolicy,
+		eventRecorder:          eventRecorder,
+		podEvictor:             podEvictor,
+		podEvictionReactionFnc: podEvictionReactionFnc,
+		metricsCollector:       metricsCollector,
+	}, nil
 }
 
-func (d *descheduler) runDeschedulerLoop(ctx context.Context) error {
+func (d *descheduler) runDeschedulerLoop(ctx context.Context, nodes []*v1.Node) error {
 	var span trace.Span
 	ctx, span = tracing.Tracer().Start(ctx, "runDeschedulerLoop")
 	defer span.End()
 	defer func(loopStartDuration time.Time) {
 		metrics.DeschedulerLoopDuration.With(map[string]string{}).Observe(time.Since(loopStartDuration).Seconds())
-		metrics.LoopDuration.With(map[string]string{}).Observe(time.Since(loopStartDuration).Seconds())
 	}(time.Now())
 
-	klog.V(3).Infof("Resetting pod evictor counters")
-	d.podEvictor.ResetCounters()
-
-	d.runProfiles(ctx)
-
-	if d.rs.DryRun {
-		if d.kubeClientSandbox == nil {
-			return fmt.Errorf("kubeClientSandbox is nil in DryRun mode")
-		}
-		klog.V(3).Infof("Restoring evicted pods from cache")
-		if err := d.kubeClientSandbox.restoreEvictedPods(ctx); err != nil {
-			klog.ErrorS(err, "Failed to restore evicted pods")
-			return fmt.Errorf("failed to restore evicted pods: %w", err)
-		}
-		d.kubeClientSandbox.reset()
+	// if len is still <= 1 error out
+	if len(nodes) <= 1 {
+		klog.V(1).InfoS("The cluster size is 0 or 1 meaning eviction causes service disruption or degradation. So aborting..")
+		return fmt.Errorf("the cluster size is 0 or 1")
 	}
 
-	klog.V(1).InfoS("Number of evictions/requests", "totalEvicted", d.podEvictor.TotalEvicted(), "evictionRequests", d.podEvictor.TotalEvictionRequests())
+	var client clientset.Interface
+	// When the dry mode is enable, collect all the relevant objects (mostly pods) under a fake client.
+	// So when evicting pods while running multiple strategies in a row have the cummulative effect
+	// as is when evicting pods for real.
+	if d.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 := fakeclientset.NewSimpleClientset()
+		// simulate a pod eviction by deleting a pod
+		fakeClient.PrependReactor("create", "pods", d.podEvictionReactionFnc(fakeClient))
+		fakeSharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
+
+		err := d.ir.CopyTo(fakeClient, fakeSharedInformerFactory)
+		if err != nil {
+			return err
+		}
+
+		// create a new instance of the shared informer factor from the cached client
+		// register the pod informer, otherwise it will not get running
+		d.getPodsAssignedToNode, err = podutil.BuildGetPodsAssignedToNodeFunc(fakeSharedInformerFactory.Core().V1().Pods().Informer())
+		if err != nil {
+			return fmt.Errorf("build get pods assigned to node function error: %v", err)
+		}
+
+		fakeCtx, cncl := context.WithCancel(context.TODO())
+		defer cncl()
+		fakeSharedInformerFactory.Start(fakeCtx.Done())
+		fakeSharedInformerFactory.WaitForCacheSync(fakeCtx.Done())
+
+		client = fakeClient
+		d.sharedInformerFactory = fakeSharedInformerFactory
+	} else {
+		client = d.rs.Client
+	}
+
+	klog.V(3).Infof("Setting up the pod evictor")
+	d.podEvictor.SetClient(client)
+	d.podEvictor.ResetCounters()
+
+	d.runProfiles(ctx, client, nodes)
+
+	klog.V(1).InfoS("Number of evicted pods", "totalEvicted", d.podEvictor.TotalEvicted())
 
 	return nil
 }
@@ -257,32 +232,29 @@ func (d *descheduler) runDeschedulerLoop(ctx context.Context) error {
 // runProfiles runs all the deschedule plugins of all profiles and
 // later runs through all balance plugins of all profiles. (All Balance plugins should come after all Deschedule plugins)
 // see https://github.com/kubernetes-sigs/descheduler/issues/979
-func (d *descheduler) runProfiles(ctx context.Context) {
+func (d *descheduler) runProfiles(ctx context.Context, client clientset.Interface, nodes []*v1.Node) {
 	var span trace.Span
 	ctx, span = tracing.Tracer().Start(ctx, "runProfiles")
 	defer span.End()
-
-	nodesAsInterface, err := d.sharedInformerFactory.Core().V1().Nodes().Informer().GetIndexer().ByIndex(indexerNodeSelectorGlobal, indexerNodeSelectorGlobal)
-	if err != nil {
-		span.AddEvent("Failed to list nodes with global node selector", trace.WithAttributes(attribute.String("err", err.Error())))
-		klog.Error(err)
-		return
+	var profileRunners []profileRunner
+	for _, profile := range d.deschedulerPolicy.Profiles {
+		currProfile, err := frameworkprofile.NewProfile(
+			profile,
+			pluginregistry.PluginRegistry,
+			frameworkprofile.WithClientSet(client),
+			frameworkprofile.WithSharedInformerFactory(d.sharedInformerFactory),
+			frameworkprofile.WithPodEvictor(d.podEvictor),
+			frameworkprofile.WithGetPodsAssignedToNodeFnc(d.getPodsAssignedToNode),
+			frameworkprofile.WithMetricsCollector(d.metricsCollector),
+		)
+		if err != nil {
+			klog.ErrorS(err, "unable to create a profile", "profile", profile.Name)
+			continue
+		}
+		profileRunners = append(profileRunners, profileRunner{profile.Name, currProfile.RunDeschedulePlugins, currProfile.RunBalancePlugins})
 	}
 
-	nodes, err := nodeutil.ReadyNodesFromInterfaces(nodesAsInterface)
-	if err != nil {
-		span.AddEvent("Failed to convert node as interfaces into ready nodes", trace.WithAttributes(attribute.String("err", err.Error())))
-		klog.Error(err)
-		return
-	}
-
-	// if len is still <= 1 error out
-	if len(nodes) <= 1 {
-		klog.InfoS("Skipping descheduling cycle: requires >=2 nodes", "found", len(nodes))
-		return // gracefully skip this cycle instead of aborting
-	}
-
-	for _, profileR := range d.profileRunners {
+	for _, profileR := range profileRunners {
 		// First deschedule
 		status := profileR.descheduleEPs(ctx, nodes)
 		if status != nil && status.Err != nil {
@@ -292,7 +264,7 @@ func (d *descheduler) runProfiles(ctx context.Context) {
 		}
 	}
 
-	for _, profileR := range d.profileRunners {
+	for _, profileR := range profileRunners {
 		// Balance Later
 		status := profileR.balanceEPs(ctx, nodes)
 		if status != nil && status.Err != nil {
@@ -338,7 +310,7 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 		return err
 	}
 
-	if (deschedulerPolicy.MetricsCollector != nil && deschedulerPolicy.MetricsCollector.Enabled) || metricsProviderListToMap(deschedulerPolicy.MetricsProviders)[api.KubernetesMetrics] != nil {
+	if deschedulerPolicy.MetricsCollector.Enabled {
 		metricsClient, err := client.CreateMetricsClient(clientConnection, "descheduler")
 		if err != nil {
 			return err
@@ -400,117 +372,39 @@ func validateVersionCompatibility(discovery discovery.DiscoveryInterface, desche
 	return nil
 }
 
-type runFncType func(context.Context) error
-
-func bootstrapDescheduler(
-	ctx context.Context,
-	rs *options.DeschedulerServer,
-	deschedulerPolicy *api.DeschedulerPolicy,
-	evictionPolicyGroupVersion string,
-	sharedInformerFactory, namespacedSharedInformerFactory informers.SharedInformerFactory,
-	eventRecorder events.EventRecorder,
-) (*descheduler, runFncType, error) {
-	// Always create descheduler with real client/factory first to register all informers
-	descheduler, err := newDescheduler(ctx, rs, deschedulerPolicy, evictionPolicyGroupVersion, eventRecorder, rs.Client, sharedInformerFactory, namespacedSharedInformerFactory, nil)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to create new descheduler: %v", err)
-	}
-
-	// If in dry run mode, replace the descheduler with one using fake client/factory
-	if rs.DryRun {
-		// Create sandbox with resources to mirror from real client
-		kubeClientSandbox, err := newDefaultKubeClientSandbox(rs.Client, sharedInformerFactory)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to create kube client sandbox: %v", err)
-		}
-
-		klog.V(3).Infof("Building a cached client from the cluster for the dry run")
-
-		// TODO(ingvagabund): drop the previous queue
-		// TODO(ingvagabund): stop the previous pod evictor
-		// Replace descheduler with one using fake client/factory
-		descheduler, err = newDescheduler(ctx, rs, deschedulerPolicy, evictionPolicyGroupVersion, eventRecorder, kubeClientSandbox.fakeClient(), kubeClientSandbox.fakeSharedInformerFactory(), namespacedSharedInformerFactory, kubeClientSandbox)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to create dry run descheduler: %v", err)
-		}
-	}
-
-	// init is responsible for starting all informer factories, metrics providers
-	// and other parts that require to start before a first descheduling cycle is run
-	deschedulerInitFnc := func(ctx context.Context) error {
-		// In dry run mode, start and sync the fake shared informer factory so it can mirror
-		// events from the real factory. Reliable propagation depends on both factories being
-		// fully synced (see WaitForCacheSync calls below), not solely on startup order.
-		if rs.DryRun {
-			descheduler.kubeClientSandbox.fakeSharedInformerFactory().Start(ctx.Done())
-			descheduler.kubeClientSandbox.fakeSharedInformerFactory().WaitForCacheSync(ctx.Done())
-		}
-		sharedInformerFactory.Start(ctx.Done())
-		if descheduler.secretBasedPromClientCtrl != nil {
-			namespacedSharedInformerFactory.Start(ctx.Done())
-		}
-
-		sharedInformerFactory.WaitForCacheSync(ctx.Done())
-		if descheduler.secretBasedPromClientCtrl != nil {
-			namespacedSharedInformerFactory.WaitForCacheSync(ctx.Done())
-		}
-
-		descheduler.podEvictor.WaitForEventHandlersSync(ctx)
-
-		if descheduler.metricsCollector != nil {
-			go func() {
-				klog.V(2).Infof("Starting metrics collector")
-				descheduler.metricsCollector.Run(ctx)
-				klog.V(2).Infof("Stopped metrics collector")
-			}()
-			klog.V(2).Infof("Waiting for metrics collector to sync")
-			if err := wait.PollUntilContextTimeout(ctx, time.Second, time.Minute, true, func(context.Context) (done bool, err error) {
-				return descheduler.metricsCollector.HasSynced(), nil
-			}); err != nil {
-				return fmt.Errorf("unable to wait for metrics collector to sync: %v", err)
+func podEvictionReactionFnc(fakeClient *fakeclientset.Clientset) 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 descheduler.secretBasedPromClientCtrl != nil {
-			go descheduler.secretBasedPromClientCtrl.runAuthenticationSecretReconciler(ctx)
-		}
-
-		return nil
-	}
-
-	if err := deschedulerInitFnc(ctx); err != nil {
-		return nil, nil, err
-	}
-
-	runFnc := func(ctx context.Context) error {
-		if descheduler.inClusterPromClientCtrl != nil {
-			// Read the sa token and assume it has the sufficient permissions to authenticate
-			if err := descheduler.inClusterPromClientCtrl.reconcileInClusterSAToken(); err != nil {
-				return fmt.Errorf("unable to reconcile an in cluster SA token: %v", err)
+			eviction, matched := createAct.Object.(*policy.Eviction)
+			if !matched {
+				return false, nil, fmt.Errorf("unable to convert action object into *policy.Eviction")
 			}
+			if err := fakeClient.Tracker().Delete(action.GetResource(), eviction.GetNamespace(), eviction.GetName()); err != nil {
+				return false, nil, fmt.Errorf("unable to delete pod %v/%v: %v", eviction.GetNamespace(), eviction.GetName(), err)
+			}
+			return true, nil, nil
 		}
-
-		err = descheduler.runDeschedulerLoop(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to run descheduler loop: %v", err)
-		}
-
-		return nil
+		// fallback to the default reactor
+		return false, nil, nil
 	}
-
-	return descheduler, runFnc, nil
 }
 
 func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string) error {
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
 	var span trace.Span
 	ctx, span = tracing.Tracer().Start(ctx, "RunDeschedulerStrategies")
 	defer span.End()
 
 	sharedInformerFactory := informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(trimManagedFields))
 
+	var nodeSelector string
+	if deschedulerPolicy.NodeSelector != nil {
+		nodeSelector = *deschedulerPolicy.NodeSelector
+	}
+
 	var eventClient clientset.Interface
 	if rs.DryRun {
 		eventClient = fakeclientset.NewSimpleClientset()
@@ -520,26 +414,40 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	eventBroadcaster, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, eventClient)
 	defer eventBroadcaster.Shutdown()
 
-	var namespacedSharedInformerFactory informers.SharedInformerFactory
-	prometheusConfig := getPrometheusConfig(deschedulerPolicy.MetricsProviders)
-	if prometheusConfig != nil && configureSecretPromClientReconciler(prometheusConfig) {
-		namespacedSharedInformerFactory = informers.NewSharedInformerFactoryWithOptions(rs.Client, 0, informers.WithTransform(trimManagedFields), informers.WithNamespace(prometheusConfig.AuthToken.SecretReference.Namespace))
-	}
-
-	_, runLoop, err := bootstrapDescheduler(ctx, rs, deschedulerPolicy, evictionPolicyGroupVersion, sharedInformerFactory, namespacedSharedInformerFactory, eventRecorder)
+	descheduler, err := newDescheduler(rs, deschedulerPolicy, evictionPolicyGroupVersion, eventRecorder, sharedInformerFactory)
 	if err != nil {
-		span.AddEvent("Failed to bootstrap a descheduler", trace.WithAttributes(attribute.String("err", err.Error())))
+		span.AddEvent("Failed to create new descheduler", trace.WithAttributes(attribute.String("err", err.Error())))
 		return err
 	}
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	sharedInformerFactory.Start(ctx.Done())
+	sharedInformerFactory.WaitForCacheSync(ctx.Done())
+
+	go func() {
+		klog.V(2).Infof("Starting metrics collector")
+		descheduler.metricsCollector.Run(ctx)
+		klog.V(2).Infof("Stopped metrics collector")
+	}()
 
 	wait.NonSlidingUntil(func() {
 		// A next context is created here intentionally to avoid nesting the spans via context.
 		sCtx, sSpan := tracing.Tracer().Start(ctx, "NonSlidingUntil")
 		defer sSpan.End()
 
-		if err := runLoop(sCtx); err != nil {
-			sSpan.AddEvent("Descheduling loop failed", trace.WithAttributes(attribute.String("err", err.Error())))
+		nodes, err := nodeutil.ReadyNodes(sCtx, rs.Client, descheduler.sharedInformerFactory.Core().V1().Nodes().Lister(), nodeSelector)
+		if err != nil {
+			sSpan.AddEvent("Failed to detect ready nodes", trace.WithAttributes(attribute.String("err", err.Error())))
 			klog.Error(err)
+			cancel()
+			return
+		}
+		err = descheduler.runDeschedulerLoop(sCtx, nodes)
+		if err != nil {
+			sSpan.AddEvent("Failed to run descheduler loop", trace.WithAttributes(attribute.String("err", err.Error())))
+			klog.Error(err)
+			cancel()
 			return
 		}
 		// If there was no interval specified, send a signal to the stopChannel to end the wait.Until loop after 1 iteration

pkg/descheduler/evictions/evictions.go

@@ -19,9 +19,7 @@ package evictions
 import (
 	"context"
 	"fmt"
-	"strings"
 	"sync"
-	"time"
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -29,209 +27,15 @@ import (
 	policy "k8s.io/api/policy/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/events"
-	"k8s.io/component-base/featuregate"
 	"k8s.io/klog/v2"
-
 	"sigs.k8s.io/descheduler/metrics"
+
 	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
-	"sigs.k8s.io/descheduler/pkg/features"
 	"sigs.k8s.io/descheduler/pkg/tracing"
 )
 
-const (
-	deschedulerGlobalName    = "sigs.k8s.io/descheduler"
-	reasonAnnotationKey      = "reason"
-	requestedByAnnotationKey = "requested-by"
-)
-
-var (
-	assumedEvictionRequestTimeoutSeconds uint          = 10 * 60 // 10 minutes
-	evictionRequestsCacheResyncPeriod    time.Duration = 10 * time.Minute
-	// syncedPollPeriod controls how often you look at the status of your sync funcs
-	syncedPollPeriod = 100 * time.Millisecond
-)
-
-type evictionRequestItem struct {
-	podName, podNamespace, podNodeName string
-	strategyName, profileName          string
-	evictionAssumed                    bool
-	assumedTimestamp                   metav1.Time
-}
-
-type evictionRequestsCache struct {
-	mu                           sync.RWMutex
-	requests                     map[string]evictionRequestItem
-	requestsPerNode              map[string]uint
-	requestsPerNamespace         map[string]uint
-	requestsTotal                uint
-	assumedRequestTimeoutSeconds uint
-}
-
-func newEvictionRequestsCache(assumedRequestTimeoutSeconds uint) *evictionRequestsCache {
-	return &evictionRequestsCache{
-		requests:                     make(map[string]evictionRequestItem),
-		requestsPerNode:              make(map[string]uint),
-		requestsPerNamespace:         make(map[string]uint),
-		assumedRequestTimeoutSeconds: assumedRequestTimeoutSeconds,
-	}
-}
-
-func (erc *evictionRequestsCache) run(ctx context.Context) {
-	wait.UntilWithContext(ctx, erc.cleanCache, evictionRequestsCacheResyncPeriod)
-}
-
-// cleanCache removes all assumed entries that has not been confirmed
-// for more than a specified timeout
-func (erc *evictionRequestsCache) cleanCache(ctx context.Context) {
-	erc.mu.Lock()
-	defer erc.mu.Unlock()
-	klog.V(4).Infof("Cleaning cache of assumed eviction requests in background")
-	for uid, item := range erc.requests {
-		if item.evictionAssumed {
-			requestAgeSeconds := uint(metav1.Now().Sub(item.assumedTimestamp.Local()).Seconds())
-			if requestAgeSeconds > erc.assumedRequestTimeoutSeconds {
-				klog.V(4).InfoS("Assumed eviction request in background timed out, deleting", "timeout", erc.assumedRequestTimeoutSeconds, "podNamespace", item.podNamespace, "podName", item.podName)
-				erc.deleteItem(uid)
-			}
-		}
-	}
-}
-
-func (erc *evictionRequestsCache) evictionRequestsPerNode(nodeName string) uint {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	return erc.requestsPerNode[nodeName]
-}
-
-func (erc *evictionRequestsCache) evictionRequestsPerNamespace(ns string) uint {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	return erc.requestsPerNamespace[ns]
-}
-
-func (erc *evictionRequestsCache) evictionRequestsTotal() uint {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	return erc.requestsTotal
-}
-
-func (erc *evictionRequestsCache) TotalEvictionRequests() uint {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	return uint(len(erc.requests))
-}
-
-// getPodKey returns the string key of a pod.
-func getPodKey(pod *v1.Pod) string {
-	uid := string(pod.UID)
-	// Every pod is expected to have the UID set.
-	// When the descheduling framework is used for simulation
-	// user created workload may forget to set the UID.
-	if len(uid) == 0 {
-		panic(fmt.Errorf("cannot get cache key for %v/%v pod with empty UID", pod.Namespace, pod.Name))
-	}
-	return uid
-}
-
-func (erc *evictionRequestsCache) addPod(pod *v1.Pod) {
-	erc.mu.Lock()
-	defer erc.mu.Unlock()
-	uid := getPodKey(pod)
-	if _, exists := erc.requests[uid]; exists {
-		return
-	}
-	erc.requests[uid] = evictionRequestItem{podNamespace: pod.Namespace, podName: pod.Name, podNodeName: pod.Spec.NodeName}
-	erc.requestsPerNode[pod.Spec.NodeName]++
-	erc.requestsPerNamespace[pod.Namespace]++
-	erc.requestsTotal++
-}
-
-func (erc *evictionRequestsCache) assumePod(pod *v1.Pod, profileName, strategyName string) {
-	erc.mu.Lock()
-	defer erc.mu.Unlock()
-	uid := getPodKey(pod)
-	if item, exists := erc.requests[uid]; exists {
-		if item.evictionAssumed {
-			// Pod already assumed by a previous strategy/profile; first one wins.
-			return
-		}
-		// The informer's UpdateFunc called addPod (evictionAssumed=false) before
-		// the TooManyRequests response arrived. Upgrade the entry in place without
-		// bumping the counters a second time.
-		erc.requests[uid] = evictionRequestItem{
-			podNamespace:     item.podNamespace,
-			podName:          item.podName,
-			podNodeName:      item.podNodeName,
-			strategyName:     strategyName,
-			profileName:      profileName,
-			evictionAssumed:  true,
-			assumedTimestamp: metav1.NewTime(time.Now()),
-		}
-		return
-	}
-	erc.requests[uid] = evictionRequestItem{
-		podNamespace:     pod.Namespace,
-		podName:          pod.Name,
-		podNodeName:      pod.Spec.NodeName,
-		strategyName:     strategyName,
-		profileName:      profileName,
-		evictionAssumed:  true,
-		assumedTimestamp: metav1.NewTime(time.Now()),
-	}
-	erc.requestsPerNode[pod.Spec.NodeName]++
-	erc.requestsPerNamespace[pod.Namespace]++
-	erc.requestsTotal++
-}
-
-// no locking, expected to be invoked from protected methods only
-func (erc *evictionRequestsCache) deleteItem(uid string) {
-	erc.requestsPerNode[erc.requests[uid].podNodeName]--
-	if erc.requestsPerNode[erc.requests[uid].podNodeName] == 0 {
-		delete(erc.requestsPerNode, erc.requests[uid].podNodeName)
-	}
-	erc.requestsPerNamespace[erc.requests[uid].podNamespace]--
-	if erc.requestsPerNamespace[erc.requests[uid].podNamespace] == 0 {
-		delete(erc.requestsPerNamespace, erc.requests[uid].podNamespace)
-	}
-	erc.requestsTotal--
-	delete(erc.requests, uid)
-}
-
-func (erc *evictionRequestsCache) deletePod(pod *v1.Pod) {
-	erc.mu.Lock()
-	defer erc.mu.Unlock()
-	uid := getPodKey(pod)
-	if _, exists := erc.requests[uid]; exists {
-		erc.deleteItem(uid)
-	}
-}
-
-func (erc *evictionRequestsCache) getPod(pod *v1.Pod) (evictionRequestItem, bool) {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	uid := getPodKey(pod)
-	item, exists := erc.requests[uid]
-	return item, exists
-}
-
-func (erc *evictionRequestsCache) hasPod(pod *v1.Pod) bool {
-	erc.mu.RLock()
-	defer erc.mu.RUnlock()
-	uid := getPodKey(pod)
-	_, exists := erc.requests[uid]
-	return exists
-}
-
-var (
-	EvictionRequestAnnotationKey    = "descheduler.alpha.kubernetes.io/request-evict-only"
-	EvictionInProgressAnnotationKey = "descheduler.alpha.kubernetes.io/eviction-in-progress"
-	EvictionInBackgroundErrorText   = "Eviction triggered evacuation"
-)
-
 // nodePodEvictedCount keeps count of pods evicted on node
 type (
 	nodePodEvictedCount    map[string]uint
@@ -239,190 +43,54 @@ type (
 )
 
 type PodEvictor struct {
-	mu                               sync.RWMutex
-	client                           clientset.Interface
-	policyGroupVersion               string
-	dryRun                           bool
-	evictionFailureEventNotification bool
-	maxPodsToEvictPerNode            *uint
-	maxPodsToEvictPerNamespace       *uint
-	maxPodsToEvictTotal              *uint
-	gracePeriodSeconds               *int64
-	nodePodCount                     nodePodEvictedCount
-	namespacePodCount                namespacePodEvictCount
-	totalPodCount                    uint
-	metricsEnabled                   bool
-	eventRecorder                    events.EventRecorder
-	erCache                          *evictionRequestsCache
-	featureGates                     featuregate.FeatureGate
-
-	// registeredHandlers contains the registrations of all handlers. It's used to check if all handlers have finished syncing before the scheduling cycles start.
-	registeredHandlers []cache.ResourceEventHandlerRegistration
+	mu                         sync.Mutex
+	client                     clientset.Interface
+	policyGroupVersion         string
+	dryRun                     bool
+	maxPodsToEvictPerNode      *uint
+	maxPodsToEvictPerNamespace *uint
+	maxPodsToEvictTotal        *uint
+	nodePodCount               nodePodEvictedCount
+	namespacePodCount          namespacePodEvictCount
+	totalPodCount              uint
+	metricsEnabled             bool
+	eventRecorder              events.EventRecorder
 }
 
 func NewPodEvictor(
-	ctx context.Context,
 	client clientset.Interface,
 	eventRecorder events.EventRecorder,
-	podInformer cache.SharedIndexInformer,
-	featureGates featuregate.FeatureGate,
 	options *Options,
-) (*PodEvictor, error) {
+) *PodEvictor {
 	if options == nil {
 		options = NewOptions()
 	}
 
-	podEvictor := &PodEvictor{
-		client:                           client,
-		eventRecorder:                    eventRecorder,
-		policyGroupVersion:               options.policyGroupVersion,
-		dryRun:                           options.dryRun,
-		evictionFailureEventNotification: options.evictionFailureEventNotification,
-		maxPodsToEvictPerNode:            options.maxPodsToEvictPerNode,
-		maxPodsToEvictPerNamespace:       options.maxPodsToEvictPerNamespace,
-		maxPodsToEvictTotal:              options.maxPodsToEvictTotal,
-		gracePeriodSeconds:               options.gracePeriodSeconds,
-		metricsEnabled:                   options.metricsEnabled,
-		nodePodCount:                     make(nodePodEvictedCount),
-		namespacePodCount:                make(namespacePodEvictCount),
-		featureGates:                     featureGates,
+	return &PodEvictor{
+		client:                     client,
+		eventRecorder:              eventRecorder,
+		policyGroupVersion:         options.policyGroupVersion,
+		dryRun:                     options.dryRun,
+		maxPodsToEvictPerNode:      options.maxPodsToEvictPerNode,
+		maxPodsToEvictPerNamespace: options.maxPodsToEvictPerNamespace,
+		maxPodsToEvictTotal:        options.maxPodsToEvictTotal,
+		metricsEnabled:             options.metricsEnabled,
+		nodePodCount:               make(nodePodEvictedCount),
+		namespacePodCount:          make(namespacePodEvictCount),
 	}
-
-	if featureGates.Enabled(features.EvictionsInBackground) {
-		erCache := newEvictionRequestsCache(assumedEvictionRequestTimeoutSeconds)
-
-		handlerRegistration, err := podInformer.AddEventHandler(
-			cache.ResourceEventHandlerFuncs{
-				AddFunc: func(obj interface{}) {
-					pod, ok := obj.(*v1.Pod)
-					if !ok {
-						klog.ErrorS(nil, "Cannot convert to *v1.Pod", "obj", obj)
-						return
-					}
-					if _, exists := pod.Annotations[EvictionRequestAnnotationKey]; exists {
-						if _, exists := pod.Annotations[EvictionInProgressAnnotationKey]; exists {
-							// Ignore completed/suceeeded or failed pods
-							if pod.Status.Phase != v1.PodSucceeded && pod.Status.Phase != v1.PodFailed {
-								klog.V(3).InfoS("Eviction in background detected. Adding pod to the cache.", "pod", klog.KObj(pod))
-								erCache.addPod(pod)
-							}
-						}
-					}
-				},
-				UpdateFunc: func(oldObj, newObj interface{}) {
-					oldPod, ok := oldObj.(*v1.Pod)
-					if !ok {
-						klog.ErrorS(nil, "Cannot convert oldObj to *v1.Pod", "oldObj", oldObj)
-						return
-					}
-					newPod, ok := newObj.(*v1.Pod)
-					if !ok {
-						klog.ErrorS(nil, "Cannot convert newObj to *v1.Pod", "newObj", newObj)
-						return
-					}
-					// Ignore pod's that are not subject to an eviction in background
-					if _, exists := newPod.Annotations[EvictionRequestAnnotationKey]; !exists {
-						if erCache.hasPod(newPod) {
-							klog.V(3).InfoS("Pod with eviction in background lost annotation. Removing pod from the cache.", "pod", klog.KObj(newPod))
-						}
-						erCache.deletePod(newPod)
-						return
-					}
-					// Remove completed/suceeeded or failed pods from the cache
-					if newPod.Status.Phase == v1.PodSucceeded || newPod.Status.Phase == v1.PodFailed {
-						klog.V(3).InfoS("Pod with eviction in background completed. Removing pod from the cache.", "pod", klog.KObj(newPod))
-						erCache.deletePod(newPod)
-						return
-					}
-					// Ignore any pod that does not have eviction in progress
-					if _, exists := newPod.Annotations[EvictionInProgressAnnotationKey]; !exists {
-						// In case EvictionInProgressAnnotationKey annotation is not present/removed
-						// it's unclear whether the eviction was restarted or terminated.
-						// If the eviction gets restarted the pod needs to be removed from the cache
-						// to allow re-triggering the eviction.
-						if _, exists := oldPod.Annotations[EvictionInProgressAnnotationKey]; !exists {
-							return
-						}
-						// the annotation was removed -> remove the pod from the cache to allow to
-						// request for eviction again. In case the eviction got restarted requesting
-						// the eviction again is expected to be a no-op. In case the eviction
-						// got terminated with no-retry, requesting a new eviction is a normal
-						// operation.
-						klog.V(3).InfoS("Eviction in background canceled (annotation removed). Removing pod from the cache.", "annotation", EvictionInProgressAnnotationKey, "pod", klog.KObj(newPod))
-						erCache.deletePod(newPod)
-						return
-					}
-					// Pick up the eviction in progress
-					if !erCache.hasPod(newPod) {
-						klog.V(3).InfoS("Eviction in background detected. Updating the cache.", "pod", klog.KObj(newPod))
-					}
-					erCache.addPod(newPod)
-				},
-				DeleteFunc: func(obj interface{}) {
-					var pod *v1.Pod
-					switch t := obj.(type) {
-					case *v1.Pod:
-						pod = t
-					case cache.DeletedFinalStateUnknown:
-						var ok bool
-						pod, ok = t.Obj.(*v1.Pod)
-						if !ok {
-							klog.ErrorS(nil, "Cannot convert to *v1.Pod", "obj", t.Obj)
-							return
-						}
-					default:
-						klog.ErrorS(nil, "Cannot convert to *v1.Pod", "obj", t)
-						return
-					}
-					if item, exists := erCache.getPod(pod); exists {
-						klog.V(3).InfoS("Pod with eviction in background deleted/evicted. Removing pod from the cache.", "pod", klog.KObj(pod))
-						if item.evictionAssumed && podEvictor.metricsEnabled {
-							metrics.PodsEvicted.With(map[string]string{"result": "success", "strategy": item.strategyName, "namespace": item.podNamespace, "node": item.podNodeName, "profile": item.profileName}).Inc()
-							metrics.PodsEvictedTotal.With(map[string]string{"result": "success", "strategy": item.strategyName, "namespace": item.podNamespace, "node": item.podNodeName, "profile": item.profileName}).Inc()
-						}
-					}
-					erCache.deletePod(pod)
-				},
-			},
-		)
-		if err != nil {
-			return nil, fmt.Errorf("unable to register event handler for pod evictor: %v", err)
-		}
-
-		podEvictor.registeredHandlers = append(podEvictor.registeredHandlers, handlerRegistration)
-
-		go erCache.run(ctx)
-
-		podEvictor.erCache = erCache
-	}
-
-	return podEvictor, nil
-}
-
-// WaitForEventHandlersSync waits for EventHandlers to sync.
-// It returns true if it was successful, false if the controller should shut down
-func (pe *PodEvictor) WaitForEventHandlersSync(ctx context.Context) error {
-	return wait.PollUntilContextCancel(ctx, syncedPollPeriod, true, func(ctx context.Context) (done bool, err error) {
-		for _, handler := range pe.registeredHandlers {
-			if !handler.HasSynced() {
-				return false, nil
-			}
-		}
-		return true, nil
-	})
 }
 
 // NodeEvicted gives a number of pods evicted for node
 func (pe *PodEvictor) NodeEvicted(node *v1.Node) uint {
-	pe.mu.RLock()
-	defer pe.mu.RUnlock()
+	pe.mu.Lock()
+	defer pe.mu.Unlock()
 	return pe.nodePodCount[node.Name]
 }
 
 // TotalEvicted gives a number of pods evicted through all nodes
 func (pe *PodEvictor) TotalEvicted() uint {
-	pe.mu.RLock()
-	defer pe.mu.RUnlock()
+	pe.mu.Lock()
+	defer pe.mu.Unlock()
 	return pe.totalPodCount
 }
 
@@ -434,44 +102,10 @@ func (pe *PodEvictor) ResetCounters() {
 	pe.totalPodCount = 0
 }
 
-func (pe *PodEvictor) evictionRequestsTotal() uint {
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		return pe.erCache.evictionRequestsTotal()
-	} else {
-		return 0
-	}
-}
-
-func (pe *PodEvictor) evictionRequestsPerNode(node string) uint {
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		return pe.erCache.evictionRequestsPerNode(node)
-	} else {
-		return 0
-	}
-}
-
-func (pe *PodEvictor) evictionRequestsPerNamespace(ns string) uint {
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		return pe.erCache.evictionRequestsPerNamespace(ns)
-	} else {
-		return 0
-	}
-}
-
-func (pe *PodEvictor) EvictionRequests(node *v1.Node) uint {
-	pe.mu.RLock()
-	defer pe.mu.RUnlock()
-	return pe.evictionRequestsTotal()
-}
-
-func (pe *PodEvictor) TotalEvictionRequests() uint {
-	pe.mu.RLock()
-	defer pe.mu.RUnlock()
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		return pe.erCache.TotalEvictionRequests()
-	} else {
-		return 0
-	}
+func (pe *PodEvictor) SetClient(client clientset.Interface) {
+	pe.mu.Lock()
+	defer pe.mu.Unlock()
+	pe.client = client
 }
 
 // EvictOptions provides a handle for passing additional info to EvictPod
@@ -487,91 +121,55 @@ type EvictOptions struct {
 // 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) error {
-	if len(pod.UID) == 0 {
-		klog.InfoS("Ignoring pod eviction due to missing UID", "pod", pod)
-		return fmt.Errorf("pod %v is missing UID", klog.KObj(pod))
-	}
-
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		// eviction in background requested
-		if _, exists := pod.Annotations[EvictionRequestAnnotationKey]; exists {
-			if pe.erCache.hasPod(pod) {
-				klog.V(3).InfoS("Eviction in background already requested (ignoring)", "pod", klog.KObj(pod))
-				return nil
-			}
-		}
-	}
-
 	pe.mu.Lock()
 	defer pe.mu.Unlock()
-
 	var span trace.Span
 	ctx, span = tracing.Tracer().Start(ctx, "EvictPod", trace.WithAttributes(attribute.String("podName", pod.Name), attribute.String("podNamespace", pod.Namespace), attribute.String("reason", opts.Reason), attribute.String("operation", tracing.EvictOperation)))
 	defer span.End()
 
-	if pe.maxPodsToEvictTotal != nil && pe.totalPodCount+pe.evictionRequestsTotal()+1 > *pe.maxPodsToEvictTotal {
+	if pe.maxPodsToEvictTotal != nil && pe.totalPodCount+1 > *pe.maxPodsToEvictTotal {
 		err := NewEvictionTotalLimitError()
 		if pe.metricsEnabled {
 			metrics.PodsEvicted.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-			metrics.PodsEvictedTotal.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
 		}
 		span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", err.Error())))
 		klog.ErrorS(err, "Error evicting pod", "limit", *pe.maxPodsToEvictTotal)
-		if pe.evictionFailureEventNotification {
-			pe.eventRecorder.Eventf(pod, nil, v1.EventTypeWarning, "EvictionFailed", "Descheduled", "pod eviction from %v node by sigs.k8s.io/descheduler failed: total eviction limit exceeded (%v)", pod.Spec.NodeName, *pe.maxPodsToEvictTotal)
-		}
 		return err
 	}
 
 	if pod.Spec.NodeName != "" {
-		if pe.maxPodsToEvictPerNode != nil && pe.nodePodCount[pod.Spec.NodeName]+pe.evictionRequestsPerNode(pod.Spec.NodeName)+1 > *pe.maxPodsToEvictPerNode {
+		if pe.maxPodsToEvictPerNode != nil && pe.nodePodCount[pod.Spec.NodeName]+1 > *pe.maxPodsToEvictPerNode {
 			err := NewEvictionNodeLimitError(pod.Spec.NodeName)
 			if pe.metricsEnabled {
 				metrics.PodsEvicted.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-				metrics.PodsEvictedTotal.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
 			}
 			span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", err.Error())))
 			klog.ErrorS(err, "Error evicting pod", "limit", *pe.maxPodsToEvictPerNode, "node", pod.Spec.NodeName)
-			if pe.evictionFailureEventNotification {
-				pe.eventRecorder.Eventf(pod, nil, v1.EventTypeWarning, "EvictionFailed", "Descheduled", "pod eviction from %v node by sigs.k8s.io/descheduler failed: node eviction limit exceeded (%v)", pod.Spec.NodeName, *pe.maxPodsToEvictPerNode)
-			}
 			return err
 		}
 	}
 
-	if pe.maxPodsToEvictPerNamespace != nil && pe.namespacePodCount[pod.Namespace]+pe.evictionRequestsPerNamespace(pod.Namespace)+1 > *pe.maxPodsToEvictPerNamespace {
+	if pe.maxPodsToEvictPerNamespace != nil && pe.namespacePodCount[pod.Namespace]+1 > *pe.maxPodsToEvictPerNamespace {
 		err := NewEvictionNamespaceLimitError(pod.Namespace)
 		if pe.metricsEnabled {
 			metrics.PodsEvicted.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-			metrics.PodsEvictedTotal.With(map[string]string{"result": err.Error(), "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
 		}
 		span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", err.Error())))
-		klog.ErrorS(err, "Error evicting pod", "limit", *pe.maxPodsToEvictPerNamespace, "namespace", pod.Namespace, "pod", klog.KObj(pod))
-		if pe.evictionFailureEventNotification {
-			pe.eventRecorder.Eventf(pod, nil, v1.EventTypeWarning, "EvictionFailed", "Descheduled", "pod eviction from %v node by sigs.k8s.io/descheduler failed: namespace eviction limit exceeded (%v)", pod.Spec.NodeName, *pe.maxPodsToEvictPerNamespace)
-		}
+		klog.ErrorS(err, "Error evicting pod", "limit", *pe.maxPodsToEvictPerNamespace, "namespace", pod.Namespace)
 		return err
 	}
 
-	ignore, err := pe.evictPod(ctx, pod, opts)
+	err := evictPod(ctx, pe.client, pod, pe.policyGroupVersion)
 	if err != nil {
 		// err is used only for logging purposes
 		span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", err.Error())))
 		klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod), "reason", opts.Reason)
 		if pe.metricsEnabled {
 			metrics.PodsEvicted.With(map[string]string{"result": "error", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-			metrics.PodsEvictedTotal.With(map[string]string{"result": "error", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-		}
-		if pe.evictionFailureEventNotification {
-			pe.eventRecorder.Eventf(pod, nil, v1.EventTypeWarning, "EvictionFailed", "Descheduled", "pod eviction from %v node by sigs.k8s.io/descheduler failed: %v", pod.Spec.NodeName, err.Error())
 		}
 		return err
 	}
 
-	if ignore {
-		return nil
-	}
-
 	if pod.Spec.NodeName != "" {
 		pe.nodePodCount[pod.Spec.NodeName]++
 	}
@@ -580,7 +178,6 @@ func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptio
 
 	if pe.metricsEnabled {
 		metrics.PodsEvicted.With(map[string]string{"result": "success", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-		metrics.PodsEvictedTotal.With(map[string]string{"result": "success", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
 	}
 
 	if pe.dryRun {
@@ -594,66 +191,32 @@ func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptio
 				reason = "NotSet"
 			}
 		}
-		pe.eventRecorder.Eventf(pod, nil, v1.EventTypeNormal, reason, "Descheduled", "pod eviction from %v node by sigs.k8s.io/descheduler", pod.Spec.NodeName)
+		pe.eventRecorder.Eventf(pod, nil, v1.EventTypeNormal, reason, "Descheduled", "pod evicted from %v node by sigs.k8s.io/descheduler", pod.Spec.NodeName)
 	}
 	return nil
 }
 
-// return (ignore, err)
-func (pe *PodEvictor) evictPod(ctx context.Context, pod *v1.Pod, opts EvictOptions) (bool, error) {
-	deleteOptions := &metav1.DeleteOptions{
-		GracePeriodSeconds: pe.gracePeriodSeconds,
-	}
+func evictPod(ctx context.Context, client clientset.Interface, pod *v1.Pod, policyGroupVersion string) error {
+	deleteOptions := &metav1.DeleteOptions{}
 	// GracePeriodSeconds ?
 	eviction := &policy.Eviction{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: pe.policyGroupVersion,
+			APIVersion: policyGroupVersion,
 			Kind:       eutils.EvictionKind,
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      pod.Name,
 			Namespace: pod.Namespace,
-			Annotations: map[string]string{
-				"reason":       fmt.Sprintf("triggered by %v/%v: %v", opts.ProfileName, opts.StrategyName, opts.Reason),
-				"requested-by": deschedulerGlobalName,
-			},
 		},
 		DeleteOptions: deleteOptions,
 	}
-	err := pe.client.PolicyV1().Evictions(eviction.Namespace).Evict(ctx, eviction)
-	if err == nil {
-		return false, nil
-	}
-	if pe.featureGates.Enabled(features.EvictionsInBackground) {
-		// eviction in background requested
-		if _, exists := pod.Annotations[EvictionRequestAnnotationKey]; exists {
-			// Simulating https://github.com/kubevirt/kubevirt/pull/11532/files#diff-059cc1fc09e8b469143348cc3aa80b40de987670e008fa18a6fe010061f973c9R77
-			if apierrors.IsTooManyRequests(err) && strings.Contains(err.Error(), EvictionInBackgroundErrorText) {
-				// Ignore eviction of any pod that's failed or completed.
-				// It can happen an eviction in background ends up with the pod stuck in the completed state.
-				// Normally, any request eviction is expected to end with the pod deletion.
-				// However, some custom eviction policies may end up with completed pods around.
-				// Which leads to all the completed pods to be considered still as unfinished evictions in background.
-				if pod.Status.Phase == v1.PodSucceeded || pod.Status.Phase == v1.PodFailed {
-					klog.V(3).InfoS("Ignoring eviction of a completed/failed pod", "pod", klog.KObj(pod))
-					return true, nil
-				}
-				klog.V(3).InfoS("Eviction in background assumed", "pod", klog.KObj(pod))
-				pe.erCache.assumePod(pod, opts.ProfileName, opts.StrategyName)
-				if pe.metricsEnabled {
-					metrics.PodsEvicted.With(map[string]string{"result": "background", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-					metrics.PodsEvictedTotal.With(map[string]string{"result": "background", "strategy": opts.StrategyName, "namespace": pod.Namespace, "node": pod.Spec.NodeName, "profile": opts.ProfileName}).Inc()
-				}
-				return true, nil
-			}
-		}
-	}
+	err := client.PolicyV1().Evictions(eviction.Namespace).Evict(ctx, eviction)
 
 	if apierrors.IsTooManyRequests(err) {
-		return false, fmt.Errorf("error when evicting pod (ignoring) %q: %v", pod.Name, err)
+		return fmt.Errorf("error when evicting pod (ignoring) %q: %v", pod.Name, err)
 	}
 	if apierrors.IsNotFound(err) {
-		return false, fmt.Errorf("pod not found when evicting %q: %v", pod.Name, err)
+		return fmt.Errorf("pod not found when evicting %q: %v", pod.Name, err)
 	}
-	return false, err
+	return err
 }

pkg/descheduler/evictions/evictions_test.go

@@ -18,110 +18,57 @@ package evictions
 
 import (
 	"context"
-	"fmt"
-	"reflect"
-	"strings"
 	"testing"
-	"time"
 
 	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/informers"
-	fakeclientset "k8s.io/client-go/kubernetes/fake"
+	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/events"
-	"k8s.io/component-base/featuregate"
-	"k8s.io/klog/v2"
 	utilptr "k8s.io/utils/ptr"
-
-	metricstest "k8s.io/component-base/metrics/testutil"
-
-	deschedulermetrics "sigs.k8s.io/descheduler/metrics"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/features"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
 
-const (
-	notFoundText    = "pod not found when evicting \"%s\": pods \"%s\" not found"
-	tooManyRequests = "error when evicting pod (ignoring) \"%s\": Too many requests: too many requests"
-)
-
-func initFeatureGates() featuregate.FeatureGate {
-	featureGates := featuregate.NewFeatureGate()
-	featureGates.Add(map[featuregate.Feature]featuregate.FeatureSpec{
-		features.EvictionsInBackground: {Default: true, PreRelease: featuregate.Alpha},
-	})
-	return featureGates
-}
-
 func TestEvictPod(t *testing.T) {
+	ctx := context.Background()
 	node1 := test.BuildTestNode("node1", 1000, 2000, 9, nil)
 	pod1 := test.BuildTestPod("p1", 400, 0, "node1", nil)
 	tests := []struct {
 		description string
 		node        *v1.Node
-		evictedPod  *v1.Pod
-		pods        []runtime.Object
-		wantErr     error
+		pod         *v1.Pod
+		pods        []v1.Pod
+		want        error
 	}{
 		{
 			description: "test pod eviction - pod present",
 			node:        node1,
-			evictedPod:  pod1,
-			pods:        []runtime.Object{pod1},
+			pod:         pod1,
+			pods:        []v1.Pod{*pod1},
+			want:        nil,
 		},
 		{
-			description: "test pod eviction - pod absent (not found error)",
+			description: "test pod eviction - pod absent",
 			node:        node1,
-			evictedPod:  pod1,
-			pods:        []runtime.Object{test.BuildTestPod("p2", 400, 0, "node1", nil), test.BuildTestPod("p3", 450, 0, "node1", nil)},
-			wantErr:     fmt.Errorf(notFoundText, pod1.Name, pod1.Name),
-		},
-		{
-			description: "test pod eviction - pod absent (too many requests error)",
-			node:        node1,
-			evictedPod:  pod1,
-			pods:        []runtime.Object{test.BuildTestPod("p2", 400, 0, "node1", nil), test.BuildTestPod("p3", 450, 0, "node1", nil)},
-			wantErr:     fmt.Errorf(tooManyRequests, pod1.Name),
+			pod:         pod1,
+			pods:        []v1.Pod{*test.BuildTestPod("p2", 400, 0, "node1", nil), *test.BuildTestPod("p3", 450, 0, "node1", nil)},
+			want:        nil,
 		},
 	}
 
 	for _, test := range tests {
-		t.Run(test.description, func(t *testing.T) {
-			ctx := context.Background()
-			fakeClient := fakeclientset.NewClientset(test.pods...)
-			fakeClient.PrependReactor("create", "pods/eviction", func(action core.Action) (handled bool, ret runtime.Object, err error) {
-				return true, nil, test.wantErr
-			})
-			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			sharedInformerFactory.Start(ctx.Done())
-			sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
-			eventRecorder := &events.FakeRecorder{}
-			podEvictor, err := NewPodEvictor(
-				ctx,
-				fakeClient,
-				eventRecorder,
-				sharedInformerFactory.Core().V1().Pods().Informer(),
-				initFeatureGates(),
-				NewOptions(),
-			)
-			if err != nil {
-				t.Fatalf("Unexpected error when creating a pod evictor: %v", err)
-			}
-
-			_, got := podEvictor.evictPod(ctx, test.evictedPod, EvictOptions{})
-			if got != test.wantErr {
-				t.Errorf("Test error for Desc: %s. Expected %v pod eviction to be %v, got %v", test.description, test.evictedPod.Name, test.wantErr, got)
-			}
+		fakeClient := &fake.Clientset{}
+		fakeClient.Fake.AddReactor("list", "pods", func(action core.Action) (bool, runtime.Object, error) {
+			return true, &v1.PodList{Items: test.pods}, nil
 		})
+		got := evictPod(ctx, fakeClient, test.pod, "v1")
+		if got != test.want {
+			t.Errorf("Test error for Desc: %s. Expected %v pod eviction to be %v, got %v", test.description, test.pod.Name, test.want, got)
+		}
 	}
 }
 
@@ -171,538 +118,50 @@ func TestPodTypes(t *testing.T) {
 }
 
 func TestNewPodEvictor(t *testing.T) {
-	ctx := context.Background()
-
 	pod1 := test.BuildTestPod("pod", 400, 0, "node", nil)
-	type podEvictorTest struct {
-		description                      string
-		pod                              *v1.Pod
-		dryRun                           bool
-		evictionFailureEventNotification *bool
-		maxPodsToEvictTotal              *uint
-		maxPodsToEvictPerNode            *uint
-		maxPodsToEvictPerNamespace       *uint
-		expectedNodeEvictions            uint
-		expectedTotalEvictions           uint
-		expectedError                    error
-		// expectedEvent is a slice of strings representing expected events.
-		// Each string in the slice should follow the format: "EventType Reason Message".
-		// - "Warning Failed processing failed"
-		events []string
-	}
-	tests := []podEvictorTest{
-		{
-			description:                      "one eviction expected with eviction failure event notification",
-			pod:                              pod1,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](1),
-			maxPodsToEvictPerNode:            utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](1),
-			expectedNodeEvictions:            1,
-			expectedTotalEvictions:           1,
-			expectedError:                    nil,
-			events:                           []string{"Normal NotSet pod eviction from node node by sigs.k8s.io/descheduler"},
-		},
-		{
-			description:                      "eviction limit exceeded on total with eviction failure event notification",
-			pod:                              pod1,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](0),
-			maxPodsToEvictPerNode:            utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](1),
-			expectedNodeEvictions:            0,
-			expectedTotalEvictions:           0,
-			expectedError:                    NewEvictionTotalLimitError(),
-			events:                           []string{"Warning EvictionFailed pod eviction from node node by sigs.k8s.io/descheduler failed: total eviction limit exceeded (0)"},
-		},
-		{
-			description:                      "eviction limit exceeded on node with eviction failure event notification",
-			pod:                              pod1,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](1),
-			maxPodsToEvictPerNode:            utilptr.To[uint](0),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](1),
-			expectedNodeEvictions:            0,
-			expectedTotalEvictions:           0,
-			expectedError:                    NewEvictionNodeLimitError("node"),
-			events:                           []string{"Warning EvictionFailed pod eviction from node node by sigs.k8s.io/descheduler failed: node eviction limit exceeded (0)"},
-		},
-		{
-			description:                      "eviction limit exceeded on node with eviction failure event notification",
-			pod:                              pod1,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](1),
-			maxPodsToEvictPerNode:            utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](0),
-			expectedNodeEvictions:            0,
-			expectedTotalEvictions:           0,
-			expectedError:                    NewEvictionNamespaceLimitError("default"),
-			events:                           []string{"Warning EvictionFailed pod eviction from node node by sigs.k8s.io/descheduler failed: namespace eviction limit exceeded (0)"},
-		},
-		{
-			description:                      "eviction error with eviction failure event notification",
-			pod:                              pod1,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](1),
-			maxPodsToEvictPerNode:            utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](1),
-			expectedNodeEvictions:            0,
-			expectedTotalEvictions:           0,
-			expectedError:                    fmt.Errorf("eviction error"),
-			events:                           []string{"Warning EvictionFailed pod eviction from node node by sigs.k8s.io/descheduler failed: eviction error"},
-		},
-		{
-			description:                      "eviction with dryRun with eviction failure event notification",
-			pod:                              pod1,
-			dryRun:                           true,
-			evictionFailureEventNotification: utilptr.To[bool](true),
-			maxPodsToEvictTotal:              utilptr.To[uint](1),
-			maxPodsToEvictPerNode:            utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace:       utilptr.To[uint](1),
-			expectedNodeEvictions:            1,
-			expectedTotalEvictions:           1,
-			expectedError:                    nil,
-		},
-		{
-			description:                "one eviction expected without eviction failure event notification",
-			pod:                        pod1,
-			maxPodsToEvictTotal:        utilptr.To[uint](1),
-			maxPodsToEvictPerNode:      utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](1),
-			expectedNodeEvictions:      1,
-			expectedTotalEvictions:     1,
-			expectedError:              nil,
-			events:                     []string{"Normal NotSet pod eviction from node node by sigs.k8s.io/descheduler"},
-		},
-		{
-			description:                "eviction limit exceeded on total without eviction failure event notification",
-			pod:                        pod1,
-			maxPodsToEvictTotal:        utilptr.To[uint](0),
-			maxPodsToEvictPerNode:      utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](1),
-			expectedNodeEvictions:      0,
-			expectedTotalEvictions:     0,
-			expectedError:              NewEvictionTotalLimitError(),
-		},
-		{
-			description:                "eviction limit exceeded on node without eviction failure event notification",
-			pod:                        pod1,
-			maxPodsToEvictTotal:        utilptr.To[uint](1),
-			maxPodsToEvictPerNode:      utilptr.To[uint](0),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](1),
-			expectedNodeEvictions:      0,
-			expectedTotalEvictions:     0,
-			expectedError:              NewEvictionNodeLimitError("node"),
-		},
-		{
-			description:                "eviction limit exceeded on node without eviction failure event notification",
-			pod:                        pod1,
-			maxPodsToEvictTotal:        utilptr.To[uint](1),
-			maxPodsToEvictPerNode:      utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](0),
-			expectedNodeEvictions:      0,
-			expectedTotalEvictions:     0,
-			expectedError:              NewEvictionNamespaceLimitError("default"),
-		},
-		{
-			description:                "eviction error without eviction failure event notification",
-			pod:                        pod1,
-			maxPodsToEvictTotal:        utilptr.To[uint](1),
-			maxPodsToEvictPerNode:      utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](1),
-			expectedNodeEvictions:      0,
-			expectedTotalEvictions:     0,
-			expectedError:              fmt.Errorf("eviction error"),
-		},
-		{
-			description:                "eviction without dryRun with eviction failure event notification",
-			pod:                        pod1,
-			dryRun:                     true,
-			maxPodsToEvictTotal:        utilptr.To[uint](1),
-			maxPodsToEvictPerNode:      utilptr.To[uint](1),
-			maxPodsToEvictPerNamespace: utilptr.To[uint](1),
-			expectedNodeEvictions:      1,
-			expectedTotalEvictions:     1,
-			expectedError:              nil,
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.description, func(t *testing.T) {
-			fakeClient := fakeclientset.NewSimpleClientset(pod1)
-			fakeClient.PrependReactor("create", "pods/eviction", func(action core.Action) (handled bool, ret runtime.Object, err error) {
-				return true, nil, test.expectedError
-			})
 
-			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			sharedInformerFactory.Start(ctx.Done())
-			sharedInformerFactory.WaitForCacheSync(ctx.Done())
+	fakeClient := fake.NewSimpleClientset(pod1)
 
-			eventRecorder := events.NewFakeRecorder(100)
+	eventRecorder := &events.FakeRecorder{}
 
-			podEvictor, err := NewPodEvictor(
-				ctx,
-				fakeClient,
-				eventRecorder,
-				sharedInformerFactory.Core().V1().Pods().Informer(),
-				initFeatureGates(),
-				NewOptions().
-					WithDryRun(test.dryRun).
-					WithMaxPodsToEvictTotal(test.maxPodsToEvictTotal).
-					WithMaxPodsToEvictPerNode(test.maxPodsToEvictPerNode).
-					WithEvictionFailureEventNotification(test.evictionFailureEventNotification).
-					WithMaxPodsToEvictPerNamespace(test.maxPodsToEvictPerNamespace),
-			)
-			if err != nil {
-				t.Fatalf("Unexpected error when creating a pod evictor: %v", err)
-			}
-
-			stubNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node"}}
-
-			if actualErr := podEvictor.EvictPod(ctx, test.pod, EvictOptions{}); actualErr != nil && actualErr.Error() != test.expectedError.Error() {
-				t.Errorf("Expected error: %v, got: %v", test.expectedError, actualErr)
-			}
-
-			if evictions := podEvictor.NodeEvicted(stubNode); evictions != test.expectedNodeEvictions {
-				t.Errorf("Expected %d node evictions, got %d instead", test.expectedNodeEvictions, evictions)
-			}
-
-			if evictions := podEvictor.TotalEvicted(); evictions != test.expectedTotalEvictions {
-				t.Errorf("Expected %d total evictions, got %d instead", test.expectedTotalEvictions, evictions)
-			}
-
-			// Assert that the events are correct.
-			assertEqualEvents(t, test.events, eventRecorder.Events)
-		})
-	}
-}
-
-func TestEvictionRequestsCacheCleanup(t *testing.T) {
-	ctx := context.Background()
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-
-	ownerRef1 := test.GetReplicaSetOwnerRefList()
-	updatePod := func(pod *v1.Pod) {
-		pod.Namespace = "dev"
-		pod.ObjectMeta.OwnerReferences = ownerRef1
-	}
-	updatePodWithEvictionInBackground := func(pod *v1.Pod) {
-		updatePod(pod)
-		pod.Annotations = map[string]string{
-			EvictionRequestAnnotationKey: "",
-		}
-	}
-
-	p1 := test.BuildTestPod("p1", 100, 0, node1.Name, updatePodWithEvictionInBackground)
-	p2 := test.BuildTestPod("p2", 100, 0, node1.Name, updatePodWithEvictionInBackground)
-	p3 := test.BuildTestPod("p3", 100, 0, node1.Name, updatePod)
-	p4 := test.BuildTestPod("p4", 100, 0, node1.Name, updatePod)
-
-	client := fakeclientset.NewSimpleClientset(node1, p1, p2, p3, p4)
-	sharedInformerFactory := informers.NewSharedInformerFactory(client, 0)
-	_, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, client)
-
-	podEvictor, err := NewPodEvictor(
-		ctx,
-		client,
+	podEvictor := NewPodEvictor(
+		fakeClient,
 		eventRecorder,
-		sharedInformerFactory.Core().V1().Pods().Informer(),
-		initFeatureGates(),
-		nil,
+		NewOptions().WithMaxPodsToEvictPerNode(utilptr.To[uint](1)),
 	)
-	if err != nil {
-		t.Fatalf("Unexpected error when creating a pod evictor: %v", err)
+
+	stubNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node"}}
+
+	// 0 evictions expected
+	if evictions := podEvictor.NodeEvicted(stubNode); evictions != 0 {
+		t.Errorf("Expected 0 node evictions, got %q instead", evictions)
+	}
+	// 0 evictions expected
+	if evictions := podEvictor.TotalEvicted(); evictions != 0 {
+		t.Errorf("Expected 0 total evictions, got %q instead", evictions)
 	}
 
-	client.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 {
-				podName := eviction.GetName()
-				annotations := eviction.GetAnnotations()
-				if (podName == "p1" || podName == "p2") && annotations[requestedByAnnotationKey] == deschedulerGlobalName && strings.HasPrefix(
-					annotations[reasonAnnotationKey],
-					"triggered by",
-				) {
-					return true, nil, &apierrors.StatusError{
-						ErrStatus: metav1.Status{
-							Reason:  metav1.StatusReasonTooManyRequests,
-							Message: "Eviction triggered evacuation",
-						},
-					}
-				}
-				return true, nil, nil
-			}
-		}
-		return false, nil, nil
-	})
-
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
-	podEvictor.EvictPod(ctx, p1, EvictOptions{})
-	podEvictor.EvictPod(ctx, p2, EvictOptions{})
-	podEvictor.EvictPod(ctx, p3, EvictOptions{})
-	podEvictor.EvictPod(ctx, p4, EvictOptions{})
-
-	klog.Infof("2 evictions in background expected, 2 normal evictions")
-	if total := podEvictor.TotalEvictionRequests(); total != 2 {
-		t.Fatalf("Expected %v total eviction requests, got %v instead", 2, total)
-	}
-	if total := podEvictor.TotalEvicted(); total != 2 {
-		t.Fatalf("Expected %v total evictions, got %v instead", 2, total)
+	if err := podEvictor.EvictPod(context.TODO(), pod1, EvictOptions{}); err != nil {
+		t.Errorf("Expected a pod eviction, got an eviction error instead: %v", err)
 	}
 
-	klog.Infof("2 evictions in background assumed. Wait for few seconds and check the assumed requests timed out")
-	time.Sleep(2 * time.Second)
-	klog.Infof("Checking the assumed requests timed out and were deleted")
-	// Set the timeout to 1s so the cleaning can be tested
-	podEvictor.erCache.assumedRequestTimeoutSeconds = 1
-	podEvictor.erCache.cleanCache(ctx)
-	if totalERs := podEvictor.TotalEvictionRequests(); totalERs > 0 {
-		t.Fatalf("Expected 0 eviction requests, got %v instead", totalERs)
+	// 1 node eviction expected
+	if evictions := podEvictor.NodeEvicted(stubNode); evictions != 1 {
+		t.Errorf("Expected 1 node eviction, got %q instead", evictions)
 	}
-}
-
-func TestEvictionInBackgroundMetrics(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), wait.ForeverTestTimeout)
-	defer cancel()
-
-	deschedulermetrics.Register()
-	deschedulermetrics.PodsEvicted.Reset()
-	deschedulermetrics.PodsEvictedTotal.Reset()
-
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-
-	ownerRef1 := test.GetReplicaSetOwnerRefList()
-	updatePod := func(pod *v1.Pod) {
-		pod.Namespace = "dev"
-		pod.ObjectMeta.OwnerReferences = ownerRef1
-	}
-	updatePodWithEvictionAnnotation := func(pod *v1.Pod) {
-		updatePod(pod)
-		pod.Annotations = map[string]string{
-			EvictionRequestAnnotationKey: "",
-		}
-	}
-
-	// p1, p2: will be evicted in background
-	// p3, p4: will be evicted normally
-	p1 := test.BuildTestPod("p1", 100, 0, node1.Name, updatePodWithEvictionAnnotation)
-	p2 := test.BuildTestPod("p2", 100, 0, node1.Name, updatePodWithEvictionAnnotation)
-	p3 := test.BuildTestPod("p3", 100, 0, node1.Name, updatePod)
-	p4 := test.BuildTestPod("p4", 100, 0, node1.Name, updatePod)
-
-	client := fakeclientset.NewSimpleClientset(node1, p1, p2, p3, p4)
-	sharedInformerFactory := informers.NewSharedInformerFactory(client, 0)
-	_, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, client)
-
-	podEvictor, err := NewPodEvictor(
-		ctx,
-		client,
-		eventRecorder,
-		sharedInformerFactory.Core().V1().Pods().Informer(),
-		initFeatureGates(),
-		NewOptions().WithMetricsEnabled(true),
-	)
-	if err != nil {
-		t.Fatalf("Unexpected error when creating a pod evictor: %v", err)
-	}
-
-	client.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 {
-				if eviction.GetName() == "p1" || eviction.GetName() == "p2" {
-					return true, nil, &apierrors.StatusError{
-						ErrStatus: metav1.Status{
-							Reason:  metav1.StatusReasonTooManyRequests,
-							Message: "Eviction triggered evacuation",
-						},
-					}
-				}
-				return true, nil, nil
-			}
-		}
-		return false, nil, nil
-	})
-
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
-	evictOpts := EvictOptions{StrategyName: "TestStrategy", ProfileName: "TestProfile"}
-
-	// Cycle 1: p1/p2 go to background, p3/p4 are evicted normally.
-	podEvictor.EvictPod(ctx, p1, evictOpts)
-	podEvictor.EvictPod(ctx, p2, evictOpts)
-	podEvictor.EvictPod(ctx, p3, evictOpts)
-	podEvictor.EvictPod(ctx, p4, evictOpts)
-
-	// After cycle 1: 2 "background" (p1, p2), 2 "success" (p3, p4).
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "background"}, 2)
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "success"}, 2)
-
-	// Cycle 2: p1/p2 are still running (background eviction in progress).
-	// Re-attempting them must not emit any additional metrics.
-	podEvictor.EvictPod(ctx, p1, evictOpts)
-	podEvictor.EvictPod(ctx, p2, evictOpts)
-
-	// Counts must be unchanged after cycle 2.
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "background"}, 2)
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "success"}, 2)
-
-	// The background evictions complete: p1 and p2 are deleted.
-	// The informer's DeleteFunc fires and emits a "success" metric for each assumed pod.
-	client.CoreV1().Pods(p1.Namespace).Delete(ctx, p1.Name, metav1.DeleteOptions{})
-	client.CoreV1().Pods(p2.Namespace).Delete(ctx, p2.Name, metav1.DeleteOptions{})
-
-	// Poll until DeleteFunc has fired for both pods (informer is async).
-	if err := wait.PollUntilContextTimeout(ctx, 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
-		return !podEvictor.erCache.hasPod(p1) && !podEvictor.erCache.hasPod(p2), nil
-	}); err != nil {
-		t.Fatalf("Timed out waiting for background evictions to complete: %v", err)
+	// 1 total eviction expected
+	if evictions := podEvictor.TotalEvicted(); evictions != 1 {
+		t.Errorf("Expected 1 total evictions, got %q instead", evictions)
 	}
-
-	// After deletion: "success" grows by 2 (p1, p2 completed), "background" stays at 2.
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "success"}, 4)
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "background"}, 2)
-}
-
-// TestEvictionInBackgroundMetrics_InformerRace reproduces the race where the
-// informer's UpdateFunc calls addPod (evictionAssumed=false) before evictPod's
-// assumePod call, causing the "success" metric to be silently dropped when the
-// pod is later deleted.
-//
-// The race: evictPod sends the eviction request; the KubeVirt handler sets
-// EvictionInProgressAnnotationKey before returning TooManyRequests, so the
-// informer's UpdateFunc fires and calls addPod (evictionAssumed=false) while
-// evictPod is still waiting for the HTTP response. When the response arrives,
-// assumePod finds the entry already present and returns early, leaving
-// evictionAssumed=false. DeleteFunc then skips the "success" metric.
-func TestEvictionInBackgroundMetrics_InformerRace(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), wait.ForeverTestTimeout)
-	defer cancel()
-
-	deschedulermetrics.Register()
-	deschedulermetrics.PodsEvicted.Reset()
-	deschedulermetrics.PodsEvictedTotal.Reset()
-
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-
-	ownerRef1 := test.GetReplicaSetOwnerRefList()
-	p1 := test.BuildTestPod("p1", 100, 0, node1.Name, func(pod *v1.Pod) {
-		pod.Namespace = "dev"
-		pod.ObjectMeta.OwnerReferences = ownerRef1
-		pod.Annotations = map[string]string{
-			EvictionRequestAnnotationKey: "",
-		}
-	})
-
-	client := fakeclientset.NewSimpleClientset(node1, p1)
-	sharedInformerFactory := informers.NewSharedInformerFactory(client, 0)
-	_, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, client)
-
-	podEvictor, err := NewPodEvictor(
-		ctx,
-		client,
-		eventRecorder,
-		sharedInformerFactory.Core().V1().Pods().Informer(),
-		initFeatureGates(),
-		NewOptions().WithMetricsEnabled(true),
-	)
-	if err != nil {
-		t.Fatalf("Unexpected error when creating a pod evictor: %v", err)
-	}
-
-	// calling erCache.addPod from a goroutine.
-	triggerAddPod := make(chan struct{})
-	addPodDone := make(chan struct{})
-
-	go func() {
-		<-triggerAddPod
-		// Simulate what UpdateFunc does when KubeVirt sets
-		// EvictionInProgressAnnotationKey before the TooManyRequests response
-		// arrives: addPod inserts the entry with evictionAssumed=false.
-		podEvictor.erCache.addPod(p1)
-		close(addPodDone)
-	}()
-
-	client.PrependReactor("create", "pods", func(action core.Action) (bool, runtime.Object, error) {
-		if action.GetSubresource() != "eviction" {
-			return false, nil, nil
-		}
-		createAct, ok := action.(core.CreateActionImpl)
-		if !ok {
-			return false, nil, fmt.Errorf("unable to convert action to core.CreateActionImpl")
-		}
-		eviction, ok := createAct.Object.(*policy.Eviction)
-		if !ok || eviction.GetName() != "p1" {
-			return false, nil, nil
-		}
-
-		// Trigger addPod and wait for it to complete before returning
-		// TooManyRequests, ensuring assumePod will find the entry already present.
-		close(triggerAddPod)
-		<-addPodDone
-
-		return true, nil, &apierrors.StatusError{
-			ErrStatus: metav1.Status{
-				Reason:  metav1.StatusReasonTooManyRequests,
-				Message: "Eviction triggered evacuation",
-			},
-		}
-	})
-
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
-	evictOpts := EvictOptions{StrategyName: "TestStrategy", ProfileName: "TestProfile"}
-	podEvictor.EvictPod(ctx, p1, evictOpts)
-
-	// The "background" metric must have been emitted.
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "background"}, 1)
-
-	// Simulate the background eviction completing: the pod is deleted.
-	client.CoreV1().Pods(p1.Namespace).Delete(ctx, p1.Name, metav1.DeleteOptions{})
-
-	// Wait until DeleteFunc has fired and removed the pod from the cache.
-	if err := wait.PollUntilContextTimeout(ctx, 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
-		return !podEvictor.erCache.hasPod(p1), nil
-	}); err != nil {
-		t.Fatalf("Timed out waiting for background eviction to complete: %v", err)
-	}
-
-	// "success" must also be 1: the background eviction completed.
-	// Without the fix this will be 0 because assumePod returned early (entry
-	// already present from addPod) leaving evictionAssumed=false.
-	metricstest.AssertVectorCount(t, "descheduler_pods_evicted_total", map[string]string{"result": "success"}, 1)
-}
 
-func assertEqualEvents(t *testing.T, expected []string, actual <-chan string) {
-	t.Logf("Assert for events: %v", expected)
-	c := time.After(wait.ForeverTestTimeout)
-	for _, e := range expected {
-		select {
-		case a := <-actual:
-			if !reflect.DeepEqual(a, e) {
-				t.Errorf("Expected event %q, got %q instead", e, a)
-			}
-		case <-c:
-			t.Errorf("Expected event %q, got nothing", e)
-			// continue iterating to print all expected events
-		}
+	err := podEvictor.EvictPod(context.TODO(), pod1, EvictOptions{})
+	if err == nil {
+		t.Errorf("Expected a pod eviction error, got nil instead")
 	}
-	for {
-		select {
-		case a := <-actual:
-			t.Errorf("Unexpected event: %q", a)
-		default:
-			return // No more events, as expected.
-		}
+	switch err.(type) {
+	case *EvictionNodeLimitError:
+		// all good
+	default:
+		t.Errorf("Expected a pod eviction EvictionNodeLimitError error, got a different error instead: %v", err)
 	}
 }

pkg/descheduler/evictions/options.go

@@ -5,14 +5,12 @@ import (
 )
 
 type Options struct {
-	policyGroupVersion               string
-	dryRun                           bool
-	maxPodsToEvictPerNode            *uint
-	maxPodsToEvictPerNamespace       *uint
-	maxPodsToEvictTotal              *uint
-	evictionFailureEventNotification bool
-	metricsEnabled                   bool
-	gracePeriodSeconds               *int64
+	policyGroupVersion         string
+	dryRun                     bool
+	maxPodsToEvictPerNode      *uint
+	maxPodsToEvictPerNamespace *uint
+	maxPodsToEvictTotal        *uint
+	metricsEnabled             bool
 }
 
 // NewOptions returns an Options with default values.
@@ -47,19 +45,7 @@ func (o *Options) WithMaxPodsToEvictTotal(maxPodsToEvictTotal *uint) *Options {
 	return o
 }
 
-func (o *Options) WithGracePeriodSeconds(gracePeriodSeconds *int64) *Options {
-	o.gracePeriodSeconds = gracePeriodSeconds
-	return o
-}
-
 func (o *Options) WithMetricsEnabled(metricsEnabled bool) *Options {
 	o.metricsEnabled = metricsEnabled
 	return o
 }
-
-func (o *Options) WithEvictionFailureEventNotification(evictionFailureEventNotification *bool) *Options {
-	if evictionFailureEventNotification != nil {
-		o.evictionFailureEventNotification = *evictionFailureEventNotification
-	}
-	return o
-}

pkg/descheduler/evictions/utils/utils.go

@@ -17,17 +17,12 @@ limitations under the License.
 package utils
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 )
 
 const (
 	EvictionKind        = "Eviction"
 	EvictionSubresource = "pods/eviction"
-	// A new experimental feature for soft no-eviction preference.
-	// Each plugin will decide whether the soft preference will be respected.
-	// If configured the soft preference turns into a mandatory no-eviction policy for the DefaultEvictor plugin.
-	SoftNoEvictionAnnotationKey = "descheduler.alpha.kubernetes.io/prefer-no-eviction"
 )
 
 // SupportEviction uses Discovery API to find out if the server support eviction subresource
@@ -61,9 +56,3 @@ func SupportEviction(client clientset.Interface) (string, error) {
 	}
 	return "", nil
 }
-
-// HaveNoEvictionAnnotation checks if the pod have soft no-eviction annotation
-func HaveNoEvictionAnnotation(pod *corev1.Pod) bool {
-	_, found := pod.ObjectMeta.Annotations[SoftNoEvictionAnnotationKey]
-	return found
-}

pkg/descheduler/kubeclientsandbox.go

@@ -1,445 +0,0 @@
-/*
-Copyright 2026 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 (
-	"context"
-	"fmt"
-	"sync"
-	"time"
-
-	v1 "k8s.io/api/core/v1"
-	policyv1 "k8s.io/api/policy/v1"
-	schedulingv1 "k8s.io/api/scheduling/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/informers"
-	clientset "k8s.io/client-go/kubernetes"
-	fakeclientset "k8s.io/client-go/kubernetes/fake"
-	core "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/cache"
-	"k8s.io/klog/v2"
-)
-
-// evictedPodInfo stores identifying information about a pod that was evicted during dry-run mode
-type evictedPodInfo struct {
-	Namespace string
-	Name      string
-	UID       string
-}
-
-// evictedPodsCache is a thread-safe cache for tracking pods evicted during dry-run mode
-type evictedPodsCache struct {
-	sync.RWMutex
-	pods map[string]*evictedPodInfo
-}
-
-func newEvictedPodsCache() *evictedPodsCache {
-	return &evictedPodsCache{
-		pods: make(map[string]*evictedPodInfo),
-	}
-}
-
-func (c *evictedPodsCache) add(pod *v1.Pod) {
-	c.Lock()
-	defer c.Unlock()
-	c.pods[string(pod.UID)] = &evictedPodInfo{
-		Namespace: pod.Namespace,
-		Name:      pod.Name,
-		UID:       string(pod.UID),
-	}
-}
-
-func (c *evictedPodsCache) list() []*evictedPodInfo {
-	c.RLock()
-	defer c.RUnlock()
-	pods := make([]*evictedPodInfo, 0, len(c.pods))
-	for _, pod := range c.pods {
-		podCopy := *pod
-		pods = append(pods, &podCopy)
-	}
-	return pods
-}
-
-func (c *evictedPodsCache) clear() {
-	c.Lock()
-	defer c.Unlock()
-	c.pods = make(map[string]*evictedPodInfo)
-}
-
-// kubeClientSandbox creates a sandbox environment with a fake client and informer factory
-// that mirrors resources from a real client, useful for dry-run testing scenarios
-type kubeClientSandbox struct {
-	fakeKubeClient         *fakeclientset.Clientset
-	fakeFactory            informers.SharedInformerFactory
-	resourceToInformer     map[schema.GroupVersionResource]informers.GenericInformer
-	evictedPodsCache       *evictedPodsCache
-	podEvictionReactionFnc func(*fakeclientset.Clientset, *evictedPodsCache) func(action core.Action) (bool, runtime.Object, error)
-}
-
-func newDefaultKubeClientSandbox(client clientset.Interface, sharedInformerFactory informers.SharedInformerFactory) (*kubeClientSandbox, error) {
-	return newKubeClientSandbox(client, sharedInformerFactory,
-		v1.SchemeGroupVersion.WithResource("pods"),
-		v1.SchemeGroupVersion.WithResource("nodes"),
-		v1.SchemeGroupVersion.WithResource("namespaces"),
-		schedulingv1.SchemeGroupVersion.WithResource("priorityclasses"),
-		policyv1.SchemeGroupVersion.WithResource("poddisruptionbudgets"),
-		v1.SchemeGroupVersion.WithResource("persistentvolumeclaims"),
-	)
-}
-
-func newKubeClientSandbox(client clientset.Interface, sharedInformerFactory informers.SharedInformerFactory, resources ...schema.GroupVersionResource) (*kubeClientSandbox, error) {
-	sandbox := &kubeClientSandbox{
-		resourceToInformer:     make(map[schema.GroupVersionResource]informers.GenericInformer),
-		evictedPodsCache:       newEvictedPodsCache(),
-		podEvictionReactionFnc: podEvictionReactionFnc,
-	}
-
-	sandbox.fakeKubeClient = fakeclientset.NewSimpleClientset()
-	// simulate a pod eviction by deleting a pod
-	sandbox.fakeKubeClient.PrependReactor("create", "pods", sandbox.podEvictionReactionFnc(sandbox.fakeKubeClient, sandbox.evictedPodsCache))
-	sandbox.fakeFactory = informers.NewSharedInformerFactory(sandbox.fakeKubeClient, 0)
-
-	for _, resource := range resources {
-		informer, err := sharedInformerFactory.ForResource(resource)
-		if err != nil {
-			return nil, err
-		}
-		sandbox.resourceToInformer[resource] = informer
-	}
-
-	// Register event handlers to sync changes from real client to fake client.
-	// These handlers will keep the fake client in sync with ongoing changes.
-	if err := sandbox.registerEventHandlers(); err != nil {
-		return nil, fmt.Errorf("error registering event handlers: %w", err)
-	}
-
-	return sandbox, nil
-}
-
-func (sandbox *kubeClientSandbox) registerEventHandlers() error {
-	for resource, informer := range sandbox.resourceToInformer {
-		// Create a local copy to avoid closure capture issue
-		resource := resource
-
-		_, err := sandbox.fakeFactory.ForResource(resource)
-		if err != nil {
-			return fmt.Errorf("error getting resource %s for fake factory: %w", resource, err)
-		}
-
-		_, err = informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
-			AddFunc: func(obj interface{}) {
-				runtimeObj, ok := obj.(runtime.Object)
-				if !ok {
-					klog.ErrorS(nil, "object is not a runtime.Object", "resource", resource)
-					return
-				}
-				if err := sandbox.fakeKubeClient.Tracker().Add(runtimeObj); err != nil {
-					if !apierrors.IsAlreadyExists(err) {
-						klog.ErrorS(err, "failed to add object to fake client", "resource", resource)
-					}
-				}
-			},
-			UpdateFunc: func(oldObj, newObj interface{}) {
-				runtimeObj, ok := newObj.(runtime.Object)
-				if !ok {
-					klog.ErrorS(nil, "object is not a runtime.Object", "resource", resource)
-					return
-				}
-				metaObj, err := meta.Accessor(runtimeObj)
-				if err != nil {
-					klog.ErrorS(err, "failed to get object metadata", "resource", resource)
-					return
-				}
-				if err := sandbox.fakeKubeClient.Tracker().Update(resource, runtimeObj, metaObj.GetNamespace()); err != nil {
-					klog.ErrorS(err, "failed to update object in fake client", "resource", resource)
-				}
-			},
-			DeleteFunc: func(obj interface{}) {
-				// Handle tombstone case where the object might be wrapped
-				if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok {
-					obj = tombstone.Obj
-				}
-
-				runtimeObj, ok := obj.(runtime.Object)
-				if !ok {
-					klog.ErrorS(nil, "object is not a runtime.Object", "resource", resource)
-					return
-				}
-				metaObj, err := meta.Accessor(runtimeObj)
-				if err != nil {
-					klog.ErrorS(err, "failed to get object metadata", "resource", resource)
-					return
-				}
-				if err := sandbox.fakeKubeClient.Tracker().Delete(resource, metaObj.GetNamespace(), metaObj.GetName()); err != nil {
-					klog.ErrorS(err, "failed to delete object from fake client", "resource", resource)
-				}
-			},
-		})
-		if err != nil {
-			return fmt.Errorf("error adding event handler for resource %s: %w", resource, err)
-		}
-	}
-	return nil
-}
-
-func (sandbox *kubeClientSandbox) fakeClient() *fakeclientset.Clientset {
-	return sandbox.fakeKubeClient
-}
-
-func (sandbox *kubeClientSandbox) fakeSharedInformerFactory() informers.SharedInformerFactory {
-	return sandbox.fakeFactory
-}
-
-func (sandbox *kubeClientSandbox) reset() {
-	sandbox.evictedPodsCache.clear()
-}
-
-// hasObjectInIndexer checks if an object exists in the fake indexer for the specified resource
-func (sandbox *kubeClientSandbox) hasObjectInIndexer(resource schema.GroupVersionResource, namespace, name, uid string) (bool, error) {
-	informer, err := sandbox.fakeFactory.ForResource(resource)
-	if err != nil {
-		return false, fmt.Errorf("error getting informer for resource %s: %w", resource, err)
-	}
-
-	key := cache.MetaObjectToName(&metav1.ObjectMeta{Namespace: namespace, Name: name}).String()
-	obj, exists, err := informer.Informer().GetIndexer().GetByKey(key)
-	if err != nil {
-		return false, err
-	}
-
-	if !exists {
-		return false, nil
-	}
-
-	metaObj, err := meta.Accessor(obj)
-	if err != nil {
-		return false, fmt.Errorf("failed to get object metadata: %w", err)
-	}
-	return string(metaObj.GetUID()) == uid, nil
-}
-
-// hasRuntimeObjectInIndexer checks if a runtime.Object exists in the fake indexer by detecting its resource type
-func (sandbox *kubeClientSandbox) hasRuntimeObjectInIndexer(obj runtime.Object) (bool, error) {
-	// Get metadata accessor to extract namespace and name
-	metaObj, err := meta.Accessor(obj)
-	if err != nil {
-		return false, fmt.Errorf("failed to get object metadata: %w", err)
-	}
-
-	// Get the GVK from the object using TypeMeta
-	gvk := obj.GetObjectKind().GroupVersionKind()
-	if gvk.Empty() {
-		return false, fmt.Errorf("no GroupVersionKind found for object")
-	}
-
-	// Use the GVK to construct the GVR by pluralizing the kind
-	plural, _ := meta.UnsafeGuessKindToResource(gvk)
-	gvr := schema.GroupVersionResource{
-		Group:    gvk.Group,
-		Version:  gvk.Version,
-		Resource: plural.Resource,
-	}
-
-	return sandbox.hasObjectInIndexer(gvr, metaObj.GetNamespace(), metaObj.GetName(), string(metaObj.GetUID()))
-}
-
-// shouldSkipPodWait checks if a pod still exists in the fake client with the expected UID.
-// Returns (shouldSkip, error). shouldSkip is true if we should skip waiting for this pod.
-// Returns an error for unexpected failures (non-NotFound errors).
-func (sandbox *kubeClientSandbox) shouldSkipPodWait(ctx context.Context, pod *evictedPodInfo) (bool, error) {
-	// Check if the pod still exists in the fake client (it could have been deleted from the real client
-	// and the deletion propagated via event handlers in the meantime)
-	fakePod, err := sandbox.fakeClient().CoreV1().Pods(pod.Namespace).Get(ctx, pod.Name, metav1.GetOptions{})
-	if err != nil {
-		if apierrors.IsNotFound(err) {
-			klog.V(3).InfoS("Pod no longer exists in fake client, skipping wait", "namespace", pod.Namespace, "name", pod.Name)
-			return true, nil
-		}
-		return false, fmt.Errorf("error getting pod %s/%s from fake client: %w", pod.Namespace, pod.Name, err)
-	}
-	if string(fakePod.UID) != pod.UID {
-		klog.V(3).InfoS("Pod UID mismatch in fake client, skipping wait", "namespace", pod.Namespace, "name", pod.Name, "expectedUID", pod.UID, "actualUID", string(fakePod.UID))
-		return true, nil
-	}
-	return false, nil
-}
-
-func waitForPodsCondition(ctx context.Context, pods []*evictedPodInfo, checkFn func(*evictedPodInfo) (bool, error), successMsg string) error {
-	if len(pods) == 0 {
-		return nil
-	}
-
-	err := wait.PollUntilContextTimeout(ctx, 100*time.Millisecond, 5*time.Second, true, func(ctx context.Context) (bool, error) {
-		for _, pod := range pods {
-			satisfied, err := checkFn(pod)
-			if err != nil {
-				return false, err
-			}
-			if !satisfied {
-				return false, nil
-			}
-		}
-		return true, nil
-	})
-	if err != nil {
-		return err
-	}
-
-	klog.V(4).InfoS(successMsg)
-	return nil
-}
-
-// restoreEvictedPods restores pods from the evicted pods cache back to the fake client
-func (sandbox *kubeClientSandbox) restoreEvictedPods(ctx context.Context) error {
-	podInformer, ok := sandbox.resourceToInformer[v1.SchemeGroupVersion.WithResource("pods")]
-	if !ok {
-		return fmt.Errorf("pod informer not found in resourceToInformer")
-	}
-
-	evictedPods := sandbox.evictedPodsCache.list()
-
-	// First wait loop: Check that all evicted pods are cleared from the indexers.
-	// This ensures the eviction has fully propagated through the fake informer's indexer.
-	// We check both existence and UID match to handle cases where a pod was deleted and
-	// recreated with the same name but different UID.
-	if err := waitForPodsCondition(ctx, evictedPods, func(pod *evictedPodInfo) (bool, error) {
-		exists, err := sandbox.hasObjectInIndexer(v1.SchemeGroupVersion.WithResource("pods"), pod.Namespace, pod.Name, pod.UID)
-		if err != nil {
-			klog.V(4).InfoS("Error checking indexer for pod", "namespace", pod.Namespace, "name", pod.Name, "error", err)
-			return false, nil
-		}
-		if exists {
-			klog.V(4).InfoS("Pod with matching UID still exists in fake indexer, waiting", "namespace", pod.Namespace, "name", pod.Name, "uid", pod.UID)
-			return false, nil
-		}
-		klog.V(4).InfoS("Pod with matching UID no longer in fake indexer", "namespace", pod.Namespace, "name", pod.Name, "uid", pod.UID)
-		return true, nil
-	}, "All evicted pods removed from fake indexer"); err != nil {
-		return fmt.Errorf("timeout waiting for evicted pods to be removed from fake indexer: %w", err)
-	}
-
-	var restoredPods []*evictedPodInfo
-	for _, podInfo := range sandbox.evictedPodsCache.list() {
-		obj, err := podInformer.Lister().ByNamespace(podInfo.Namespace).Get(podInfo.Name)
-		if err != nil {
-			klog.V(3).InfoS("Pod not found in real client, skipping restoration", "namespace", podInfo.Namespace, "name", podInfo.Name, "error", err)
-			continue
-		}
-
-		pod, ok := obj.(*v1.Pod)
-		if !ok {
-			klog.ErrorS(nil, "Object is not a pod", "namespace", podInfo.Namespace, "name", podInfo.Name)
-			continue
-		}
-
-		if string(pod.UID) != podInfo.UID {
-			klog.V(3).InfoS("Pod UID mismatch, skipping restoration", "namespace", podInfo.Namespace, "name", podInfo.Name, "expectedUID", podInfo.UID, "actualUID", string(pod.UID))
-			continue
-		}
-
-		if err = sandbox.fakeKubeClient.Tracker().Add(pod); err != nil && !apierrors.IsAlreadyExists(err) {
-			return fmt.Errorf("failed to restore pod %s/%s to fake client: %w", podInfo.Namespace, podInfo.Name, err)
-		}
-		klog.V(4).InfoS("Successfully restored pod to fake client", "namespace", podInfo.Namespace, "name", podInfo.Name, "uid", podInfo.UID)
-		restoredPods = append(restoredPods, podInfo)
-	}
-
-	// Second wait loop: Make sure the evicted pods are added back to the fake client.
-	// This ensures the restored pods are accessible through the fake informer's lister.
-	if err := waitForPodsCondition(ctx, restoredPods, func(pod *evictedPodInfo) (bool, error) {
-		podObj, err := sandbox.fakeFactory.Core().V1().Pods().Lister().Pods(pod.Namespace).Get(pod.Name)
-		if err != nil {
-			klog.V(4).InfoS("Pod not yet accessible in fake informer, waiting", "namespace", pod.Namespace, "name", pod.Name)
-			shouldSkip, checkErr := sandbox.shouldSkipPodWait(ctx, pod)
-			if checkErr != nil {
-				return false, checkErr
-			}
-			if shouldSkip {
-				return true, nil
-			}
-			return false, nil
-		}
-		klog.V(4).InfoS("Pod accessible in fake informer", "namespace", pod.Namespace, "name", pod.Name, "node", podObj.Spec.NodeName)
-		return true, nil
-	}, "All restored pods are accessible in fake informer"); err != nil {
-		return fmt.Errorf("timeout waiting for pods to be accessible in fake informer: %w", err)
-	}
-
-	// Third wait loop: Make sure the indexers see the added pods.
-	// This is important to ensure each descheduling cycle can see all the restored pods.
-	// Without this wait, the next cycle might not see the restored pods in the indexer yet.
-	if err := waitForPodsCondition(ctx, restoredPods, func(pod *evictedPodInfo) (bool, error) {
-		exists, err := sandbox.hasObjectInIndexer(v1.SchemeGroupVersion.WithResource("pods"), pod.Namespace, pod.Name, pod.UID)
-		if err != nil {
-			klog.V(4).InfoS("Error checking indexer for restored pod", "namespace", pod.Namespace, "name", pod.Name, "error", err)
-			return false, nil
-		}
-		if !exists {
-			klog.V(4).InfoS("Restored pod not yet in fake indexer, waiting", "namespace", pod.Namespace, "name", pod.Name)
-			shouldSkip, checkErr := sandbox.shouldSkipPodWait(ctx, pod)
-			if checkErr != nil {
-				return false, checkErr
-			}
-			if shouldSkip {
-				return true, nil
-			}
-			return false, nil
-		}
-		klog.V(4).InfoS("Restored pod now in fake indexer", "namespace", pod.Namespace, "name", pod.Name)
-		return true, nil
-	}, "All restored pods are now in fake indexer"); err != nil {
-		return fmt.Errorf("timeout waiting for restored pods to appear in fake indexer: %w", err)
-	}
-
-	return nil
-}
-
-func podEvictionReactionFnc(fakeClient *fakeclientset.Clientset, evictedCache *evictedPodsCache) 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")
-			}
-			eviction, matched := createAct.Object.(*policyv1.Eviction)
-			if !matched {
-				return false, nil, fmt.Errorf("unable to convert action object into *policyv1.Eviction")
-			}
-			podObj, err := fakeClient.Tracker().Get(action.GetResource(), eviction.GetNamespace(), eviction.GetName())
-			if err == nil {
-				if pod, ok := podObj.(*v1.Pod); ok {
-					evictedCache.add(pod)
-				} else {
-					return false, nil, fmt.Errorf("unable to convert object to *v1.Pod for %v/%v", eviction.GetNamespace(), eviction.GetName())
-				}
-			} else if !apierrors.IsNotFound(err) {
-				return false, nil, fmt.Errorf("unable to get pod %v/%v: %v", eviction.GetNamespace(), eviction.GetName(), err)
-			}
-			if err := fakeClient.Tracker().Delete(action.GetResource(), eviction.GetNamespace(), eviction.GetName()); err != nil {
-				return false, nil, fmt.Errorf("unable to delete pod %v/%v: %v", eviction.GetNamespace(), eviction.GetName(), err)
-			}
-			return true, nil, nil
-		}
-		// fallback to the default reactor
-		return false, nil, nil
-	}
-}

pkg/descheduler/kubeclientsandbox_test.go

@@ -1,603 +0,0 @@
-/*
-Copyright 2026 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 (
-	"context"
-	"testing"
-	"time"
-
-	v1 "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/informers"
-	clientset "k8s.io/client-go/kubernetes"
-	fakeclientset "k8s.io/client-go/kubernetes/fake"
-
-	"sigs.k8s.io/descheduler/test"
-)
-
-// setupTestSandbox creates and initializes a kubeClientSandbox for testing.
-// It creates a fake client, informer factory, registers pod and node informers,
-// creates the sandbox, and starts both factories.
-func setupTestSandbox(ctx context.Context, t *testing.T, initialObjects ...runtime.Object) (*kubeClientSandbox, informers.SharedInformerFactory, clientset.Interface) {
-	// Create a "real" fake client to act as the source of truth
-	realClient := fakeclientset.NewSimpleClientset(initialObjects...)
-	realFactory := informers.NewSharedInformerFactoryWithOptions(realClient, 0)
-
-	// Register pods and nodes informers BEFORE creating the sandbox
-	_ = realFactory.Core().V1().Pods().Informer()
-	_ = realFactory.Core().V1().Nodes().Informer()
-
-	// Create the sandbox with only pods and nodes resources
-	sandbox, err := newKubeClientSandbox(realClient, realFactory,
-		v1.SchemeGroupVersion.WithResource("pods"),
-		v1.SchemeGroupVersion.WithResource("nodes"),
-	)
-	if err != nil {
-		t.Fatalf("Failed to create kubeClientSandbox: %v", err)
-	}
-
-	// fake factory created by newKubeClientSandbox needs to be started before
-	// the "real" fake client factory to have all handlers registered
-	// to get complete propagation
-	sandbox.fakeSharedInformerFactory().Start(ctx.Done())
-	sandbox.fakeSharedInformerFactory().WaitForCacheSync(ctx.Done())
-
-	realFactory.Start(ctx.Done())
-	realFactory.WaitForCacheSync(ctx.Done())
-
-	// Wait for initial objects to propagate from real client to fake client via event handlers.
-	for _, obj := range initialObjects {
-		if err := wait.PollUntilContextTimeout(ctx, time.Second, 5*time.Second, true, func(ctx context.Context) (bool, error) {
-			exists, err := sandbox.hasRuntimeObjectInIndexer(obj)
-			if err != nil {
-				t.Logf("Error checking if object propagated to fake indexer: %v", err)
-				return false, nil
-			}
-			if !exists {
-				metaObj, _ := meta.Accessor(obj)
-				t.Logf("Initial object %s/%s has not propagated to fake indexer yet, waiting...", metaObj.GetNamespace(), metaObj.GetName())
-			}
-			return exists, nil
-		}); err != nil {
-			metaObj, _ := meta.Accessor(obj)
-			t.Fatalf("Initial object %s/%s did not propagate to fake indexer within timeout: %v",
-				metaObj.GetNamespace(), metaObj.GetName(), err)
-		}
-	}
-
-	return sandbox, realFactory, realClient
-}
-
-func TestKubeClientSandboxEventHandlers(t *testing.T) {
-	ctx := context.Background()
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	sandbox, realFactory, realClient := setupTestSandbox(ctx, t)
-
-	// Register a third resource (secrets) in the real factory AFTER sandbox creation
-	// This should NOT be synced to the fake client
-	_ = realFactory.Core().V1().Secrets().Informer()
-
-	// Create test objects
-	testPod := &v1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-pod",
-			Namespace: "default",
-			UID:       "pod-uid-12345",
-		},
-		Spec: v1.PodSpec{
-			NodeName: "test-node",
-		},
-	}
-
-	testNode := &v1.Node{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-node",
-			UID:  "node-uid-67890",
-		},
-	}
-
-	testSecret := &v1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-secret",
-			Namespace: "default",
-			UID:       "secret-uid-abcde",
-		},
-		Data: map[string][]byte{
-			"key": []byte("value"),
-		},
-	}
-
-	// Add objects to the real client
-	var err error
-	_, err = realClient.CoreV1().Pods(testPod.Namespace).Create(ctx, testPod, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create pod in real client: %v", err)
-	}
-
-	_, err = realClient.CoreV1().Nodes().Create(ctx, testNode, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create node in real client: %v", err)
-	}
-
-	_, err = realClient.CoreV1().Secrets(testSecret.Namespace).Create(ctx, testSecret, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create secret in real client: %v", err)
-	}
-
-	// Helper function to wait for a resource to appear in the sandbox's fake client indexer
-	waitForResourceInIndexer := func(resourceType, namespace, name, uid, description string) error {
-		t.Logf("Waiting for %s to appear in fake client indexer...", description)
-		return wait.PollUntilContextTimeout(ctx, 100*time.Millisecond, 5*time.Second, true, func(ctx context.Context) (bool, error) {
-			exists, err := sandbox.hasObjectInIndexer(
-				v1.SchemeGroupVersion.WithResource(resourceType),
-				namespace,
-				name,
-				uid,
-			)
-			if err != nil {
-				t.Logf("Error checking %s in indexer: %v", description, err)
-				return false, nil
-			}
-			if exists {
-				t.Logf("%s appeared in fake client indexer", description)
-				return true, nil
-			}
-			return false, nil
-		})
-	}
-
-	// Wait for the pod to appear in the sandbox's fake client indexer
-	if err := waitForResourceInIndexer("pods", testPod.Namespace, testPod.Name, string(testPod.UID), "pod"); err != nil {
-		t.Fatalf("Pod did not appear in fake client indexer within timeout: %v", err)
-	}
-
-	// Wait for the node to appear in the sandbox's fake client indexer
-	if err := waitForResourceInIndexer("nodes", "", testNode.Name, string(testNode.UID), "node"); err != nil {
-		t.Fatalf("Node did not appear in fake client indexer within timeout: %v", err)
-	}
-
-	// Verify the pod can be retrieved from the fake client
-	retrievedPod, err := sandbox.fakeClient().CoreV1().Pods(testPod.Namespace).Get(ctx, testPod.Name, metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("Failed to retrieve pod from fake client: %v", err)
-	}
-	if retrievedPod.Namespace != testPod.Namespace || retrievedPod.Name != testPod.Name || retrievedPod.UID != testPod.UID {
-		t.Errorf("Retrieved pod mismatch: got namespace=%s name=%s uid=%s, want namespace=%s name=%s uid=%s",
-			retrievedPod.Namespace, retrievedPod.Name, retrievedPod.UID, testPod.Namespace, testPod.Name, testPod.UID)
-	}
-	t.Logf("Successfully retrieved pod from fake client: %s/%s", retrievedPod.Namespace, retrievedPod.Name)
-
-	// Verify the node can be retrieved from the fake client
-	retrievedNode, err := sandbox.fakeClient().CoreV1().Nodes().Get(ctx, testNode.Name, metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("Failed to retrieve node from fake client: %v", err)
-	}
-	if retrievedNode.Name != testNode.Name || retrievedNode.UID != testNode.UID {
-		t.Errorf("Retrieved node mismatch: got name=%s uid=%s, want name=%s uid=%s",
-			retrievedNode.Name, retrievedNode.UID, testNode.Name, testNode.UID)
-	}
-	t.Logf("Successfully retrieved node from fake client: %s", retrievedNode.Name)
-
-	// Wait a bit longer and verify the secret does NOT appear in the fake client indexer
-	// because secrets were registered AFTER the sandbox was created
-	t.Log("Verifying secret does NOT appear in fake client indexer...")
-	time.Sleep(500 * time.Millisecond) // Give extra time to ensure it's not just a timing issue
-
-	// First, verify we can get the informer for secrets in the fake factory
-	secretInformer, err := sandbox.fakeSharedInformerFactory().ForResource(v1.SchemeGroupVersion.WithResource("secrets"))
-	if err != nil {
-		t.Logf("Expected: Cannot get secret informer from fake factory: %v", err)
-	} else {
-		// If we can get the informer, check if the secret exists in it
-		key := "default/test-secret"
-		_, exists, err := secretInformer.Informer().GetIndexer().GetByKey(key)
-		if err != nil {
-			t.Logf("Error checking secret in fake indexer: %v", err)
-		}
-		if exists {
-			t.Error("Secret should NOT exist in fake client indexer (it was registered after sandbox creation)")
-		} else {
-			t.Log("Correctly verified: Secret does not exist in fake client indexer")
-		}
-	}
-
-	// Also verify that attempting to get the secret directly from fake client should fail
-	_, err = sandbox.fakeClient().CoreV1().Secrets(testSecret.Namespace).Get(ctx, testSecret.Name, metav1.GetOptions{})
-	if err == nil {
-		t.Error("Secret should NOT be retrievable from fake client (it was not synced)")
-	} else {
-		t.Logf("Correctly verified: Secret not retrievable from fake client: %v", err)
-	}
-
-	// Verify the secret IS in the real client (sanity check)
-	_, err = realClient.CoreV1().Secrets(testSecret.Namespace).Get(ctx, testSecret.Name, metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("Secret should exist in real client but got error: %v", err)
-	}
-	t.Log("Sanity check passed: Secret exists in real client")
-}
-
-func TestKubeClientSandboxReset(t *testing.T) {
-	ctx := context.Background()
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-	p1 := test.BuildTestPod("p1", 100, 0, node1.Name, test.SetRSOwnerRef)
-	p2 := test.BuildTestPod("p2", 100, 0, node1.Name, test.SetRSOwnerRef)
-
-	sandbox, _, _ := setupTestSandbox(ctx, t, node1, p1, p2)
-
-	eviction1 := &policy.Eviction{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      p1.Name,
-			Namespace: p1.Namespace,
-		},
-	}
-	eviction2 := &policy.Eviction{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      p2.Name,
-			Namespace: p2.Namespace,
-		},
-	}
-
-	if err := sandbox.fakeClient().CoreV1().Pods(p1.Namespace).EvictV1(context.TODO(), eviction1); err != nil {
-		t.Fatalf("Error evicting p1: %v", err)
-	}
-	if err := sandbox.fakeClient().CoreV1().Pods(p2.Namespace).EvictV1(context.TODO(), eviction2); err != nil {
-		t.Fatalf("Error evicting p2: %v", err)
-	}
-
-	evictedPods := sandbox.evictedPodsCache.list()
-	if len(evictedPods) != 2 {
-		t.Fatalf("Expected 2 evicted pods in cache, but got %d", len(evictedPods))
-	}
-	t.Logf("Evicted pods in cache before reset: %d", len(evictedPods))
-
-	for _, evictedPod := range evictedPods {
-		if evictedPod.Namespace == "" || evictedPod.Name == "" || evictedPod.UID == "" {
-			t.Errorf("Evicted pod has empty fields: namespace=%s, name=%s, uid=%s", evictedPod.Namespace, evictedPod.Name, evictedPod.UID)
-		}
-		t.Logf("Evicted pod: %s/%s (UID: %s)", evictedPod.Namespace, evictedPod.Name, evictedPod.UID)
-	}
-
-	sandbox.reset()
-
-	evictedPodsAfterReset := sandbox.evictedPodsCache.list()
-	if len(evictedPodsAfterReset) != 0 {
-		t.Fatalf("Expected cache to be empty after reset, but found %d pods", len(evictedPodsAfterReset))
-	}
-	t.Logf("Successfully verified cache is empty after reset")
-}
-
-func TestKubeClientSandboxRestoreEvictedPods(t *testing.T) {
-	ctx := context.Background()
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-
-	// Create test pods
-	pod1 := test.BuildTestPod("pod1", 100, 0, node1.Name, test.SetRSOwnerRef)
-	pod2 := test.BuildTestPod("pod2", 100, 0, node1.Name, test.SetRSOwnerRef)
-	pod3 := test.BuildTestPod("pod3", 100, 0, node1.Name, test.SetRSOwnerRef)
-	pod4 := test.BuildTestPod("pod4", 100, 0, node1.Name, test.SetRSOwnerRef)
-
-	sandbox, _, realClient := setupTestSandbox(ctx, t, node1, pod1, pod2, pod3, pod4)
-
-	// Evict all pods
-	for _, pod := range []*v1.Pod{pod1, pod2, pod3, pod4} {
-		eviction := &policy.Eviction{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      pod.Name,
-				Namespace: pod.Namespace,
-			},
-		}
-		if err := sandbox.fakeClient().CoreV1().Pods(pod.Namespace).EvictV1(ctx, eviction); err != nil {
-			t.Fatalf("Error evicting %s: %v", pod.Name, err)
-		}
-	}
-
-	// Delete pod2 from real client to simulate it being deleted (should skip restoration)
-	if err := realClient.CoreV1().Pods(pod2.Namespace).Delete(ctx, pod2.Name, metav1.DeleteOptions{}); err != nil {
-		t.Fatalf("Error deleting pod2 from real client: %v", err)
-	}
-
-	// Delete and recreate pod3 with different UID in real client (should skip restoration)
-	if err := realClient.CoreV1().Pods(pod3.Namespace).Delete(ctx, pod3.Name, metav1.DeleteOptions{}); err != nil {
-		t.Fatalf("Error deleting pod3 from real client: %v", err)
-	}
-	pod3New := test.BuildTestPod("pod3", 100, 0, node1.Name, test.SetRSOwnerRef)
-	// Ensure pod3New has a different UID from pod3
-	if pod3New.UID == pod3.UID {
-		pod3New.UID = "new-uid-for-pod3"
-	}
-	if _, err := realClient.CoreV1().Pods(pod3New.Namespace).Create(ctx, pod3New, metav1.CreateOptions{}); err != nil {
-		t.Fatalf("Error recreating pod3 in real client: %v", err)
-	}
-
-	// Verify evicted pods are in cache
-	evictedPods := sandbox.evictedPodsCache.list()
-	if len(evictedPods) != 4 {
-		t.Fatalf("Expected 4 evicted pods in cache, got %d", len(evictedPods))
-	}
-	t.Logf("Evicted pods in cache: %d", len(evictedPods))
-
-	// Call restoreEvictedPods
-	t.Log("Calling restoreEvictedPods...")
-	if err := sandbox.restoreEvictedPods(ctx); err != nil {
-		t.Fatalf("restoreEvictedPods failed: %v", err)
-	}
-
-	// Verify pod1 and pod4 were restored (exists in fake client with matching UID and accessible via indexer)
-	for _, pod := range []*v1.Pod{pod1, pod4} {
-		// Check restoration via fake client
-		restoredPod, err := sandbox.fakeClient().CoreV1().Pods(pod.Namespace).Get(ctx, pod.Name, metav1.GetOptions{})
-		if err != nil {
-			t.Errorf("%s should have been restored to fake client: %v", pod.Name, err)
-		} else {
-			if restoredPod.UID != pod.UID {
-				t.Errorf("Restored %s UID mismatch: got %s, want %s", pod.Name, restoredPod.UID, pod.UID)
-			}
-			t.Logf("Successfully verified %s restoration: %s/%s (UID: %s)", pod.Name, restoredPod.Namespace, restoredPod.Name, restoredPod.UID)
-		}
-
-		// Check accessibility via indexer
-		exists, err := sandbox.hasObjectInIndexer(v1.SchemeGroupVersion.WithResource("pods"), pod.Namespace, pod.Name, string(pod.UID))
-		if err != nil {
-			t.Errorf("Error checking %s in indexer: %v", pod.Name, err)
-		}
-		if !exists {
-			t.Errorf("%s should exist in fake indexer after restoration", pod.Name)
-		} else {
-			t.Logf("Successfully verified %s exists in fake indexer", pod.Name)
-		}
-	}
-
-	// Verify pod2 was NOT restored (deleted from real client)
-	_, err := sandbox.fakeClient().CoreV1().Pods(pod2.Namespace).Get(ctx, pod2.Name, metav1.GetOptions{})
-	if err == nil {
-		t.Error("pod2 should NOT have been restored (was deleted from real client)")
-	} else {
-		t.Logf("Correctly verified pod2 was not restored: %v", err)
-	}
-
-	// Verify pod3 was NOT restored with old UID (UID mismatch case)
-	// Note: pod3 may exist in fake client with NEW UID due to event handler syncing,
-	// but it should NOT have been restored with the OLD UID from evicted cache
-	pod3InFake, err := sandbox.fakeClient().CoreV1().Pods(pod3.Namespace).Get(ctx, pod3.Name, metav1.GetOptions{})
-	if err == nil {
-		// Pod3 exists, but it should have the NEW UID, not the old one
-		if pod3InFake.UID == pod3.UID {
-			t.Error("pod3 should NOT have been restored with old UID (UID mismatch should prevent restoration)")
-		} else {
-			t.Logf("Correctly verified pod3 has new UID (%s), not old UID (%s) - restoration was skipped", pod3InFake.UID, pod3.UID)
-		}
-	} else {
-		// Pod3 doesn't exist - this is also acceptable (event handlers haven't synced it yet)
-		t.Logf("pod3 not found in fake client: %v", err)
-	}
-
-	// Verify evicted pods cache is still intact (restoreEvictedPods doesn't clear it)
-	evictedPodsAfter := sandbox.evictedPodsCache.list()
-	if len(evictedPodsAfter) != 4 {
-		t.Errorf("Expected evicted pods cache to still have 4 entries, got %d", len(evictedPodsAfter))
-	}
-}
-
-func TestKubeClientSandboxRestoreEvictedPodsEmptyCache(t *testing.T) {
-	ctx := context.Background()
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-	sandbox, _, _ := setupTestSandbox(ctx, t, node1)
-
-	// Call restoreEvictedPods with empty cache - should be a no-op
-	t.Log("Calling restoreEvictedPods with empty cache...")
-	if err := sandbox.restoreEvictedPods(ctx); err != nil {
-		t.Fatalf("restoreEvictedPods should succeed with empty cache: %v", err)
-	}
-	t.Log("Successfully verified restoreEvictedPods handles empty cache")
-}
-
-func TestEvictedPodsCache(t *testing.T) {
-	t.Run("add single pod", func(t *testing.T) {
-		const (
-			podName      = "pod1"
-			podNamespace = "default"
-			podUID       = "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
-		)
-		cache := newEvictedPodsCache()
-		pod := &v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      podName,
-				Namespace: podNamespace,
-				UID:       podUID,
-			},
-		}
-
-		cache.add(pod)
-
-		pods := cache.list()
-		if len(pods) != 1 {
-			t.Fatalf("Expected 1 pod in cache, got %d", len(pods))
-		}
-		if pods[0].Name != podName || pods[0].Namespace != podNamespace || pods[0].UID != podUID {
-			t.Errorf("Pod data mismatch: got name=%s, namespace=%s, uid=%s", pods[0].Name, pods[0].Namespace, pods[0].UID)
-		}
-	})
-
-	t.Run("add multiple pods", func(t *testing.T) {
-		cache := newEvictedPodsCache()
-		pods := []*v1.Pod{
-			{ObjectMeta: metav1.ObjectMeta{Name: "pod1", Namespace: "default", UID: "11111111-1111-1111-1111-111111111111"}},
-			{ObjectMeta: metav1.ObjectMeta{Name: "pod2", Namespace: "kube-system", UID: "22222222-2222-2222-2222-222222222222"}},
-			{ObjectMeta: metav1.ObjectMeta{Name: "pod3", Namespace: "default", UID: "33333333-3333-3333-3333-333333333333"}},
-		}
-
-		for _, pod := range pods {
-			cache.add(pod)
-		}
-
-		cachedPods := cache.list()
-		if len(cachedPods) != 3 {
-			t.Fatalf("Expected 3 pods in cache, got %d", len(cachedPods))
-		}
-
-		podMap := make(map[string]*evictedPodInfo)
-		for _, cachedPod := range cachedPods {
-			podMap[cachedPod.UID] = cachedPod
-		}
-
-		for _, pod := range pods {
-			cached, ok := podMap[string(pod.UID)]
-			if !ok {
-				t.Errorf("Pod with UID %s not found in cache", pod.UID)
-				continue
-			}
-			if cached.Name != pod.Name || cached.Namespace != pod.Namespace {
-				t.Errorf("Pod data mismatch for UID %s: got name=%s, namespace=%s", pod.UID, cached.Name, cached.Namespace)
-			}
-		}
-	})
-
-	t.Run("add duplicate pod updates entry", func(t *testing.T) {
-		const (
-			duplicateUID   = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
-			updatedPodName = "pod1-new"
-			updatedPodNS   = "kube-system"
-		)
-		cache := newEvictedPodsCache()
-		pod1 := &v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "pod1",
-				Namespace: "default",
-				UID:       duplicateUID,
-			},
-		}
-		pod2 := &v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      updatedPodName,
-				Namespace: updatedPodNS,
-				UID:       duplicateUID,
-			},
-		}
-
-		cache.add(pod1)
-		cache.add(pod2)
-
-		pods := cache.list()
-		if len(pods) != 1 {
-			t.Fatalf("Expected 1 pod in cache (duplicates should overwrite), got %d", len(pods))
-		}
-		if pods[0].Name != updatedPodName || pods[0].Namespace != updatedPodNS {
-			t.Errorf("Expected pod2 data, got name=%s, namespace=%s", pods[0].Name, pods[0].Namespace)
-		}
-	})
-
-	t.Run("list returns empty array for empty cache", func(t *testing.T) {
-		cache := newEvictedPodsCache()
-		pods := cache.list()
-		if pods == nil {
-			t.Fatal("Expected non-nil slice from list()")
-		}
-		if len(pods) != 0 {
-			t.Fatalf("Expected empty list, got %d pods", len(pods))
-		}
-	})
-
-	t.Run("list returns copies not references", func(t *testing.T) {
-		const originalPodName = "pod1"
-		cache := newEvictedPodsCache()
-		pod := &v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      originalPodName,
-				Namespace: "default",
-				UID:       "12345678-1234-1234-1234-123456789abc",
-			},
-		}
-		cache.add(pod)
-
-		pods1 := cache.list()
-		pods2 := cache.list()
-
-		if len(pods1) != 1 || len(pods2) != 1 {
-			t.Fatalf("Expected 1 pod in both lists")
-		}
-
-		pods1[0].Name = "modified"
-
-		if pods2[0].Name == "modified" {
-			t.Error("Modifying list result should not affect other list results (should be copies)")
-		}
-
-		pods3 := cache.list()
-		if pods3[0].Name != originalPodName {
-			t.Error("Cache data was modified, list() should return copies")
-		}
-	})
-
-	t.Run("clear empties the cache", func(t *testing.T) {
-		cache := newEvictedPodsCache()
-		cache.add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod1", Namespace: "default", UID: "aaaa0000-0000-0000-0000-000000000001"}})
-		cache.add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod2", Namespace: "kube-system", UID: "bbbb0000-0000-0000-0000-000000000002"}})
-
-		if len(cache.list()) != 2 {
-			t.Fatal("Expected 2 pods before clear")
-		}
-
-		cache.clear()
-
-		pods := cache.list()
-		if len(pods) != 0 {
-			t.Fatalf("Expected empty cache after clear, got %d pods", len(pods))
-		}
-	})
-
-	t.Run("clear on empty cache is safe", func(t *testing.T) {
-		cache := newEvictedPodsCache()
-		cache.clear()
-
-		pods := cache.list()
-		if len(pods) != 0 {
-			t.Fatalf("Expected empty cache, got %d pods", len(pods))
-		}
-	})
-
-	t.Run("add after clear works correctly", func(t *testing.T) {
-		cache := newEvictedPodsCache()
-		cache.add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod1", Namespace: "default", UID: "00000001-0001-0001-0001-000000000001"}})
-		cache.clear()
-		cache.add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod2", Namespace: "kube-system", UID: "00000002-0002-0002-0002-000000000002"}})
-
-		pods := cache.list()
-		if len(pods) != 1 {
-			t.Fatalf("Expected 1 pod after clear and add, got %d", len(pods))
-		}
-		if pods[0].Name != "pod2" {
-			t.Errorf("Expected pod2, got %s", pods[0].Name)
-		}
-	})
-}

pkg/descheduler/metricscollector/metricscollector.go

@@ -23,16 +23,15 @@ import (
 	"sync"
 	"time"
 
+	"k8s.io/klog/v2"
+	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"
-	listercorev1 "k8s.io/client-go/listers/core/v1"
-	"k8s.io/klog/v2"
-	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
+	"k8s.io/client-go/kubernetes"
 	utilptr "k8s.io/utils/ptr"
-	"sigs.k8s.io/descheduler/pkg/api"
 )
 
 const (
@@ -40,23 +39,19 @@ const (
 )
 
 type MetricsCollector struct {
-	nodeLister       listercorev1.NodeLister
+	clientset        kubernetes.Interface
 	metricsClientset metricsclient.Interface
-	nodeSelector     labels.Selector
 
-	nodes map[string]api.ReferencedResourceList
+	nodes map[string]map[v1.ResourceName]*resource.Quantity
 
-	mu sync.RWMutex
-	// hasSynced signals at least one sync succeeded
-	hasSynced bool
+	mu sync.Mutex
 }
 
-func NewMetricsCollector(nodeLister listercorev1.NodeLister, metricsClientset metricsclient.Interface, nodeSelector labels.Selector) *MetricsCollector {
+func NewMetricsCollector(clientset kubernetes.Interface, metricsClientset metricsclient.Interface) *MetricsCollector {
 	return &MetricsCollector{
-		nodeLister:       nodeLister,
+		clientset:        clientset,
 		metricsClientset: metricsClientset,
-		nodeSelector:     nodeSelector,
-		nodes:            make(map[string]api.ReferencedResourceList),
+		nodes:            make(map[string]map[v1.ResourceName]*resource.Quantity),
 	}
 }
 
@@ -66,53 +61,24 @@ func (mc *MetricsCollector) Run(ctx context.Context) {
 	}, 5*time.Second, ctx.Done())
 }
 
-// During experiments rounding to int error causes weightedAverage to never
-// reach value even when weightedAverage is repeated many times in a row.
-// The difference between the limit and computed average stops within 5 units.
-// Nevertheless, the value is expected to change in time. So the weighted
-// average nevers gets a chance to converge. Which makes the computed
-// error negligible.
-// The speed of convergence depends on how often the metrics collector
-// syncs with the current value. Currently, the interval is set to 5s.
 func weightedAverage(prevValue, value int64) int64 {
-	return int64(math.Round(beta*float64(prevValue) + (1-beta)*float64(value)))
+	return int64(math.Floor(beta*float64(prevValue) + (1-beta)*float64(value)))
 }
 
-func (mc *MetricsCollector) AllNodesUsage() (map[string]api.ReferencedResourceList, error) {
-	mc.mu.RLock()
-	defer mc.mu.RUnlock()
-
-	allNodesUsage := make(map[string]api.ReferencedResourceList)
-	for nodeName := range mc.nodes {
-		allNodesUsage[nodeName] = api.ReferencedResourceList{
-			v1.ResourceCPU:    utilptr.To[resource.Quantity](mc.nodes[nodeName][v1.ResourceCPU].DeepCopy()),
-			v1.ResourceMemory: utilptr.To[resource.Quantity](mc.nodes[nodeName][v1.ResourceMemory].DeepCopy()),
-		}
-	}
-
-	return allNodesUsage, nil
-}
-
-func (mc *MetricsCollector) NodeUsage(node *v1.Node) (api.ReferencedResourceList, error) {
-	mc.mu.RLock()
-	defer mc.mu.RUnlock()
+func (mc *MetricsCollector) NodeUsage(node *v1.Node) (map[v1.ResourceName]*resource.Quantity, error) {
+	mc.mu.Lock()
+	defer mc.mu.Unlock()
 
 	if _, exists := mc.nodes[node.Name]; !exists {
-		klog.V(4).InfoS("unable to find node in the collected metrics", "node", klog.KObj(node))
+		klog.V(4).Infof("unable to find node %q in the collected metrics", node.Name)
 		return nil, fmt.Errorf("unable to find node %q in the collected metrics", node.Name)
 	}
-	return api.ReferencedResourceList{
+	return map[v1.ResourceName]*resource.Quantity{
 		v1.ResourceCPU:    utilptr.To[resource.Quantity](mc.nodes[node.Name][v1.ResourceCPU].DeepCopy()),
 		v1.ResourceMemory: utilptr.To[resource.Quantity](mc.nodes[node.Name][v1.ResourceMemory].DeepCopy()),
 	}, nil
 }
 
-func (mc *MetricsCollector) HasSynced() bool {
-	mc.mu.RLock()
-	defer mc.mu.RUnlock()
-	return mc.hasSynced
-}
-
 func (mc *MetricsCollector) MetricsClient() metricsclient.Interface {
 	return mc.metricsClientset
 }
@@ -120,21 +86,21 @@ func (mc *MetricsCollector) MetricsClient() metricsclient.Interface {
 func (mc *MetricsCollector) Collect(ctx context.Context) error {
 	mc.mu.Lock()
 	defer mc.mu.Unlock()
-	nodes, err := mc.nodeLister.List(mc.nodeSelector)
+	nodes, err := mc.clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		return fmt.Errorf("unable to list nodes: %v", err)
 	}
 
-	for _, node := range nodes {
-		metrics, err := mc.metricsClientset.MetricsV1beta1().NodeMetricses().Get(ctx, node.Name, metav1.GetOptions{})
+	for _, node := range nodes.Items {
+		metrics, err := mc.metricsClientset.MetricsV1beta1().NodeMetricses().Get(context.TODO(), node.Name, metav1.GetOptions{})
 		if err != nil {
-			klog.ErrorS(err, "Error fetching metrics", "node", node.Name)
+			fmt.Printf("Error fetching metrics for node %s: %v\n", node.Name, err)
 			// No entry -> duplicate the previous value -> do nothing as beta*PV + (1-beta)*PV = PV
 			continue
 		}
 
 		if _, exists := mc.nodes[node.Name]; !exists {
-			mc.nodes[node.Name] = api.ReferencedResourceList{
+			mc.nodes[node.Name] = map[v1.ResourceName]*resource.Quantity{
 				v1.ResourceCPU:    utilptr.To[resource.Quantity](metrics.Usage.Cpu().DeepCopy()),
 				v1.ResourceMemory: utilptr.To[resource.Quantity](metrics.Usage.Memory().DeepCopy()),
 			}
@@ -143,12 +109,17 @@ func (mc *MetricsCollector) Collect(ctx context.Context) error {
 			mc.nodes[node.Name][v1.ResourceCPU].SetMilli(
 				weightedAverage(mc.nodes[node.Name][v1.ResourceCPU].MilliValue(), metrics.Usage.Cpu().MilliValue()),
 			)
-			mc.nodes[node.Name][v1.ResourceMemory].Set(
-				weightedAverage(mc.nodes[node.Name][v1.ResourceMemory].Value(), metrics.Usage.Memory().Value()),
+			mc.nodes[node.Name][v1.ResourceMemory].SetMilli(
+				weightedAverage(mc.nodes[node.Name][v1.ResourceMemory].MilliValue(), metrics.Usage.Memory().MilliValue()),
 			)
 		}
+
+		// Display CPU and memory usage
+		// fmt.Printf("%s: %vm, %vMi\n", node.Name, metrics.Usage.Cpu().MilliValue(), metrics.Usage.Memory().Value()/(1024*1024))
+		// fmt.Printf("%s: %vm, %vMi\n", node.Name, mc.nodes[node.Name][v1.ResourceCPU].MilliValue(), mc.nodes[node.Name][v1.ResourceMemory].Value()/(1024*1024))
 	}
 
-	mc.hasSynced = true
+	fmt.Printf("--\n")
+
 	return nil
 }

pkg/descheduler/metricscollector/metricscollector_test.go

@@ -18,30 +18,57 @@ package metricscollector
 
 import (
 	"context"
-	"math"
+	"os"
 	"testing"
 
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
+	metricsclient "k8s.io/metrics/pkg/client/clientset/versioned"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/informers"
+
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	fakemetricsclient "k8s.io/metrics/pkg/client/clientset/versioned/fake"
-
-	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/test"
 )
 
-func checkCpuNodeUsage(t *testing.T, usage api.ReferencedResourceList, millicpu int64) {
+func TestMetricsCollector1(t *testing.T) {
+	kubeconfig := os.Getenv("KUBECONFIG")
+
+	// Use the kubeconfig to build the Kubernetes client
+	config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
+	if err != nil {
+		panic(err.Error())
+	}
+
+	// Create the standard Kubernetes clientset
+	clientset, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		panic(err.Error())
+	}
+
+	// Create the metrics clientset to access the metrics.k8s.io API
+	metricsClientset, err := metricsclient.NewForConfig(config)
+	if err != nil {
+		panic(err.Error())
+	}
+
+	collector := NewMetricsCollector(clientset, metricsClientset)
+	collector.Run(context.TODO())
+	// collector.Collect(context.TODO())
+}
+
+func checkCpuNodeUsage(t *testing.T, usage map[v1.ResourceName]*resource.Quantity, millicpu int64) {
 	t.Logf("current node cpu usage: %v\n", usage[v1.ResourceCPU].MilliValue())
 	if usage[v1.ResourceCPU].MilliValue() != millicpu {
 		t.Fatalf("cpu node usage expected to be %v, got %v instead", millicpu, usage[v1.ResourceCPU].MilliValue())
 	}
 }
 
-func TestMetricsCollector(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1beta1", Resource: "nodes"}
+func TestMetricsCollector2(t *testing.T) {
+	gvr := schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1beta1", Resource: "nodemetricses"}
 
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
@@ -52,24 +79,13 @@ func TestMetricsCollector(t *testing.T) {
 	n3metrics := test.BuildNodeMetrics("n3", 300, 1714978816)
 
 	clientset := fakeclientset.NewSimpleClientset(n1, n2, n3)
-	metricsClientset := fakemetricsclient.NewSimpleClientset()
-	metricsClientset.Tracker().Create(gvr, n1metrics, "")
-	metricsClientset.Tracker().Create(gvr, n2metrics, "")
-	metricsClientset.Tracker().Create(gvr, n3metrics, "")
-
-	ctx := context.TODO()
-	sharedInformerFactory := informers.NewSharedInformerFactory(clientset, 0)
-	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
+	metricsClientset := fakemetricsclient.NewSimpleClientset(n1metrics, n2metrics, n3metrics)
 
 	t.Logf("Set initial node cpu usage to 1400")
-	collector := NewMetricsCollector(nodeLister, metricsClientset, labels.Everything())
+	collector := NewMetricsCollector(clientset, metricsClientset)
 	collector.Collect(context.TODO())
 	nodesUsage, _ := collector.NodeUsage(n2)
 	checkCpuNodeUsage(t, nodesUsage, 1400)
-	allnodesUsage, _ := collector.AllNodesUsage()
-	checkCpuNodeUsage(t, allnodesUsage[n2.Name], 1400)
 
 	t.Logf("Set current node cpu usage to 500")
 	n2metrics.Usage[v1.ResourceCPU] = *resource.NewMilliQuantity(500, resource.DecimalSI)
@@ -77,66 +93,11 @@ func TestMetricsCollector(t *testing.T) {
 	collector.Collect(context.TODO())
 	nodesUsage, _ = collector.NodeUsage(n2)
 	checkCpuNodeUsage(t, nodesUsage, 1310)
-	allnodesUsage, _ = collector.AllNodesUsage()
-	checkCpuNodeUsage(t, allnodesUsage[n2.Name], 1310)
 
-	t.Logf("Set current node cpu usage to 900")
+	t.Logf("Set current node cpu usage to 500")
 	n2metrics.Usage[v1.ResourceCPU] = *resource.NewMilliQuantity(900, resource.DecimalSI)
 	metricsClientset.Tracker().Update(gvr, n2metrics, "")
 	collector.Collect(context.TODO())
 	nodesUsage, _ = collector.NodeUsage(n2)
-	checkCpuNodeUsage(t, nodesUsage, 1269)
-	allnodesUsage, _ = collector.AllNodesUsage()
-	checkCpuNodeUsage(t, allnodesUsage[n2.Name], 1269)
-}
-
-func TestMetricsCollectorConvergence(t *testing.T) {
-	gvr := schema.GroupVersionResource{Group: "metrics.k8s.io", Version: "v1beta1", Resource: "nodes"}
-
-	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
-	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
-	n3 := test.BuildTestNode("n3", 2000, 3000, 10, nil)
-
-	n1metrics := test.BuildNodeMetrics("n1", 400, 1714978816)
-	n2metrics := test.BuildNodeMetrics("n2", 1400, 1714978816)
-	n3metrics := test.BuildNodeMetrics("n3", 300, 1714978816)
-
-	clientset := fakeclientset.NewSimpleClientset(n1, n2, n3)
-	metricsClientset := fakemetricsclient.NewSimpleClientset()
-	metricsClientset.Tracker().Create(gvr, n1metrics, "")
-	metricsClientset.Tracker().Create(gvr, n2metrics, "")
-	metricsClientset.Tracker().Create(gvr, n3metrics, "")
-
-	ctx := context.TODO()
-	sharedInformerFactory := informers.NewSharedInformerFactory(clientset, 0)
-	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
-	t.Logf("Set initial node cpu usage to 1400")
-	collector := NewMetricsCollector(nodeLister, metricsClientset, labels.Everything())
-	collector.Collect(context.TODO())
-	nodesUsage, _ := collector.NodeUsage(n2)
-	checkCpuNodeUsage(t, nodesUsage, 1400)
-	allnodesUsage, _ := collector.AllNodesUsage()
-	checkCpuNodeUsage(t, allnodesUsage[n2.Name], 1400)
-
-	t.Logf("Set current node cpu/memory usage to 900/1614978816 and wait until it converges to it")
-	n2metrics.Usage[v1.ResourceCPU] = *resource.NewMilliQuantity(900, resource.DecimalSI)
-	n2metrics.Usage[v1.ResourceMemory] = *resource.NewQuantity(1614978816, resource.BinarySI)
-	metricsClientset.Tracker().Update(gvr, n2metrics, "")
-	converged := false
-	for i := 0; i < 300; i++ {
-		collector.Collect(context.TODO())
-		nodesUsage, _ = collector.NodeUsage(n2)
-		if math.Abs(float64(900-nodesUsage[v1.ResourceCPU].MilliValue())) < 6 && math.Abs(float64(1614978816-nodesUsage[v1.ResourceMemory].Value())) < 6 {
-			t.Logf("Node cpu/memory usage converged to 900+-5/1614978816+-5")
-			converged = true
-			break
-		}
-		t.Logf("The current node usage: cpu=%v, memory=%v", nodesUsage[v1.ResourceCPU].MilliValue(), nodesUsage[v1.ResourceMemory].Value())
-	}
-	if !converged {
-		t.Fatalf("The node usage did not converged to 900+-1")
-	}
+	checkCpuNodeUsage(t, nodesUsage, 1268)
 }

pkg/descheduler/node/node.go

@@ -28,10 +28,8 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	clientset "k8s.io/client-go/kubernetes"
 	listersv1 "k8s.io/client-go/listers/core/v1"
-	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/descheduler/pkg/api"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
@@ -79,22 +77,6 @@ func ReadyNodes(ctx context.Context, client clientset.Interface, nodeLister list
 	return readyNodes, nil
 }
 
-// ReadyNodesFromInterfaces converts a list of interface{} items to ready nodes.
-// Each interface{} item is expected to be a *v1.Node. Only ready nodes are returned.
-func ReadyNodesFromInterfaces(nodeInterfaces []interface{}) ([]*v1.Node, error) {
-	readyNodes := make([]*v1.Node, 0, len(nodeInterfaces))
-	for i, nodeInterface := range nodeInterfaces {
-		node, ok := nodeInterface.(*v1.Node)
-		if !ok {
-			return nil, fmt.Errorf("item at index %d is not a *v1.Node", i)
-		}
-		if IsReady(node) {
-			readyNodes = append(readyNodes, node)
-		}
-	}
-	return readyNodes, nil
-}
-
 // IsReady checks if the descheduler could run against given node.
 func IsReady(node *v1.Node) bool {
 	for i := range node.Status.Conditions {
@@ -122,51 +104,46 @@ func IsReady(node *v1.Node) bool {
 	return true
 }
 
-// NodeFit returns nil if the provided pod can be scheduled onto the provided node.
-// Otherwise, it returns an error explaining why the node does not fit the pod.
-//
+// NodeFit returns true if the provided pod can be scheduled onto the provided node.
 // This function is used when the NodeFit pod filtering feature of the Descheduler is enabled.
-// It considers a subset of the Kubernetes Scheduler's predicates
-// when deciding if a pod would fit on a node. More predicates may be added in the future.
-//
-// The checks are ordered from fastest to slowest to reduce unnecessary computation,
-// especially for nodes that are clearly unsuitable early in the evaluation process.
-func NodeFit(ctx context.Context, nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v1.Node) error {
-	// Check if the node is marked as unschedulable.
-	if IsNodeUnschedulable(node) {
-		return errors.New("node is not schedulable")
-	}
-
-	// Check if the pod matches the node's label selector (nodeSelector) and required node affinity rules.
+// This function currently considers a subset of the Kubernetes Scheduler's predicates when
+// deciding if a pod would fit on a node, but more predicates may be added in the future.
+// There should be no methods to modify nodes or pods in this method.
+func NodeFit(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v1.Node) error {
+	// Check node selector and required affinity
 	if ok, err := utils.PodMatchNodeSelector(pod, node); err != nil {
 		return err
 	} else if !ok {
 		return errors.New("pod node selector does not match the node label")
 	}
 
-	// Check taints on the node that have effect NoSchedule or NoExecute.
-	ok := utils.TolerationsTolerateTaintsWithFilter(ctx, pod.Spec.Tolerations, node.Spec.Taints, func(taint *v1.Taint) bool {
+	// Check taints (we only care about NoSchedule and NoExecute taints)
+	ok := utils.TolerationsTolerateTaintsWithFilter(pod.Spec.Tolerations, node.Spec.Taints, func(taint *v1.Taint) bool {
 		return taint.Effect == v1.TaintEffectNoSchedule || taint.Effect == v1.TaintEffectNoExecute
 	})
 	if !ok {
 		return errors.New("pod does not tolerate taints on the node")
 	}
 
-	// Check if the pod violates any inter-pod anti-affinity rules with existing pods on the node.
-	// This involves iterating over all pods assigned to the node and evaluating label selectors.
-	if match, err := podMatchesInterPodAntiAffinity(nodeIndexer, pod, node); err != nil {
-		return err
-	} else if match {
-		return errors.New("pod matches inter-pod anti-affinity rule of other pod on node")
-	}
-
-	// Check whether the node has enough available resources to accommodate the pod.
+	// Check if the pod can fit on a node based off it's requests
 	if pod.Spec.NodeName == "" || pod.Spec.NodeName != node.Name {
 		if ok, reqError := fitsRequest(nodeIndexer, pod, node); !ok {
 			return reqError
 		}
 	}
 
+	// Check if node is schedulable
+	if IsNodeUnschedulable(node) {
+		return errors.New("node is not schedulable")
+	}
+
+	// Check if pod matches inter-pod anti-affinity rule of pod on node
+	if match, err := podMatchesInterPodAntiAffinity(nodeIndexer, pod, node); err != nil {
+		return err
+	} else if match {
+		return errors.New("pod matches inter-pod anti-affinity rule of other pod on node")
+	}
+
 	return nil
 }
 
@@ -180,7 +157,7 @@ func podFitsNodes(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, no
 		if excludeFilter != nil && excludeFilter(pod, node) {
 			return
 		}
-		err := NodeFit(ctx, nodeIndexer, pod, node)
+		err := NodeFit(nodeIndexer, pod, node)
 		if err == nil {
 			klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 			atomic.AddInt32(&filteredLen, 1)
@@ -212,8 +189,8 @@ func PodFitsAnyNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod,
 
 // PodFitsCurrentNode checks if the given pod will fit onto the given node. The predicates used
 // to determine if the pod will fit can be found in the NodeFit function.
-func PodFitsCurrentNode(ctx context.Context, nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v1.Node) bool {
-	err := NodeFit(ctx, nodeIndexer, pod, node)
+func PodFitsCurrentNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v1.Node) bool {
+	err := NodeFit(nodeIndexer, pod, node)
 	if err == nil {
 		klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 		return true
@@ -236,7 +213,7 @@ func IsNodeUnschedulable(node *v1.Node) bool {
 func fitsRequest(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v1.Node) (bool, error) {
 	// Get pod requests
 	podRequests, _ := utils.PodRequestsAndLimits(pod)
-	resourceNames := []v1.ResourceName{v1.ResourcePods}
+	resourceNames := make([]v1.ResourceName, 0, len(podRequests))
 	for name := range podRequests {
 		resourceNames = append(resourceNames, name)
 	}
@@ -258,8 +235,8 @@ func fitsRequest(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, nod
 			return false, fmt.Errorf("insufficient %v", resource)
 		}
 	}
-	// check pod num, at least one pod number is available
-	if quantity, ok := availableResources[v1.ResourcePods]; ok && quantity.MilliValue() <= 0 {
+	// check pod num, at least one pod number is avaibalbe
+	if availableResources[v1.ResourcePods].MilliValue() <= 0 {
 		return false, fmt.Errorf("insufficient %v", v1.ResourcePods)
 	}
 
@@ -267,7 +244,7 @@ func fitsRequest(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, nod
 }
 
 // nodeAvailableResources returns resources mapped to the quanitity available on the node.
-func nodeAvailableResources(nodeIndexer podutil.GetPodsAssignedToNodeFunc, node *v1.Node, resourceNames []v1.ResourceName, podUtilization podutil.PodUtilizationFnc) (api.ReferencedResourceList, error) {
+func nodeAvailableResources(nodeIndexer podutil.GetPodsAssignedToNodeFunc, node *v1.Node, resourceNames []v1.ResourceName, podUtilization podutil.PodUtilizationFnc) (map[v1.ResourceName]*resource.Quantity, error) {
 	podsOnNode, err := podutil.ListPodsOnANode(node.Name, nodeIndexer, nil)
 	if err != nil {
 		return nil, err
@@ -276,18 +253,13 @@ func nodeAvailableResources(nodeIndexer podutil.GetPodsAssignedToNodeFunc, node
 	if err != nil {
 		return nil, err
 	}
-	remainingResources := api.ReferencedResourceList{}
+	remainingResources := map[v1.ResourceName]*resource.Quantity{
+		v1.ResourceCPU:    resource.NewMilliQuantity(node.Status.Allocatable.Cpu().MilliValue()-nodeUtilization[v1.ResourceCPU].MilliValue(), resource.DecimalSI),
+		v1.ResourceMemory: resource.NewQuantity(node.Status.Allocatable.Memory().Value()-nodeUtilization[v1.ResourceMemory].Value(), resource.BinarySI),
+		v1.ResourcePods:   resource.NewQuantity(node.Status.Allocatable.Pods().Value()-nodeUtilization[v1.ResourcePods].Value(), resource.DecimalSI),
+	}
 	for _, name := range resourceNames {
-		if IsBasicResource(name) {
-			switch name {
-			case v1.ResourceCPU:
-				remainingResources[name] = resource.NewMilliQuantity(node.Status.Allocatable.Cpu().MilliValue()-nodeUtilization[v1.ResourceCPU].MilliValue(), resource.DecimalSI)
-			case v1.ResourceMemory:
-				remainingResources[name] = resource.NewQuantity(node.Status.Allocatable.Memory().Value()-nodeUtilization[v1.ResourceMemory].Value(), resource.BinarySI)
-			case v1.ResourcePods:
-				remainingResources[name] = resource.NewQuantity(node.Status.Allocatable.Pods().Value()-nodeUtilization[v1.ResourcePods].Value(), resource.DecimalSI)
-			}
-		} else {
+		if !IsBasicResource(name) {
 			if _, exists := node.Status.Allocatable[name]; exists {
 				allocatableResource := node.Status.Allocatable[name]
 				remainingResources[name] = resource.NewQuantity(allocatableResource.Value()-nodeUtilization[name].Value(), resource.DecimalSI)
@@ -301,17 +273,14 @@ func nodeAvailableResources(nodeIndexer podutil.GetPodsAssignedToNodeFunc, node
 }
 
 // NodeUtilization returns the resources requested by the given pods. Only resources supplied in the resourceNames parameter are calculated.
-func NodeUtilization(pods []*v1.Pod, resourceNames []v1.ResourceName, podUtilization podutil.PodUtilizationFnc) (api.ReferencedResourceList, error) {
-	totalUtilization := api.ReferencedResourceList{}
+func NodeUtilization(pods []*v1.Pod, resourceNames []v1.ResourceName, podUtilization podutil.PodUtilizationFnc) (map[v1.ResourceName]*resource.Quantity, error) {
+	totalUtilization := map[v1.ResourceName]*resource.Quantity{
+		v1.ResourceCPU:    resource.NewMilliQuantity(0, resource.DecimalSI),
+		v1.ResourceMemory: resource.NewQuantity(0, resource.BinarySI),
+		v1.ResourcePods:   resource.NewQuantity(int64(len(pods)), resource.DecimalSI),
+	}
 	for _, name := range resourceNames {
-		switch name {
-		case v1.ResourceCPU:
-			totalUtilization[name] = resource.NewMilliQuantity(0, resource.DecimalSI)
-		case v1.ResourceMemory:
-			totalUtilization[name] = resource.NewQuantity(0, resource.BinarySI)
-		case v1.ResourcePods:
-			totalUtilization[name] = resource.NewQuantity(int64(len(pods)), resource.DecimalSI)
-		default:
+		if !IsBasicResource(name) {
 			totalUtilization[name] = resource.NewQuantity(0, resource.DecimalSI)
 		}
 	}
@@ -417,22 +386,3 @@ func podMatchesInterPodAntiAffinity(nodeIndexer podutil.GetPodsAssignedToNodeFun
 
 	return false, nil
 }
-
-// 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 AddNodeSelectorIndexer(nodeInformer cache.SharedIndexInformer, indexerName string, nodeSelector labels.Selector) error {
-	return nodeInformer.AddIndexers(cache.Indexers{
-		indexerName: func(obj interface{}) ([]string, error) {
-			node, ok := obj.(*v1.Node)
-			if !ok {
-				return []string{}, errors.New("unexpected object")
-			}
-
-			if nodeSelector.Matches(labels.Set(node.Labels)) {
-				return []string{indexerName}, nil
-			}
-
-			return []string{}, nil
-		},
-	})
-}

pkg/descheduler/node/node_test.go

@@ -19,20 +19,15 @@ package node
 import (
 	"context"
 	"errors"
-	"sort"
-	"strings"
 	"sync"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/utils/ptr"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -83,205 +78,13 @@ func TestReadyNodesWithNodeSelector(t *testing.T) {
 	sharedInformerFactory.WaitForCacheSync(stopChannel)
 	defer close(stopChannel)
 
-	// First verify nodeLister returns non-empty list
-	allNodes, err := nodeLister.List(labels.Everything())
-	if err != nil {
-		t.Fatalf("Failed to list nodes from nodeLister: %v", err)
-	}
-	if len(allNodes) == 0 {
-		t.Fatal("Expected nodeLister to return non-empty list of nodes")
-	}
-	if len(allNodes) != 2 {
-		t.Errorf("Expected nodeLister to return 2 nodes, got %d", len(allNodes))
-	}
-
-	// Now test ReadyNodes
 	nodes, _ := ReadyNodes(ctx, fakeClient, nodeLister, nodeSelector)
 
-	if len(nodes) != 1 {
-		t.Errorf("Expected 1 node, got %d", len(nodes))
-	} else if nodes[0].Name != "node1" {
+	if nodes[0].Name != "node1" {
 		t.Errorf("Expected node1, got %s", nodes[0].Name)
 	}
 }
 
-func TestReadyNodesFromInterfaces(t *testing.T) {
-	node1 := test.BuildTestNode("node1", 1000, 2000, 9, nil)
-	node2 := test.BuildTestNode("node2", 1000, 2000, 9, nil)
-	node2.Status.Conditions = []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionFalse}}
-	node3 := test.BuildTestNode("node3", 1000, 2000, 9, nil)
-
-	tests := []struct {
-		description    string
-		nodeInterfaces []interface{}
-		expectedCount  int
-		expectedNames  []string
-		expectError    bool
-		errorContains  string
-	}{
-		{
-			description:    "All nodes are ready",
-			nodeInterfaces: []interface{}{node1, node3},
-			expectedCount:  2,
-			expectedNames:  []string{"node1", "node3"},
-			expectError:    false,
-		},
-		{
-			description:    "One node is not ready",
-			nodeInterfaces: []interface{}{node1, node2, node3},
-			expectedCount:  2,
-			expectedNames:  []string{"node1", "node3"},
-			expectError:    false,
-		},
-		{
-			description:    "Empty list",
-			nodeInterfaces: []interface{}{},
-			expectedCount:  0,
-			expectedNames:  []string{},
-			expectError:    false,
-		},
-		{
-			description:    "Invalid type in list",
-			nodeInterfaces: []interface{}{node1, "not a node", node3},
-			expectedCount:  0,
-			expectError:    true,
-			errorContains:  "item at index 1 is not a *v1.Node",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.description, func(t *testing.T) {
-			nodes, err := ReadyNodesFromInterfaces(tc.nodeInterfaces)
-
-			if tc.expectError {
-				if err == nil {
-					t.Errorf("Expected error but got none")
-				} else if tc.errorContains != "" && !strings.Contains(err.Error(), tc.errorContains) {
-					t.Errorf("Expected error to contain '%s', got '%s'", tc.errorContains, err.Error())
-				}
-				return
-			}
-
-			if err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			if len(nodes) != tc.expectedCount {
-				t.Errorf("Expected %d nodes, got %d", tc.expectedCount, len(nodes))
-			}
-
-			for i, expectedName := range tc.expectedNames {
-				if i >= len(nodes) {
-					t.Errorf("Missing node at index %d, expected %s", i, expectedName)
-					continue
-				}
-				if nodes[i].Name != expectedName {
-					t.Errorf("Expected node at index %d to be %s, got %s", i, expectedName, nodes[i].Name)
-				}
-			}
-		})
-	}
-}
-
-func TestAddNodeSelectorIndexer(t *testing.T) {
-	node1 := test.BuildTestNode("node1", 1000, 2000, 9, nil)
-	node1.Labels = map[string]string{"type": "compute", "zone": "us-east-1"}
-	node2 := test.BuildTestNode("node2", 1000, 2000, 9, nil)
-	node2.Labels = map[string]string{"type": "infra", "zone": "us-west-1"}
-	node3 := test.BuildTestNode("node3", 1000, 2000, 9, nil)
-	node3.Labels = map[string]string{"type": "compute", "zone": "us-west-1"}
-
-	tests := []struct {
-		description     string
-		indexerName     string
-		selectorString  string
-		expectedMatches []string
-	}{
-		{
-			description:     "Index nodes by type=compute",
-			indexerName:     "computeNodes",
-			selectorString:  "type=compute",
-			expectedMatches: []string{"node1", "node3"},
-		},
-		{
-			description:     "Index nodes by type=infra",
-			indexerName:     "infraNodes",
-			selectorString:  "type=infra",
-			expectedMatches: []string{"node2"},
-		},
-		{
-			description:     "Index nodes by zone=us-west-1",
-			indexerName:     "westZoneNodes",
-			selectorString:  "zone=us-west-1",
-			expectedMatches: []string{"node2", "node3"},
-		},
-		{
-			description:     "Index nodes with multiple labels",
-			indexerName:     "computeEastNodes",
-			selectorString:  "type=compute,zone=us-east-1",
-			expectedMatches: []string{"node1"},
-		},
-		{
-			description:     "No matching nodes",
-			indexerName:     "noMatchNodes",
-			selectorString:  "type=storage",
-			expectedMatches: []string{},
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.description, func(t *testing.T) {
-			fakeClient := fake.NewSimpleClientset(node1, node2, node3)
-			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			nodeInformer := sharedInformerFactory.Core().V1().Nodes().Informer()
-
-			selector, err := labels.Parse(tc.selectorString)
-			if err != nil {
-				t.Fatalf("Failed to parse selector: %v", err)
-			}
-
-			err = AddNodeSelectorIndexer(nodeInformer, tc.indexerName, selector)
-			if err != nil {
-				t.Fatalf("AddNodeSelectorIndexer failed: %v", err)
-			}
-
-			stopChannel := make(chan struct{})
-			sharedInformerFactory.Start(stopChannel)
-			sharedInformerFactory.WaitForCacheSync(stopChannel)
-			defer close(stopChannel)
-
-			indexer := nodeInformer.GetIndexer()
-			objs, err := indexer.ByIndex(tc.indexerName, tc.indexerName)
-			if err != nil {
-				t.Errorf("Failed to query indexer: %v", err)
-				return
-			}
-
-			// Extract node names from the results
-			actualMatches := make([]string, 0, len(objs))
-			for _, obj := range objs {
-				node, ok := obj.(*v1.Node)
-				if !ok {
-					t.Errorf("Expected *v1.Node, got %T", obj)
-					continue
-				}
-				actualMatches = append(actualMatches, node.Name)
-			}
-
-			// Sort both slices for consistent comparison
-			sort.Strings(actualMatches)
-			expectedMatches := make([]string, len(tc.expectedMatches))
-			copy(expectedMatches, tc.expectedMatches)
-			sort.Strings(expectedMatches)
-
-			// Compare using cmp.Diff
-			if diff := cmp.Diff(expectedMatches, actualMatches); diff != "" {
-				t.Errorf("Node matches mismatch (-want +got):\n%s", diff)
-			}
-		})
-	}
-}
-
 func TestIsNodeUnschedulable(t *testing.T) {
 	tests := []struct {
 		description     string
@@ -413,7 +216,7 @@ func TestPodFitsCurrentNode(t *testing.T) {
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
-			actual := PodFitsCurrentNode(ctx, getPodsAssignedToNode, tc.pod, tc.node)
+			actual := PodFitsCurrentNode(getPodsAssignedToNode, tc.pod, tc.node)
 			if actual != tc.success {
 				t.Errorf("Test %#v failed", tc.description)
 			}
@@ -1217,64 +1020,6 @@ func TestNodeFit(t *testing.T) {
 			node:        node,
 			podsOnNode:  []*v1.Pod{},
 		},
-		{
-			description: "Pod with native sidecars with too much cpu does not fit on node",
-			pod: test.BuildTestPod("p1", 1, 100, "", func(pod *v1.Pod) {
-				pod.Spec.InitContainers = append(pod.Spec.InitContainers, v1.Container{
-					RestartPolicy: ptr.To(v1.ContainerRestartPolicyAlways), // native sidecar
-					Resources: v1.ResourceRequirements{
-						Requests: createResourceList(100000, 100*1000*1000, 0),
-					},
-				})
-			}),
-			node:       node,
-			podsOnNode: []*v1.Pod{},
-			err:        errors.New("insufficient cpu"),
-		},
-		{
-			description: "Pod with native sidecars with too much memory does not fit on node",
-			pod: test.BuildTestPod("p1", 1, 100, "", func(pod *v1.Pod) {
-				pod.Spec.InitContainers = append(pod.Spec.InitContainers, v1.Container{
-					RestartPolicy: ptr.To(v1.ContainerRestartPolicyAlways), // native sidecar
-					Resources: v1.ResourceRequirements{
-						Requests: createResourceList(100, 1000*1000*1000*1000, 0),
-					},
-				})
-			}),
-			node:       node,
-			podsOnNode: []*v1.Pod{},
-			err:        errors.New("insufficient memory"),
-		},
-		{
-			description: "Pod with small native sidecars fits on node",
-			pod: test.BuildTestPod("p1", 1, 100, "", func(pod *v1.Pod) {
-				pod.Spec.InitContainers = append(pod.Spec.InitContainers, v1.Container{
-					RestartPolicy: ptr.To(v1.ContainerRestartPolicyAlways), // native sidecar
-					Resources: v1.ResourceRequirements{
-						Requests: createResourceList(100, 100*1000*1000, 0),
-					},
-				})
-			}),
-			node:       node,
-			podsOnNode: []*v1.Pod{},
-		},
-		{
-			description: "Pod with large overhead does not fit on node",
-			pod: test.BuildTestPod("p1", 1, 100, "", func(pod *v1.Pod) {
-				pod.Spec.Overhead = createResourceList(100000, 100*1000*1000, 0)
-			}),
-			node:       node,
-			podsOnNode: []*v1.Pod{},
-			err:        errors.New("insufficient cpu"),
-		},
-		{
-			description: "Pod with small overhead fits on node",
-			pod: test.BuildTestPod("p1", 1, 100, "", func(pod *v1.Pod) {
-				pod.Spec.Overhead = createResourceList(1, 1*1000*1000, 0)
-			}),
-			node:       node,
-			podsOnNode: []*v1.Pod{},
-		},
 	}
 
 	for _, tc := range tests {
@@ -1298,7 +1043,7 @@ func TestNodeFit(t *testing.T) {
 
 			sharedInformerFactory.Start(ctx.Done())
 			sharedInformerFactory.WaitForCacheSync(ctx.Done())
-			err = NodeFit(ctx, getPodsAssignedToNode, tc.pod, tc.node)
+			err = NodeFit(getPodsAssignedToNode, tc.pod, tc.node)
 			if (err == nil && tc.err != nil) || (err != nil && err.Error() != tc.err.Error()) {
 				t.Errorf("Test %#v failed, got %v, expect %v", tc.description, err, tc.err)
 			}

pkg/descheduler/pod/pods.go

@@ -25,7 +25,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/cache"
 
-	evictionutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
@@ -255,32 +254,14 @@ func SortPodsBasedOnPriorityLowToHigh(pods []*v1.Pod) {
 			return false
 		}
 		if (pods[j].Spec.Priority == nil && pods[i].Spec.Priority == nil) || (*pods[i].Spec.Priority == *pods[j].Spec.Priority) {
-			iIsBestEffortPod := IsBestEffortPod(pods[i])
-			jIsBestEffortPod := IsBestEffortPod(pods[j])
-			iIsBurstablePod := IsBurstablePod(pods[i])
-			jIsBurstablePod := IsBurstablePod(pods[j])
-			iIsGuaranteedPod := IsGuaranteedPod(pods[i])
-			jIsGuaranteedPod := IsGuaranteedPod(pods[j])
-			if (iIsBestEffortPod && jIsBestEffortPod) || (iIsBurstablePod && jIsBurstablePod) || (iIsGuaranteedPod && jIsGuaranteedPod) {
-				iHasNoEvictonPolicy := evictionutils.HaveNoEvictionAnnotation(pods[i])
-				jHasNoEvictonPolicy := evictionutils.HaveNoEvictionAnnotation(pods[j])
-				if !iHasNoEvictonPolicy {
-					return true
-				}
-				if !jHasNoEvictonPolicy {
-					return false
-				}
+			if IsBestEffortPod(pods[i]) {
 				return true
 			}
-			if iIsBestEffortPod {
-				return true
-			}
-			if iIsBurstablePod && jIsGuaranteedPod {
+			if IsBurstablePod(pods[i]) && IsGuaranteedPod(pods[j]) {
 				return true
 			}
 			return false
 		}
-
 		return *pods[i].Spec.Priority < *pods[j].Spec.Priority
 	})
 }
@@ -292,28 +273,6 @@ func SortPodsBasedOnAge(pods []*v1.Pod) {
 	})
 }
 
-// HasMatchingContainerWaitingState returns true if any container status has a
-// waiting reason present in the given set.
-func HasMatchingContainerWaitingState(statuses []v1.ContainerStatus, states sets.Set[string]) bool {
-	for _, cs := range statuses {
-		if cs.State.Waiting != nil && states.Has(cs.State.Waiting.Reason) {
-			return true
-		}
-	}
-	return false
-}
-
-// HasMatchingContainerTerminatedState returns true if any container status has
-// a terminated reason present in the given set.
-func HasMatchingContainerTerminatedState(statuses []v1.ContainerStatus, states sets.Set[string]) bool {
-	for _, cs := range statuses {
-		if cs.State.Terminated != nil && states.Has(cs.State.Terminated.Reason) {
-			return true
-		}
-	}
-	return false
-}
-
 func GroupByNodeName(pods []*v1.Pod) map[string][]*v1.Pod {
 	m := make(map[string][]*v1.Pod)
 	for i := 0; i < len(pods); i++ {

pkg/descheduler/pod/pods_test.go

@@ -117,14 +117,6 @@ func TestListPodsOnANode(t *testing.T) {
 	}
 }
 
-func getPodListNames(pods []*v1.Pod) []string {
-	names := []string{}
-	for _, pod := range pods {
-		names = append(names, pod.Name)
-	}
-	return names
-}
-
 func TestSortPodsBasedOnPriorityLowToHigh(t *testing.T) {
 	n1 := test.BuildTestNode("n1", 4000, 3000, 9, nil)
 
@@ -157,70 +149,11 @@ func TestSortPodsBasedOnPriorityLowToHigh(t *testing.T) {
 	p6 := test.BuildTestPod("p6", 400, 100, n1.Name, test.MakeGuaranteedPod)
 	p6.Spec.Priority = nil
 
-	p7 := test.BuildTestPod("p7", 400, 0, n1.Name, func(pod *v1.Pod) {
-		test.SetPodPriority(pod, lowPriority)
-		pod.Annotations = map[string]string{
-			"descheduler.alpha.kubernetes.io/prefer-no-eviction": "",
-		}
-	})
-
-	// BestEffort
-	p8 := test.BuildTestPod("p8", 400, 0, n1.Name, func(pod *v1.Pod) {
-		test.SetPodPriority(pod, highPriority)
-		test.MakeBestEffortPod(pod)
-		pod.Annotations = map[string]string{
-			"descheduler.alpha.kubernetes.io/prefer-no-eviction": "",
-		}
-	})
-
-	// Burstable
-	p9 := test.BuildTestPod("p9", 400, 0, n1.Name, func(pod *v1.Pod) {
-		test.SetPodPriority(pod, highPriority)
-		test.MakeBurstablePod(pod)
-		pod.Annotations = map[string]string{
-			"descheduler.alpha.kubernetes.io/prefer-no-eviction": "",
-		}
-	})
-
-	// Guaranteed
-	p10 := test.BuildTestPod("p10", 400, 100, n1.Name, func(pod *v1.Pod) {
-		test.SetPodPriority(pod, highPriority)
-		test.MakeGuaranteedPod(pod)
-		pod.Annotations = map[string]string{
-			"descheduler.alpha.kubernetes.io/prefer-no-eviction": "",
-		}
-	})
-
-	// Burstable
-	p11 := test.BuildTestPod("p11", 400, 0, n1.Name, func(pod *v1.Pod) {
-		test.MakeBurstablePod(pod)
-	})
-
-	// Burstable
-	p12 := test.BuildTestPod("p12", 400, 0, n1.Name, func(pod *v1.Pod) {
-		test.MakeBurstablePod(pod)
-		pod.Annotations = map[string]string{
-			"descheduler.alpha.kubernetes.io/prefer-no-eviction": "",
-		}
-	})
-
-	podList := []*v1.Pod{p1, p8, p9, p10, p2, p3, p4, p5, p6, p7, p11, p12}
-	// p5: no priority, best effort
-	// p11: no priority, burstable
-	// p6: no priority, guaranteed
-	// p1: low priority
-	// p7: low priority, prefer-no-eviction
-	// p2: high priority, best effort
-	// p8: high priority, best effort, prefer-no-eviction
-	// p3: high priority, burstable
-	// p9: high priority, burstable, prefer-no-eviction
-	// p4: high priority, guaranteed
-	// p10: high priority, guaranteed, prefer-no-eviction
-	expectedPodList := []*v1.Pod{p5, p11, p12, p6, p1, p7, p2, p8, p3, p9, p4, p10}
+	podList := []*v1.Pod{p4, p3, p2, p1, p6, p5}
 
 	SortPodsBasedOnPriorityLowToHigh(podList)
-	if !reflect.DeepEqual(getPodListNames(podList), getPodListNames(expectedPodList)) {
-		t.Errorf("Pods were sorted in an unexpected order: %v, expected %v", getPodListNames(podList), getPodListNames(expectedPodList))
+	if !reflect.DeepEqual(podList[len(podList)-1], p4) {
+		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])
 	}
 }
 

pkg/descheduler/policyconfig.go

@@ -19,7 +19,6 @@ package descheduler
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"os"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -63,22 +62,21 @@ func decode(policyConfigFile string, policy []byte, client clientset.Interface,
 	if err != nil {
 		return nil, err
 	}
-	return setDefaults(*internalPolicy, registry, client)
+
+	setDefaults(*internalPolicy, registry, client)
+
+	return internalPolicy, nil
 }
 
-func setDefaults(in api.DeschedulerPolicy, registry pluginregistry.Registry, client clientset.Interface) (*api.DeschedulerPolicy, error) {
-	var err error
+func setDefaults(in api.DeschedulerPolicy, registry pluginregistry.Registry, client clientset.Interface) *api.DeschedulerPolicy {
 	for idx, profile := range in.Profiles {
 		// If we need to set defaults coming from loadtime in each profile we do it here
-		in.Profiles[idx], err = setDefaultEvictor(profile, client)
-		if err != nil {
-			return nil, err
-		}
+		in.Profiles[idx] = setDefaultEvictor(profile, client)
 		for _, pluginConfig := range profile.PluginConfigs {
 			setDefaultsPluginConfig(&pluginConfig, registry)
 		}
 	}
-	return &in, nil
+	return &in
 }
 
 func setDefaultsPluginConfig(pluginConfig *api.PluginConfig, registry pluginregistry.Registry) {
@@ -99,7 +97,7 @@ func findPluginName(names []string, key string) bool {
 	return false
 }
 
-func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interface) (api.DeschedulerProfile, error) {
+func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interface) api.DeschedulerProfile {
 	newPluginConfig := api.PluginConfig{
 		Name: defaultevictor.PluginName,
 		Args: &defaultevictor.DefaultEvictorArgs{
@@ -107,11 +105,6 @@ func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interfac
 			EvictSystemCriticalPods: false,
 			IgnorePvcPods:           false,
 			EvictFailedBarePods:     false,
-			IgnorePodsWithoutPDB:    false,
-			PodProtections: defaultevictor.PodProtections{
-				DefaultDisabled: []defaultevictor.PodProtection{},
-				ExtraEnabled:    []defaultevictor.PodProtection{},
-			},
 		},
 	}
 
@@ -134,19 +127,18 @@ func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interfac
 	thresholdPriority, err := utils.GetPriorityValueFromPriorityThreshold(context.TODO(), client, defaultevictorPluginConfig.Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold)
 	if err != nil {
 		klog.Error(err, "Failed to get threshold priority from args")
-		return profile, err
 	}
 	profile.PluginConfigs[idx].Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold = &api.PriorityThreshold{}
 	profile.PluginConfigs[idx].Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold.Value = &thresholdPriority
-	return profile, nil
+	return profile
 }
 
 func validateDeschedulerConfiguration(in api.DeschedulerPolicy, registry pluginregistry.Registry) error {
-	var errorsInPolicy []error
+	var errorsInProfiles []error
 	for _, profile := range in.Profiles {
 		for _, pluginConfig := range profile.PluginConfigs {
 			if _, ok := registry[pluginConfig.Name]; !ok {
-				errorsInPolicy = append(errorsInPolicy, fmt.Errorf("in profile %s: plugin %s in pluginConfig not registered", profile.Name, pluginConfig.Name))
+				errorsInProfiles = append(errorsInProfiles, fmt.Errorf("in profile %s: plugin %s in pluginConfig not registered", profile.Name, pluginConfig.Name))
 				continue
 			}
 
@@ -155,41 +147,9 @@ func validateDeschedulerConfiguration(in api.DeschedulerPolicy, registry pluginr
 				continue
 			}
 			if err := pluginUtilities.PluginArgValidator(pluginConfig.Args); err != nil {
-				errorsInPolicy = append(errorsInPolicy, fmt.Errorf("in profile %s: %s", profile.Name, err.Error()))
+				errorsInProfiles = append(errorsInProfiles, fmt.Errorf("in profile %s: %s", profile.Name, err.Error()))
 			}
 		}
 	}
-	providers := map[api.MetricsSource]api.MetricsProvider{}
-	for _, provider := range in.MetricsProviders {
-		if _, ok := providers[provider.Source]; ok {
-			errorsInPolicy = append(errorsInPolicy, fmt.Errorf("metric provider %q is already configured, each source can be configured only once", provider.Source))
-		} else {
-			providers[provider.Source] = provider
-		}
-	}
-	if _, exists := providers[api.KubernetesMetrics]; exists && in.MetricsCollector != nil && in.MetricsCollector.Enabled {
-		errorsInPolicy = append(errorsInPolicy, fmt.Errorf("it is not allowed to combine metrics provider when metrics collector is enabled"))
-	}
-	if prometheusConfig, exists := providers[api.PrometheusMetrics]; exists {
-		if prometheusConfig.Prometheus == nil {
-			errorsInPolicy = append(errorsInPolicy, fmt.Errorf("prometheus configuration is required when prometheus source is enabled"))
-		} else {
-			if prometheusConfig.Prometheus.URL == "" {
-				errorsInPolicy = append(errorsInPolicy, fmt.Errorf("prometheus URL is required when prometheus is enabled"))
-			} else if _, err := url.Parse(prometheusConfig.Prometheus.URL); err != nil {
-				errorsInPolicy = append(errorsInPolicy, fmt.Errorf("error parsing prometheus URL: %v", err))
-			}
-
-			if prometheusConfig.Prometheus.AuthToken != nil {
-				secretRef := prometheusConfig.Prometheus.AuthToken.SecretReference
-				if secretRef == nil {
-					errorsInPolicy = append(errorsInPolicy, fmt.Errorf("prometheus authToken secret is expected to be set when authToken field is"))
-				} else if secretRef.Name == "" || secretRef.Namespace == "" {
-					errorsInPolicy = append(errorsInPolicy, fmt.Errorf("prometheus authToken secret reference does not set both namespace and name"))
-				}
-			}
-		}
-	}
-
-	return utilerrors.NewAggregate(errorsInPolicy)
+	return utilerrors.NewAggregate(errorsInProfiles)
 }

pkg/descheduler/policyconfig_test.go

@@ -17,12 +17,10 @@ limitations under the License.
 package descheduler
 
 import (
-	"errors"
 	"fmt"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-
 	"k8s.io/apimachinery/pkg/conversion"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	utilptr "k8s.io/utils/ptr"
@@ -123,25 +121,6 @@ profiles:
 				},
 			},
 		},
-		{
-			description: "v1alpha2 to internal, validate error handling (priorityThreshold exceeding maximum)",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        priorityThreshold:
-          value: 2000000001
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"
-`),
-			result: nil,
-			err:    errors.New("priority threshold can't be greater than 2000000000"),
-		},
 	}
 
 	for _, tc := range testCases {
@@ -212,153 +191,12 @@ func TestValidateDeschedulerConfiguration(t *testing.T) {
 			},
 			result: fmt.Errorf("[in profile RemoveFailedPods: only one of Include/Exclude namespaces can be set, in profile RemovePodsViolatingTopologySpreadConstraint: only one of Include/Exclude namespaces can be set]"),
 		},
-		{
-			description: "Duplicit metrics providers error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{Source: api.KubernetesMetrics},
-					{Source: api.KubernetesMetrics},
-				},
-			},
-			result: fmt.Errorf("metric provider \"KubernetesMetrics\" is already configured, each source can be configured only once"),
-		},
-		{
-			description: "Too many metrics providers error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsCollector: &api.MetricsCollector{
-					Enabled: true,
-				},
-				MetricsProviders: []api.MetricsProvider{
-					{Source: api.KubernetesMetrics},
-				},
-			},
-			result: fmt.Errorf("it is not allowed to combine metrics provider when metrics collector is enabled"),
-		},
-		{
-			description: "missing prometheus url error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source:     api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{},
-					},
-				},
-			},
-			result: fmt.Errorf("prometheus URL is required when prometheus is enabled"),
-		},
-		{
-			description: "prometheus url is not valid error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL: "http://example.com:-80",
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("error parsing prometheus URL: parse \"http://example.com:-80\": invalid port \":-80\" after host"),
-		},
-		{
-			description: "prometheus authtoken with no secret reference error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL:       "https://example.com:80",
-							AuthToken: &api.AuthToken{},
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("prometheus authToken secret is expected to be set when authToken field is"),
-		},
-		{
-			description: "prometheus authtoken with empty secret reference error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL: "https://example.com:80",
-							AuthToken: &api.AuthToken{
-								SecretReference: &api.SecretReference{},
-							},
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("prometheus authToken secret reference does not set both namespace and name"),
-		},
-		{
-			description: "prometheus authtoken missing secret reference namespace error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL: "https://example.com:80",
-							AuthToken: &api.AuthToken{
-								SecretReference: &api.SecretReference{
-									Name: "secretname",
-								},
-							},
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("prometheus authToken secret reference does not set both namespace and name"),
-		},
-		{
-			description: "prometheus authtoken missing secret reference name error",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL: "https://example.com:80",
-							AuthToken: &api.AuthToken{
-								SecretReference: &api.SecretReference{
-									Namespace: "secretnamespace",
-								},
-							},
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("prometheus authToken secret reference does not set both namespace and name"),
-		},
-		{
-			description: "valid prometheus authtoken secret reference",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				MetricsProviders: []api.MetricsProvider{
-					{
-						Source: api.PrometheusMetrics,
-						Prometheus: &api.Prometheus{
-							URL: "https://example.com:80",
-							AuthToken: &api.AuthToken{
-								SecretReference: &api.SecretReference{
-									Name:      "secretname",
-									Namespace: "secretnamespace",
-								},
-							},
-						},
-					},
-				},
-			},
-		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			result := validateDeschedulerConfiguration(tc.deschedulerPolicy, pluginregistry.PluginRegistry)
-			if result == nil && tc.result != nil || result != nil && tc.result == nil {
-				t.Errorf("test '%s' failed. expected \n'%s', got \n'%s'", tc.description, tc.result, result)
-			} else if result == nil && tc.result == nil {
-				return
-			} else if result.Error() != tc.result.Error() {
+			if result.Error() != tc.result.Error() {
 				t.Errorf("test '%s' failed. expected \n'%s', got \n'%s'", tc.description, tc.result, result)
 			}
 		})
@@ -497,313 +335,6 @@ profiles:
 				},
 			},
 		},
-		{
-			description: "test DisabledDefaultPodProtections configuration",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          defaultDisabled:
-          - "PodsWithLocalStorage"
-          - "DaemonSetPods"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor" 
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									PodProtections: defaultevictor.PodProtections{
-										DefaultDisabled: []defaultevictor.PodProtection{
-											defaultevictor.PodsWithLocalStorage,
-											defaultevictor.DaemonSetPods,
-										},
-									},
-									PriorityThreshold: &api.PriorityThreshold{Value: utilptr.To[int32](2000000000)},
-									NodeFit:           true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "test podProtections extraEnabled configuration",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          extraEnabled:
-          - "PodsWithPVC"
-          - "PodsWithoutPDB"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									PodProtections: defaultevictor.PodProtections{
-										ExtraEnabled: []defaultevictor.PodProtection{
-											defaultevictor.PodsWithPVC,
-											defaultevictor.PodsWithoutPDB,
-										},
-									},
-									PriorityThreshold: &api.PriorityThreshold{Value: utilptr.To[int32](2000000000)},
-									NodeFit:           true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "test both ExtraPodProtections and DisabledDefaultPodProtections configuration",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          extraEnabled:
-          - "PodsWithPVC"
-          - "PodsWithoutPDB"
-          defaultDisabled:
-          - "PodsWithLocalStorage"
-          - "DaemonSetPods"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									PodProtections: defaultevictor.PodProtections{
-										ExtraEnabled: []defaultevictor.PodProtection{
-											defaultevictor.PodsWithPVC,
-											defaultevictor.PodsWithoutPDB,
-										},
-										DefaultDisabled: []defaultevictor.PodProtection{
-											defaultevictor.PodsWithLocalStorage,
-											defaultevictor.DaemonSetPods,
-										},
-									},
-									PriorityThreshold: &api.PriorityThreshold{Value: utilptr.To[int32](2000000000)},
-									NodeFit:           true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "test error when using both Deprecated fields and DisabledDefaultPodProtections/ExtraPodProtections",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        evictSystemCriticalPods: true
-        podProtections:
-          extraEnabled:
-          - "PodsWithPVC"
-          - "PodsWithoutPDB"
-          defaultDisabled:
-          - "PodsWithLocalStorage"
-          - "DaemonSetPods"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: nil,
-			err:    fmt.Errorf("in profile ProfileName: cannot use Deprecated fields alongside PodProtections.ExtraEnabled or PodProtections.DefaultDisabled"),
-		},
-		{
-			description: "test error when Disables a default protection that does not exist",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          defaultDisabled:
-          - "InvalidProtection"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: nil,
-			err:    fmt.Errorf("in profile ProfileName: invalid pod protection policy in DefaultDisabled: \"InvalidProtection\". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods]"),
-		},
-		{
-			description: "test error when Enables an extra protection that does not exist",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          extraEnabled:
-          - "InvalidProtection"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: nil,
-			err:    fmt.Errorf("in profile ProfileName: invalid pod protection policy in ExtraEnabled: \"InvalidProtection\". Valid options are: [PodsWithPVC PodsWithoutPDB PodsWithResourceClaims]"),
-		},
-		{
-			description: "test error when Disables an extra protection",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          defaultDisabled:
-          - "PodsWithPVC"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: nil,
-			err:    fmt.Errorf("in profile ProfileName: invalid pod protection policy in DefaultDisabled: \"PodsWithPVC\". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods]"),
-		},
-		{
-			description: "test error when Enables a default protection",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        podProtections:
-          extraEnabled:
-          - "DaemonSetPods"
-        priorityThreshold:
-          value: 2000000000
-        nodeFit: true
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-`),
-			result: nil,
-			err:    fmt.Errorf("in profile ProfileName: invalid pod protection policy in ExtraEnabled: \"DaemonSetPods\". Valid options are: [PodsWithPVC PodsWithoutPDB PodsWithResourceClaims]"),
-		},
 	}
 
 	for _, tc := range testCases {
@@ -811,14 +342,14 @@ profiles:
 			result, err := decode("filename", tc.policy, client, pluginregistry.PluginRegistry)
 			if err != nil {
 				if tc.err == nil {
-					t.Fatalf("unexpected error: %s.", err.Error())
-				} else if err.Error() != tc.err.Error() {
-					t.Fatalf("unexpected error: %s. Was expecting %s", err.Error(), tc.err.Error())
+					t.Errorf("unexpected error: %s.", err.Error())
+				} else {
+					t.Errorf("unexpected error: %s. Was expecting %s", err.Error(), tc.err.Error())
 				}
 			}
 			diff := cmp.Diff(tc.result, result)
-			if diff != "" {
-				t.Fatalf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
+			if diff != "" && err == nil {
+				t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
 			}
 		})
 	}

pkg/descheduler/prom_client_controller.go

@@ -1,249 +0,0 @@
-/*
-Copyright 2026 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 (
-	"context"
-	"fmt"
-	"net/http"
-	"sync"
-	"time"
-
-	promapi "github.com/prometheus/client_golang/api"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/informers"
-	corev1listers "k8s.io/client-go/listers/core/v1"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/cache"
-	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog/v2"
-
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/descheduler/client"
-)
-
-const (
-	prometheusAuthTokenSecretKey = "prometheusAuthToken"
-	workQueueKey                 = "key"
-)
-
-// inClusterPromClientController manages prometheus client using in-cluster SA token
-type inClusterPromClientController struct {
-	mu                                sync.RWMutex
-	promClient                        promapi.Client
-	previousPrometheusClientTransport *http.Transport
-	currentPrometheusAuthToken        string
-	prometheusConfig                  *api.Prometheus
-	createPrometheusClient            createPrometheusClientFunc
-	inClusterConfig                   inClusterConfigFunc
-}
-
-// secretBasedPromClientController manages prometheus client using Kubernetes secret
-type secretBasedPromClientController struct {
-	mu                                sync.RWMutex
-	promClient                        promapi.Client
-	previousPrometheusClientTransport *http.Transport
-	queue                             workqueue.RateLimitingInterface
-	currentPrometheusAuthToken        string
-	namespacedSecretsLister           corev1listers.SecretNamespaceLister
-	prometheusConfig                  *api.Prometheus
-	createPrometheusClient            createPrometheusClientFunc
-}
-
-type (
-	createPrometheusClientFunc func(url, token string) (promapi.Client, *http.Transport, error)
-	inClusterConfigFunc        func() (*rest.Config, error)
-)
-
-func newInClusterPromClientController(prometheusClient promapi.Client, prometheusConfig *api.Prometheus) *inClusterPromClientController {
-	return &inClusterPromClientController{
-		promClient:             prometheusClient,
-		prometheusConfig:       prometheusConfig,
-		createPrometheusClient: client.CreatePrometheusClient,
-		inClusterConfig:        rest.InClusterConfig,
-	}
-}
-
-func newSecretBasedPromClientController(prometheusClient promapi.Client, prometheusConfig *api.Prometheus, namespacedSharedInformerFactory informers.SharedInformerFactory) (*secretBasedPromClientController, error) {
-	if prometheusConfig == nil || prometheusConfig.AuthToken == nil || prometheusConfig.AuthToken.SecretReference == nil {
-		return nil, fmt.Errorf("prometheus metrics source configuration is missing authentication token secret")
-	}
-	authTokenSecret := prometheusConfig.AuthToken.SecretReference
-	if authTokenSecret.Name == "" || authTokenSecret.Namespace == "" {
-		return nil, fmt.Errorf("prometheus metrics source configuration is missing authentication token secret")
-	}
-
-	if namespacedSharedInformerFactory == nil {
-		return nil, fmt.Errorf("namespacedSharedInformerFactory not configured")
-	}
-
-	ctrl := &secretBasedPromClientController{
-		promClient:             prometheusClient,
-		queue:                  workqueue.NewRateLimitingQueueWithConfig(workqueue.DefaultControllerRateLimiter(), workqueue.RateLimitingQueueConfig{Name: "descheduler"}),
-		prometheusConfig:       prometheusConfig,
-		createPrometheusClient: client.CreatePrometheusClient,
-	}
-
-	namespacedSharedInformerFactory.Core().V1().Secrets().Informer().AddEventHandler(ctrl.eventHandler())
-	ctrl.namespacedSecretsLister = namespacedSharedInformerFactory.Core().V1().Secrets().Lister().Secrets(authTokenSecret.Namespace)
-
-	return ctrl, nil
-}
-
-func (ctrl *inClusterPromClientController) prometheusClient() promapi.Client {
-	ctrl.mu.RLock()
-	defer ctrl.mu.RUnlock()
-	return ctrl.promClient
-}
-
-func (ctrl *secretBasedPromClientController) prometheusClient() promapi.Client {
-	ctrl.mu.RLock()
-	defer ctrl.mu.RUnlock()
-	return ctrl.promClient
-}
-
-func (ctrl *inClusterPromClientController) reconcileInClusterSAToken() error {
-	ctrl.mu.Lock()
-	defer ctrl.mu.Unlock()
-
-	// Read the sa token and assume it has the sufficient permissions to authenticate
-	cfg, err := ctrl.inClusterConfig()
-	if err == nil {
-		if ctrl.currentPrometheusAuthToken != cfg.BearerToken {
-			klog.V(2).Infof("Creating Prometheus client (with SA token)")
-			prometheusClient, transport, err := ctrl.createPrometheusClient(ctrl.prometheusConfig.URL, cfg.BearerToken)
-			if err != nil {
-				ctrl.clearConnection()
-				return fmt.Errorf("unable to create a prometheus client: %v", err)
-			}
-			ctrl.promClient = prometheusClient
-			if ctrl.previousPrometheusClientTransport != nil {
-				ctrl.previousPrometheusClientTransport.CloseIdleConnections()
-			}
-			ctrl.previousPrometheusClientTransport = transport
-			ctrl.currentPrometheusAuthToken = cfg.BearerToken
-		}
-		return nil
-	}
-	if err == rest.ErrNotInCluster {
-		return nil
-	}
-	return fmt.Errorf("unexpected error when reading in cluster config: %v", err)
-}
-
-func clearPromClientConnection(currentPrometheusAuthToken *string, previousPrometheusClientTransport **http.Transport, promClient *promapi.Client) {
-	*currentPrometheusAuthToken = ""
-	if *previousPrometheusClientTransport != nil {
-		(*previousPrometheusClientTransport).CloseIdleConnections()
-	}
-	*previousPrometheusClientTransport = nil
-	*promClient = nil
-}
-
-func (ctrl *inClusterPromClientController) clearConnection() {
-	clearPromClientConnection(&ctrl.currentPrometheusAuthToken, &ctrl.previousPrometheusClientTransport, &ctrl.promClient)
-}
-
-func (ctrl *secretBasedPromClientController) clearConnection() {
-	clearPromClientConnection(&ctrl.currentPrometheusAuthToken, &ctrl.previousPrometheusClientTransport, &ctrl.promClient)
-}
-
-func (ctrl *secretBasedPromClientController) runAuthenticationSecretReconciler(ctx context.Context) {
-	defer utilruntime.HandleCrash()
-	defer ctrl.queue.ShutDown()
-
-	klog.Infof("Starting authentication secret reconciler")
-	defer klog.Infof("Shutting down authentication secret reconciler")
-
-	go wait.UntilWithContext(ctx, ctrl.runAuthenticationSecretReconcilerWorker, time.Second)
-
-	<-ctx.Done()
-}
-
-func (ctrl *secretBasedPromClientController) runAuthenticationSecretReconcilerWorker(ctx context.Context) {
-	for ctrl.processNextWorkItem(ctx) {
-	}
-}
-
-func (ctrl *secretBasedPromClientController) processNextWorkItem(ctx context.Context) bool {
-	dsKey, quit := ctrl.queue.Get()
-	if quit {
-		return false
-	}
-	defer ctrl.queue.Done(dsKey)
-
-	err := ctrl.sync()
-	if err == nil {
-		ctrl.queue.Forget(dsKey)
-		return true
-	}
-
-	utilruntime.HandleError(fmt.Errorf("%v failed with : %v", dsKey, err))
-	ctrl.queue.AddRateLimited(dsKey)
-
-	return true
-}
-
-func (ctrl *secretBasedPromClientController) sync() error {
-	ctrl.mu.Lock()
-	defer ctrl.mu.Unlock()
-
-	prometheusConfig := ctrl.prometheusConfig
-	ns := prometheusConfig.AuthToken.SecretReference.Namespace
-	name := prometheusConfig.AuthToken.SecretReference.Name
-	secretObj, err := ctrl.namespacedSecretsLister.Get(name)
-	if err != nil {
-		// clear the token if the secret is not found
-		if apierrors.IsNotFound(err) {
-			ctrl.clearConnection()
-		}
-		return fmt.Errorf("unable to get %v/%v secret", ns, name)
-	}
-	authToken := string(secretObj.Data[prometheusAuthTokenSecretKey])
-	if authToken == "" {
-		ctrl.clearConnection()
-		return fmt.Errorf("prometheus authentication token secret missing %q data or empty", prometheusAuthTokenSecretKey)
-	}
-	if ctrl.currentPrometheusAuthToken == authToken {
-		return nil
-	}
-
-	klog.V(2).Infof("authentication secret token updated, recreating prometheus client")
-	prometheusClient, transport, err := ctrl.createPrometheusClient(prometheusConfig.URL, authToken)
-	if err != nil {
-		ctrl.clearConnection()
-		return fmt.Errorf("unable to create a prometheus client: %v", err)
-	}
-	ctrl.promClient = prometheusClient
-	if ctrl.previousPrometheusClientTransport != nil {
-		ctrl.previousPrometheusClientTransport.CloseIdleConnections()
-	}
-	ctrl.previousPrometheusClientTransport = transport
-	ctrl.currentPrometheusAuthToken = authToken
-	return nil
-}
-
-func (ctrl *secretBasedPromClientController) eventHandler() cache.ResourceEventHandler {
-	return cache.ResourceEventHandlerFuncs{
-		AddFunc:    func(obj interface{}) { ctrl.queue.Add(workQueueKey) },
-		UpdateFunc: func(old, new interface{}) { ctrl.queue.Add(workQueueKey) },
-		DeleteFunc: func(obj interface{}) { ctrl.queue.Add(workQueueKey) },
-	}
-}

pkg/descheduler/prom_client_controller_test.go

@@ -1,834 +0,0 @@
-/*
-Copyright 2026 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 (
-	"context"
-	"fmt"
-	"net/http"
-	"sync"
-	"testing"
-	"time"
-
-	promapi "github.com/prometheus/client_golang/api"
-
-	v1 "k8s.io/api/core/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"
-	"k8s.io/client-go/rest"
-
-	"sigs.k8s.io/descheduler/pkg/api"
-)
-
-func TestPromClientControllerSync_InvalidConfig(t *testing.T) {
-	testCases := []struct {
-		name             string
-		objects          []runtime.Object
-		prometheusConfig *api.Prometheus
-		expectedErr      error
-	}{
-		{
-			name:             "empty prometheus config",
-			prometheusConfig: nil,
-			expectedErr:      fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-		{
-			name: "missing prometheus config",
-			prometheusConfig: &api.Prometheus{
-				URL: prometheusURL,
-			},
-			expectedErr: fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-		{
-			name: "missing auth token config",
-			prometheusConfig: &api.Prometheus{
-				URL:       prometheusURL,
-				AuthToken: nil,
-			},
-			expectedErr: fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-		{
-			name: "missing secret reference",
-			prometheusConfig: &api.Prometheus{
-				URL: prometheusURL,
-				AuthToken: &api.AuthToken{
-					SecretReference: nil,
-				},
-			},
-			expectedErr: fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-		{
-			name: "missing secret reference name",
-			prometheusConfig: &api.Prometheus{
-				URL: prometheusURL,
-				AuthToken: &api.AuthToken{
-					SecretReference: &api.SecretReference{
-						Namespace: "kube-system",
-					},
-				},
-			},
-			expectedErr: fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-		{
-			name: "missing secret reference namespace",
-			prometheusConfig: &api.Prometheus{
-				URL: prometheusURL,
-				AuthToken: &api.AuthToken{
-					SecretReference: &api.SecretReference{
-						Name: "prom-token",
-					},
-				},
-			},
-			expectedErr: fmt.Errorf("prometheus metrics source configuration is missing authentication token secret"),
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.TODO())
-			defer cancel()
-			_, err := setupPromClientControllerTest(ctx, t, tc.objects, tc.prometheusConfig, false)
-
-			// Verify error expectations
-			if tc.expectedErr != nil {
-				if err == nil {
-					t.Errorf("Expected error %q but got none", tc.expectedErr)
-				} else if err.Error() != tc.expectedErr.Error() {
-					t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
-				}
-			} else {
-				t.Errorf("Expected an error, got none")
-			}
-		})
-	}
-}
-
-func TestPromClientControllerSync_InvalidSecret(t *testing.T) {
-	testCases := []struct {
-		name             string
-		objects          []runtime.Object
-		prometheusConfig *api.Prometheus
-		expectedErr      error
-	}{
-		{
-			name:             "secret exists but empty token",
-			objects:          []runtime.Object{newPrometheusAuthSecret(withToken(""))},
-			prometheusConfig: newPrometheusConfig(),
-			expectedErr:      fmt.Errorf("prometheus authentication token secret missing \"prometheusAuthToken\" data or empty"),
-		},
-		{
-			name: "secret exists but missing token key",
-			objects: []runtime.Object{newPrometheusAuthSecret(func(s *v1.Secret) {
-				s.Data = map[string][]byte{}
-			})},
-			prometheusConfig: newPrometheusConfig(),
-			expectedErr:      fmt.Errorf("prometheus authentication token secret missing \"prometheusAuthToken\" data or empty"),
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.TODO())
-			defer cancel()
-			setup, err := setupPromClientControllerTest(ctx, t, tc.objects, tc.prometheusConfig, true)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Call sync
-			err = setup.ctrl.sync()
-
-			// Verify error expectations
-			if tc.expectedErr != nil {
-				if err == nil {
-					t.Errorf("Expected error %q but got none", tc.expectedErr)
-				} else if err.Error() != tc.expectedErr.Error() {
-					t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
-				}
-			} else {
-				t.Errorf("Expected an error, got none")
-			}
-		})
-	}
-}
-
-func TestPromClientControllerSync_ClientCreation(t *testing.T) {
-	testCases := []struct {
-		name                           string
-		objects                        []runtime.Object
-		currentAuthToken               string
-		createPrometheusClientFunc     func(url, token string) (promapi.Client, *http.Transport, error)
-		expectedErr                    error
-		expectClientCreated            bool
-		expectCurrentTokenCleared      bool
-		expectPreviousTransportCleared bool
-	}{
-		{
-			name:             "secret not found",
-			currentAuthToken: "old-token",
-			expectedErr:      fmt.Errorf("unable to get kube-system/prom-token secret"),
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				t.Fatalf("unexpected create client invocation")
-				return nil, nil, fmt.Errorf("unexpected create client invocation")
-			},
-			expectCurrentTokenCleared:      true,
-			expectPreviousTransportCleared: true,
-		},
-		{
-			name:             "token unchanged - no client creation",
-			objects:          []runtime.Object{newPrometheusAuthSecret(withToken("same-token"))},
-			currentAuthToken: "same-token",
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				t.Fatalf("unexpected create client invocation")
-				return nil, nil, fmt.Errorf("unexpected create client invocation")
-			},
-			expectClientCreated: false,
-		},
-		{
-			name:             "token changed - client created successfully",
-			objects:          []runtime.Object{newPrometheusAuthSecret(withToken("new-token"))},
-			currentAuthToken: "old-token",
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				return &mockPrometheusClient{name: "new-client"}, &http.Transport{}, nil
-			},
-			expectClientCreated: true,
-		},
-		{
-			name:             "token changed - client creation fails",
-			objects:          []runtime.Object{newPrometheusAuthSecret(withToken("new-token"))},
-			currentAuthToken: "old-token",
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				return nil, nil, fmt.Errorf("failed to create client")
-			},
-			expectedErr:         fmt.Errorf("unable to create a prometheus client: failed to create client"),
-			expectClientCreated: false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			for _, setupMode := range []struct {
-				name    string
-				setupFn func(context.Context, *testing.T, []runtime.Object) *secretBasedPromClientController
-			}{
-				{
-					name: "running with prom reconciler directly",
-					setupFn: func(ctx context.Context, t *testing.T, objects []runtime.Object) *secretBasedPromClientController {
-						setup, err := setupPromClientControllerTest(ctx, t, objects, newPrometheusConfig(), true)
-						if err != nil {
-							t.Fatal(err)
-						}
-						return setup.ctrl
-					},
-				},
-				{
-					name: "running with full descheduler",
-					setupFn: func(ctx context.Context, t *testing.T, objects []runtime.Object) *secretBasedPromClientController {
-						deschedulerPolicy := &api.DeschedulerPolicy{
-							MetricsProviders: []api.MetricsProvider{
-								{
-									Source:     api.PrometheusMetrics,
-									Prometheus: newPrometheusConfig(),
-								},
-							},
-						}
-						_, descheduler, _, _ := initDescheduler(t, ctx, initFeatureGates(), deschedulerPolicy, nil, false, objects...)
-						return descheduler.secretBasedPromClientCtrl
-					},
-				},
-			} {
-				t.Run(setupMode.name, func(t *testing.T) {
-					ctx, cancel := context.WithCancel(context.TODO())
-					defer cancel()
-
-					ctrl := setupMode.setupFn(ctx, t, tc.objects)
-
-					// Set additional test-specific fields
-					ctrl.mu.Lock()
-					ctrl.currentPrometheusAuthToken = tc.currentAuthToken
-					if tc.currentAuthToken != "" {
-						ctrl.previousPrometheusClientTransport = &http.Transport{}
-					}
-					ctrl.mu.Unlock()
-
-					// Mock createPrometheusClient
-					clientCreated := false
-					if tc.createPrometheusClientFunc != nil {
-						ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
-							client, transport, err := tc.createPrometheusClientFunc(url, token)
-							if err == nil {
-								clientCreated = true
-							}
-							return client, transport, err
-						}
-					}
-
-					// Call sync
-					err := ctrl.sync()
-
-					// Verify error expectations
-					if tc.expectedErr != nil {
-						if err == nil {
-							t.Errorf("Expected error %q but got none", tc.expectedErr)
-						} else if err.Error() != tc.expectedErr.Error() {
-							t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
-						}
-					} else {
-						if err != nil {
-							t.Errorf("Expected no error but got: %v", err)
-						}
-					}
-
-					// Verify client creation expectations
-					if tc.expectClientCreated && !clientCreated {
-						t.Errorf("Expected prometheus client to be created but it wasn't")
-					}
-					if !tc.expectClientCreated && clientCreated {
-						t.Errorf("Expected prometheus client not to be created but it was")
-					}
-
-					// Verify token cleared expectations
-					ctrl.mu.RLock()
-					currentToken := ctrl.currentPrometheusAuthToken
-					previousTransport := ctrl.previousPrometheusClientTransport
-					ctrl.mu.RUnlock()
-
-					if tc.expectCurrentTokenCleared && currentToken != "" {
-						t.Errorf("Expected current auth token to be cleared but it wasn't")
-					}
-
-					// Verify previous transport cleared expectations
-					if tc.expectPreviousTransportCleared && previousTransport != nil {
-						t.Errorf("Expected previous transport to be cleared but it wasn't")
-					}
-
-					// Verify promClient cleared when secret not found
-					if tc.expectPreviousTransportCleared && ctrl.prometheusClient() != nil {
-						t.Errorf("Expected promClient to be cleared but it wasn't")
-					}
-
-					// Verify token updated when client created
-					if tc.expectClientCreated && len(tc.objects) > 0 {
-						if secret, ok := tc.objects[0].(*v1.Secret); ok && secret.Data != nil {
-							expectedToken := string(secret.Data[prometheusAuthTokenSecretKey])
-							ctrl.mu.RLock()
-							actualToken := ctrl.currentPrometheusAuthToken
-							ctrl.mu.RUnlock()
-							if actualToken != expectedToken {
-								t.Errorf("Expected current auth token to be %q but got %q", expectedToken, actualToken)
-							}
-						}
-					}
-				})
-			}
-		})
-	}
-}
-
-func TestPromClientControllerSync_EventHandler(t *testing.T) {
-	testCases := []struct {
-		name                              string
-		operation                         func(ctx context.Context, fakeClient *fakeclientset.Clientset) error
-		processItem                       bool
-		expectedPromClientSet             bool
-		expectedCreatedClientsCount       int
-		expectedCurrentToken              string
-		expectedPreviousTransportCleared  bool
-		expectDifferentClients            bool
-		expectCreatePrometheusClientError bool
-	}{
-		// Check initial conditions
-		{
-			name:                        "no secret initially",
-			operation:                   func(ctx context.Context, fakeClient *fakeclientset.Clientset) error { return nil },
-			processItem:                 false,
-			expectedPromClientSet:       false,
-			expectedCreatedClientsCount: 0,
-			expectedCurrentToken:        "",
-		},
-		// Change conditions
-		{
-			name: "add secret",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-1"))
-				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Create(ctx, secret, metav1.CreateOptions{})
-				return err
-			},
-			processItem:                 true,
-			expectedPromClientSet:       true,
-			expectedCreatedClientsCount: 1,
-			expectedCurrentToken:        "token-1",
-		},
-		{
-			name: "update secret",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-2"))
-				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
-				return err
-			},
-			processItem:                 true,
-			expectedPromClientSet:       true,
-			expectedCreatedClientsCount: 2,
-			expectedCurrentToken:        "token-2",
-			expectDifferentClients:      true,
-		},
-		{
-			name: "update secret with invalid data",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-3"))
-				secret.Data[prometheusAuthTokenSecretKey] = []byte{}
-				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
-				return err
-			},
-			processItem:                 true,
-			expectedPromClientSet:       false,
-			expectedCreatedClientsCount: 2,
-			expectedCurrentToken:        "",
-			expectDifferentClients:      true,
-		},
-		{
-			name: "update secret with valid data",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-4"))
-				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
-				return err
-			},
-			processItem:                 true,
-			expectedPromClientSet:       true,
-			expectedCreatedClientsCount: 3,
-			expectedCurrentToken:        "token-4",
-			expectDifferentClients:      true,
-		},
-		{
-			name: "update secret with valid data but createPrometheusClient failing",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-5"))
-				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
-				return err
-			},
-			processItem:                       true,
-			expectedPromClientSet:             false,
-			expectedCreatedClientsCount:       3,
-			expectedCurrentToken:              "",
-			expectDifferentClients:            true,
-			expectCreatePrometheusClientError: true,
-		},
-		{
-			name: "delete secret",
-			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
-				secret := newPrometheusAuthSecret(withToken("token-5"))
-				return fakeClient.CoreV1().Secrets(secret.Namespace).Delete(ctx, secret.Name, metav1.DeleteOptions{})
-			},
-			processItem:                      true,
-			expectedPromClientSet:            false,
-			expectedCreatedClientsCount:      3,
-			expectedCurrentToken:             "",
-			expectedPreviousTransportCleared: true,
-		},
-	}
-
-	for _, setupMode := range []struct {
-		name string
-		init func(t *testing.T, ctx context.Context) (ctrl *secretBasedPromClientController, fakeClient *fakeclientset.Clientset)
-	}{
-		{
-			name: "running with prom reconciler directly",
-			init: func(t *testing.T, ctx context.Context) (ctrl *secretBasedPromClientController, fakeClient *fakeclientset.Clientset) {
-				setup, err := setupPromClientControllerTest(ctx, t, nil, newPrometheusConfig(), true)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// Start the reconciler to process queue items
-				go setup.ctrl.runAuthenticationSecretReconciler(ctx)
-
-				return setup.ctrl, setup.fakeClient
-			},
-		},
-		{
-			name: "running with full descheduler",
-			init: func(t *testing.T, ctx context.Context) (ctrl *secretBasedPromClientController, fakeClient *fakeclientset.Clientset) {
-				deschedulerPolicy := &api.DeschedulerPolicy{
-					MetricsProviders: []api.MetricsProvider{
-						{
-							Source:     api.PrometheusMetrics,
-							Prometheus: newPrometheusConfig(),
-						},
-					},
-				}
-
-				_, descheduler, _, client := initDescheduler(t, ctx, initFeatureGates(), deschedulerPolicy, nil, false)
-				// The reconciler is already started by initDescheduler via bootstrapDescheduler
-
-				return descheduler.secretBasedPromClientCtrl, client
-			},
-		},
-	} {
-		t.Run(setupMode.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-
-			ctrl, fakeClient := setupMode.init(t, ctx)
-
-			// Track created clients to verify different instances
-			var createdClients []promapi.Client
-			var createdClientsMu sync.Mutex
-
-			for _, tc := range testCases {
-				t.Run(tc.name, func(t *testing.T) {
-					ctrl.mu.Lock()
-					ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
-						if tc.expectCreatePrometheusClientError {
-							return nil, &http.Transport{}, fmt.Errorf("error creating a prometheus client")
-						}
-						client := &mockPrometheusClient{name: "client-" + token}
-						createdClientsMu.Lock()
-						createdClients = append(createdClients, client)
-						createdClientsMu.Unlock()
-						return client, &http.Transport{}, nil
-					}
-					ctrl.mu.Unlock()
-
-					if err := tc.operation(ctx, fakeClient); err != nil {
-						t.Fatalf("Failed to execute operation: %v", err)
-					}
-
-					if tc.processItem {
-						// Wait for event to be processed by the reconciler
-						err := wait.PollUntilContextTimeout(ctx, 10*time.Millisecond, 2*time.Second, true, func(ctx context.Context) (bool, error) {
-							// Check if all expected conditions are met (with mutex protection)
-							ctrl.mu.RLock()
-							promClient := ctrl.promClient
-							currentToken := ctrl.currentPrometheusAuthToken
-							previousTransport := ctrl.previousPrometheusClientTransport
-							ctrl.mu.RUnlock()
-
-							t.Logf("promClient: %v\n", promClient)
-							if tc.expectedPromClientSet {
-								if promClient == nil {
-									return false, nil
-								}
-							} else {
-								if promClient != nil {
-									return false, nil
-								}
-							}
-
-							createdClientsMu.Lock()
-							createdClientsLen := len(createdClients)
-							createdClientsMu.Unlock()
-							t.Logf("createdClientsLen: %v\n", createdClientsLen)
-							if createdClientsLen != tc.expectedCreatedClientsCount {
-								return false, nil
-							}
-							t.Logf("currentToken: %v\n", currentToken)
-							if currentToken != tc.expectedCurrentToken {
-								return false, nil
-							}
-							t.Logf("previousTransport: %v\n", previousTransport)
-							if tc.expectedPreviousTransportCleared {
-								if previousTransport != nil {
-									return false, nil
-								}
-							}
-
-							return true, nil
-						})
-						if err != nil {
-							t.Fatalf("Timed out waiting for expected conditions: %v", err)
-						}
-
-						// Log all expected conditions that were met
-						t.Logf("All expected conditions met: promClientSet=%v, createdClientsCount=%d, currentToken=%q, previousTransportCleared=%v",
-							tc.expectedPromClientSet, tc.expectedCreatedClientsCount, tc.expectedCurrentToken, tc.expectedPreviousTransportCleared)
-					}
-
-					// Validate post-conditions
-					if tc.expectedPromClientSet {
-						if ctrl.prometheusClient() == nil {
-							t.Error("Expected prometheus client to be set, but it was nil")
-						}
-					} else {
-						promClient := ctrl.prometheusClient()
-						if promClient != nil {
-							t.Errorf("Expected prometheus client to be nil, but got: %v", promClient)
-						}
-					}
-
-					createdClientsMu.Lock()
-					createdClientsLen := len(createdClients)
-					createdClientsMu.Unlock()
-					if createdClientsLen != tc.expectedCreatedClientsCount {
-						t.Errorf("Expected %d clients created, but got %d", tc.expectedCreatedClientsCount, len(createdClients))
-					}
-
-					ctrl.mu.RLock()
-					actualToken := ctrl.currentPrometheusAuthToken
-					actualTransport := ctrl.previousPrometheusClientTransport
-					ctrl.mu.RUnlock()
-
-					if actualToken != tc.expectedCurrentToken {
-						t.Errorf("Expected current token to be %q, got %q", tc.expectedCurrentToken, actualToken)
-					}
-
-					if tc.expectedPreviousTransportCleared {
-						if actualTransport != nil {
-							t.Error("Expected previous transport to be cleared, but it was set")
-						}
-					}
-
-					if tc.expectDifferentClients && len(createdClients) >= 2 {
-						createdClientsMu.Lock()
-						defer createdClientsMu.Unlock()
-						if createdClients[0] == createdClients[1] {
-							t.Error("Expected different client instances")
-						}
-					}
-				})
-			}
-		})
-	}
-}
-
-func TestReconcileInClusterSAToken(t *testing.T) {
-	testCases := []struct {
-		name                           string
-		currentAuthToken               string
-		inClusterConfigFunc            func() (*rest.Config, error)
-		createPrometheusClientFunc     func(url, token string) (promapi.Client, *http.Transport, error)
-		expectedErr                    error
-		expectClientCreated            bool
-		expectCurrentToken             string
-		expectPreviousTransportCleared bool
-		expectPromClientCleared        bool
-	}{
-		{
-			name:             "token unchanged - no client creation",
-			currentAuthToken: "same-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return &rest.Config{BearerToken: "same-token"}, nil
-			},
-			expectClientCreated: false,
-			expectCurrentToken:  "same-token",
-		},
-		{
-			name:             "token changed - client created successfully",
-			currentAuthToken: "old-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return &rest.Config{BearerToken: "new-token"}, nil
-			},
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				if token != "new-token" {
-					t.Errorf("Expected token to be %q, got %q", "new-token", token)
-				}
-				return &mockPrometheusClient{name: "new-client"}, &http.Transport{}, nil
-			},
-			expectClientCreated: true,
-			expectCurrentToken:  "new-token",
-		},
-		{
-			name:             "token changed - client creation fails",
-			currentAuthToken: "old-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return &rest.Config{BearerToken: "new-token"}, nil
-			},
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				return nil, nil, fmt.Errorf("failed to create client")
-			},
-			expectedErr:                    fmt.Errorf("unable to create a prometheus client: failed to create client"),
-			expectClientCreated:            false,
-			expectCurrentToken:             "",
-			expectPreviousTransportCleared: false,
-			expectPromClientCleared:        false,
-		},
-		{
-			name:             "not in cluster - no error",
-			currentAuthToken: "current-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return nil, rest.ErrNotInCluster
-			},
-			expectClientCreated: false,
-			expectCurrentToken:  "current-token",
-		},
-		{
-			name:             "unexpected error",
-			currentAuthToken: "current-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return nil, fmt.Errorf("unexpected error")
-			},
-			expectedErr:         fmt.Errorf("unexpected error when reading in cluster config: unexpected error"),
-			expectClientCreated: false,
-			expectCurrentToken:  "current-token",
-		},
-		{
-			name:             "first token - client created successfully",
-			currentAuthToken: "",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return &rest.Config{BearerToken: "first-token"}, nil
-			},
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				return &mockPrometheusClient{name: "first-client"}, &http.Transport{}, nil
-			},
-			expectClientCreated: true,
-			expectCurrentToken:  "first-token",
-		},
-		{
-			name:             "token changed with previous transport - clears previous transport",
-			currentAuthToken: "old-token",
-			inClusterConfigFunc: func() (*rest.Config, error) {
-				return &rest.Config{BearerToken: "new-token"}, nil
-			},
-			createPrometheusClientFunc: func(url, token string) (promapi.Client, *http.Transport, error) {
-				return &mockPrometheusClient{name: "new-client"}, &http.Transport{}, nil
-			},
-			expectClientCreated:            true,
-			expectCurrentToken:             "new-token",
-			expectPreviousTransportCleared: true,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			for _, setupMode := range []struct {
-				name string
-				init func(t *testing.T) *inClusterPromClientController
-			}{
-				{
-					name: "running with prom reconciler directly",
-					init: func(t *testing.T) *inClusterPromClientController {
-						return &inClusterPromClientController{
-							currentPrometheusAuthToken: tc.currentAuthToken,
-							prometheusConfig: &api.Prometheus{
-								URL: prometheusURL,
-							},
-							inClusterConfig: tc.inClusterConfigFunc,
-						}
-					},
-				},
-				{
-					name: "running with full descheduler",
-					init: func(t *testing.T) *inClusterPromClientController {
-						ctx := context.Background()
-						prometheusConfig := &api.Prometheus{
-							URL: prometheusURL,
-						}
-						deschedulerPolicy := &api.DeschedulerPolicy{
-							MetricsProviders: []api.MetricsProvider{
-								{
-									Source:     api.PrometheusMetrics,
-									Prometheus: prometheusConfig,
-								},
-							},
-						}
-						_, descheduler, _, _ := initDescheduler(t, ctx, initFeatureGates(), deschedulerPolicy, nil, false)
-
-						// Override the fields needed for this test
-						descheduler.inClusterPromClientCtrl.mu.Lock()
-						descheduler.inClusterPromClientCtrl.currentPrometheusAuthToken = tc.currentAuthToken
-						descheduler.inClusterPromClientCtrl.mu.Unlock()
-						descheduler.inClusterPromClientCtrl.inClusterConfig = tc.inClusterConfigFunc
-						return descheduler.inClusterPromClientCtrl
-					},
-				},
-			} {
-				t.Run(setupMode.name, func(t *testing.T) {
-					ctrl := setupMode.init(t)
-
-					// Set previous transport and client if test expects them to be cleared
-					ctrl.mu.Lock()
-					if tc.expectPreviousTransportCleared {
-						ctrl.previousPrometheusClientTransport = &http.Transport{}
-					}
-					if tc.expectPromClientCleared {
-						ctrl.promClient = &mockPrometheusClient{name: "old-client"}
-					}
-					ctrl.mu.Unlock()
-
-					// Mock createPrometheusClient
-					clientCreated := false
-					if tc.createPrometheusClientFunc != nil {
-						ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
-							client, transport, err := tc.createPrometheusClientFunc(url, token)
-							if err == nil {
-								clientCreated = true
-							}
-							return client, transport, err
-						}
-					}
-
-					// Call reconcileInClusterSAToken
-					err := ctrl.reconcileInClusterSAToken()
-
-					// Verify error expectations
-					if tc.expectedErr != nil {
-						if err == nil {
-							t.Errorf("Expected error %q but got none", tc.expectedErr)
-						} else if err.Error() != tc.expectedErr.Error() {
-							t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
-						}
-					} else {
-						if err != nil {
-							t.Errorf("Expected no error but got: %v", err)
-						}
-					}
-
-					// Verify client creation expectations
-					if tc.expectClientCreated && !clientCreated {
-						t.Errorf("Expected prometheus client to be created but it wasn't")
-					}
-					if !tc.expectClientCreated && clientCreated {
-						t.Errorf("Expected prometheus client not to be created but it was")
-					}
-
-					// Verify token expectations
-					ctrl.mu.RLock()
-					actualToken := ctrl.currentPrometheusAuthToken
-					actualTransport := ctrl.previousPrometheusClientTransport
-					ctrl.mu.RUnlock()
-
-					if actualToken != tc.expectCurrentToken {
-						t.Errorf("Expected current token to be %q but got %q", tc.expectCurrentToken, actualToken)
-					}
-
-					// Verify previous transport cleared when expected
-					if tc.expectPreviousTransportCleared {
-						if tc.expectClientCreated {
-							// Success case: new transport should be set
-							if actualTransport == nil {
-								t.Error("Expected previous transport to be set to new transport, but it was nil")
-							}
-						} else if tc.expectedErr != nil {
-							// Failure case: transport should be nil
-							if actualTransport != nil {
-								t.Error("Expected previous transport to be cleared on error, but it was set")
-							}
-						}
-					}
-
-					// Verify promClient cleared when expected
-					if tc.expectPromClientCleared {
-						if ctrl.promClient != nil {
-							t.Error("Expected promClient to be cleared, but it was set")
-						}
-					}
-				})
-			}
-		})
-	}
-}

pkg/features/features.go

@@ -1,49 +0,0 @@
-package features
-
-import (
-	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/component-base/featuregate"
-)
-
-const (
-	// Every feature gate should add method here following this template:
-	//
-	// // owner: @username
-	// // kep: kep link
-	// // alpha: v1.X
-	// MyFeature featuregate.Feature = "MyFeature"
-	//
-	// Feature gates should be listed in alphabetical, case-sensitive
-	// (upper before any lower case character) order. This reduces the risk
-	// of code conflicts because changes are more likely to be scattered
-	// across the file.
-
-	// owner: @ingvagabund
-	// kep: https://github.com/kubernetes-sigs/descheduler/issues/1397
-	// alpha: v1.31
-	//
-	// Enable evictions in background so users can create their own eviction policies
-	// as an alternative to immediate evictions.
-	EvictionsInBackground featuregate.Feature = "EvictionsInBackground"
-)
-
-func init() {
-	runtime.Must(DefaultMutableFeatureGate.Add(defaultDeschedulerFeatureGates))
-}
-
-// defaultDeschedulerFeatureGates consists of all known descheduler-specific feature keys.
-// To add a new feature, define a key for it above and add it here. The features will be
-// available throughout descheduler binary.
-//
-// Entries are separated from each other with blank lines to avoid sweeping gofmt changes
-// when adding or removing one entry.
-var defaultDeschedulerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	EvictionsInBackground: {Default: false, PreRelease: featuregate.Alpha},
-}
-
-// DefaultMutableFeatureGate is a mutable version of DefaultFeatureGate.
-// Only top-level commands/options setup and the k8s.io/component-base/featuregate/testing package should make use of this.
-// Tests that need to modify feature gates for the duration of their test should use:
-//
-//	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.<FeatureName>, <value>)()
-var DefaultMutableFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()

pkg/framework/fake/fake.go

@@ -11,8 +11,6 @@ import (
 	"sigs.k8s.io/descheduler/pkg/descheduler/metricscollector"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-
-	promapi "github.com/prometheus/client_golang/api"
 )
 
 type HandleImpl struct {
@@ -21,9 +19,7 @@ type HandleImpl struct {
 	SharedInformerFactoryImpl     informers.SharedInformerFactory
 	EvictorFilterImpl             frameworktypes.EvictorPlugin
 	PodEvictorImpl                *evictions.PodEvictor
-	MetricsCollectorImpl          *metricscollector.MetricsCollector
-	PrometheusClientImpl          promapi.Client
-	PluginInstanceIDImpl          string
+	MetricsCollectorImpl              *metricscollector.MetricsCollector
 }
 
 var _ frameworktypes.Handle = &HandleImpl{}
@@ -32,10 +28,6 @@ func (hi *HandleImpl) ClientSet() clientset.Interface {
 	return hi.ClientsetImpl
 }
 
-func (hi *HandleImpl) PrometheusClient() promapi.Client {
-	return hi.PrometheusClientImpl
-}
-
 func (hi *HandleImpl) MetricsCollector() *metricscollector.MetricsCollector {
 	return hi.MetricsCollectorImpl
 }
@@ -63,7 +55,3 @@ func (hi *HandleImpl) PreEvictionFilter(pod *v1.Pod) bool {
 func (hi *HandleImpl) Evict(ctx context.Context, pod *v1.Pod, opts evictions.EvictOptions) error {
 	return hi.PodEvictorImpl.EvictPod(ctx, pod, opts)
 }
-
-func (hi *HandleImpl) PluginInstanceID() string {
-	return hi.PluginInstanceIDImpl
-}

pkg/framework/fake/plugin/fake.go

@@ -60,7 +60,7 @@ type FakePlugin struct {
 }
 
 func NewPluginFncFromFake(fp *FakePlugin) pluginregistry.PluginBuilder {
-	return func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 		fakePluginArgs, ok := args.(*FakePluginArgs)
 		if !ok {
 			return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
@@ -73,24 +73,8 @@ func NewPluginFncFromFake(fp *FakePlugin) pluginregistry.PluginBuilder {
 	}
 }
 
-func NewPluginFncFromFakeWithReactor(fp *FakePlugin, callback func(ActionImpl)) pluginregistry.PluginBuilder {
-	return func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-		fakePluginArgs, ok := args.(*FakePluginArgs)
-		if !ok {
-			return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-		}
-
-		fp.handle = handle
-		fp.args = fakePluginArgs
-
-		callback(ActionImpl{handle: fp.handle})
-
-		return fp, nil
-	}
-}
-
 // New builds plugin from its arguments while passing a handle
-func New(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 	fakePluginArgs, ok := args.(*FakePluginArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
@@ -181,7 +165,7 @@ type FakeDeschedulePlugin struct {
 }
 
 func NewFakeDeschedulePluginFncFromFake(fp *FakeDeschedulePlugin) pluginregistry.PluginBuilder {
-	return func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 		fakePluginArgs, ok := args.(*FakeDeschedulePluginArgs)
 		if !ok {
 			return nil, fmt.Errorf("want args to be of type FakeDeschedulePluginArgs, got %T", args)
@@ -268,7 +252,7 @@ type FakeBalancePlugin struct {
 }
 
 func NewFakeBalancePluginFncFromFake(fp *FakeBalancePlugin) pluginregistry.PluginBuilder {
-	return func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 		fakePluginArgs, ok := args.(*FakeBalancePluginArgs)
 		if !ok {
 			return nil, fmt.Errorf("want args to be of type FakeBalancePluginArgs, got %T", args)
@@ -355,7 +339,7 @@ type FakeFilterPlugin struct {
 }
 
 func NewFakeFilterPluginFncFromFake(fp *FakeFilterPlugin) pluginregistry.PluginBuilder {
-	return func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 		fakePluginArgs, ok := args.(*FakeFilterPluginArgs)
 		if !ok {
 			return nil, fmt.Errorf("want args to be of type FakeFilterPluginArgs, got %T", args)
@@ -424,55 +408,3 @@ func (d *FakeFilterPlugin) handleBoolAction(action Action) bool {
 	}
 	panic(fmt.Errorf("unhandled %q action", action.GetExtensionPoint()))
 }
-
-// RegisterFakePlugin registers a FakePlugin with the given registry
-func RegisterFakePlugin(name string, plugin *FakePlugin, registry pluginregistry.Registry) {
-	pluginregistry.Register(
-		name,
-		NewPluginFncFromFake(plugin),
-		&FakePlugin{},
-		&FakePluginArgs{},
-		ValidateFakePluginArgs,
-		SetDefaults_FakePluginArgs,
-		registry,
-	)
-}
-
-// RegisterFakeDeschedulePlugin registers a FakeDeschedulePlugin with the given registry
-func RegisterFakeDeschedulePlugin(name string, plugin *FakeDeschedulePlugin, registry pluginregistry.Registry) {
-	pluginregistry.Register(
-		name,
-		NewFakeDeschedulePluginFncFromFake(plugin),
-		&FakeDeschedulePlugin{},
-		&FakeDeschedulePluginArgs{},
-		ValidateFakePluginArgs,
-		SetDefaults_FakePluginArgs,
-		registry,
-	)
-}
-
-// RegisterFakeBalancePlugin registers a FakeBalancePlugin with the given registry
-func RegisterFakeBalancePlugin(name string, plugin *FakeBalancePlugin, registry pluginregistry.Registry) {
-	pluginregistry.Register(
-		name,
-		NewFakeBalancePluginFncFromFake(plugin),
-		&FakeBalancePlugin{},
-		&FakeBalancePluginArgs{},
-		ValidateFakePluginArgs,
-		SetDefaults_FakePluginArgs,
-		registry,
-	)
-}
-
-// RegisterFakeFilterPlugin registers a FakeFilterPlugin with the given registry
-func RegisterFakeFilterPlugin(name string, plugin *FakeFilterPlugin, registry pluginregistry.Registry) {
-	pluginregistry.Register(
-		name,
-		NewFakeFilterPluginFncFromFake(plugin),
-		&FakeFilterPlugin{},
-		&FakeFilterPluginArgs{},
-		ValidateFakePluginArgs,
-		SetDefaults_FakePluginArgs,
-		registry,
-	)
-}

pkg/framework/fake/plugin/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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/framework/pluginregistry/pluginregistry.go

@@ -17,8 +17,6 @@ limitations under the License.
 package pluginregistry
 
 import (
-	"context"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
@@ -37,7 +35,7 @@ type PluginUtilities struct {
 	PluginArgDefaulter PluginArgDefaulter
 }
 
-type PluginBuilder = func(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error)
+type PluginBuilder = func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error)
 
 type (
 	PluginArgValidator = func(args runtime.Object) error

pkg/framework/plugins/defaultevictor/constraints.go

@@ -1,94 +0,0 @@
-/*
-Copyright 2025 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 defaultevictor
-
-import (
-	"fmt"
-	"time"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/klog/v2"
-
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-)
-
-func evictionConstraintsForLabelSelector(logger klog.Logger, labelSelector *metav1.LabelSelector) ([]constraint, error) {
-	if labelSelector != nil {
-		selector, err := metav1.LabelSelectorAsSelector(labelSelector)
-		if err != nil {
-			logger.Error(err, "could not get selector from label selector")
-			return nil, err
-		}
-		if !selector.Empty() {
-			return []constraint{
-				func(pod *v1.Pod) error {
-					if !selector.Matches(labels.Set(pod.Labels)) {
-						return fmt.Errorf("pod labels do not match the labelSelector filter in the policy parameter")
-					}
-					return nil
-				},
-			}, nil
-		}
-	}
-	return nil, nil
-}
-
-func evictionConstraintsForMinReplicas(logger klog.Logger, minReplicas uint, handle frameworktypes.Handle) ([]constraint, error) {
-	if minReplicas > 1 {
-		indexName := "metadata.ownerReferences"
-		indexer, err := getPodIndexerByOwnerRefs(indexName, handle)
-		if err != nil {
-			logger.Error(err, "could not get pod indexer by ownerRefs")
-			return nil, err
-		}
-		return []constraint{
-			func(pod *v1.Pod) error {
-				if len(pod.OwnerReferences) == 0 {
-					return nil
-				}
-				if len(pod.OwnerReferences) > 1 {
-					logger.V(5).Info("pod has multiple owner references which is not supported for minReplicas check", "size", len(pod.OwnerReferences), "pod", klog.KObj(pod))
-					return nil
-				}
-				ownerRef := pod.OwnerReferences[0]
-				objs, err := indexer.ByIndex(indexName, string(ownerRef.UID))
-				if err != nil {
-					return fmt.Errorf("unable to list pods for minReplicas filter in the policy parameter")
-				}
-				if uint(len(objs)) < minReplicas {
-					return fmt.Errorf("owner has %d replicas which is less than minReplicas of %d", len(objs), minReplicas)
-				}
-				return nil
-			},
-		}, nil
-
-	}
-	return nil, nil
-}
-
-func evictionConstraintsForMinPodAge(minPodAge *metav1.Duration) []constraint {
-	if minPodAge != nil {
-		return []constraint{
-			func(pod *v1.Pod) error {
-				if pod.Status.StartTime == nil || time.Since(pod.Status.StartTime.Time) < minPodAge.Duration {
-					return fmt.Errorf("pod age is not older than MinPodAge: %s seconds", minPodAge.String())
-				}
-				return nil
-			},
-		}
-	}
-	return nil
-}

pkg/framework/plugins/defaultevictor/defaultevictor.go

@@ -3,7 +3,7 @@ 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
+    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.
@@ -14,23 +14,19 @@ limitations under the License.
 package defaultevictor
 
 import (
+	// "context"
 	"context"
 	"errors"
 	"fmt"
-	"maps"
-	"slices"
+	"time"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/informers"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
-
-	evictionutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
-
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
 	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
@@ -38,9 +34,8 @@ import (
 )
 
 const (
-	PluginName                 = "DefaultEvictor"
-	evictPodAnnotationKey      = "descheduler.alpha.kubernetes.io/evict"
-	namespaceWithLabelSelector = "namespaceWithLabelSelector-"
+	PluginName            = "DefaultEvictor"
+	evictPodAnnotationKey = "descheduler.alpha.kubernetes.io/evict"
 )
 
 var _ frameworktypes.EvictorPlugin = &DefaultEvictor{}
@@ -53,7 +48,6 @@ type constraint func(pod *v1.Pod) error
 // This plugin is only meant to customize other actions (extension points) of the evictor,
 // like filtering, sorting, and other ones that might be relevant in the future
 type DefaultEvictor struct {
-	logger      klog.Logger
 	args        *DefaultEvictorArgs
 	constraints []constraint
 	handle      frameworktypes.Handle
@@ -72,360 +66,136 @@ func HaveEvictAnnotation(pod *v1.Pod) bool {
 
 // New builds plugin from its arguments while passing a handle
 // nolint: gocyclo
-func New(ctx context.Context, args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
 	defaultEvictorArgs, ok := args.(*DefaultEvictorArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type defaultEvictorFilterArgs, got %T", args)
 	}
-	logger := klog.FromContext(ctx).WithValues("plugin", PluginName)
 
 	ev := &DefaultEvictor{
-		logger: logger,
 		handle: handle,
 		args:   defaultEvictorArgs,
 	}
-	// add constraints
-	err := ev.addAllConstraints(logger, handle)
-	if err != nil {
-		return nil, err
-	}
 
-	if ev.args.NamespaceLabelSelector != nil && (len(ev.args.NamespaceLabelSelector.MatchLabels) > 0 || len(ev.args.NamespaceLabelSelector.MatchExpressions) > 0) {
-		selector, nslErr := metav1.LabelSelectorAsSelector(ev.args.NamespaceLabelSelector)
-		if nslErr != nil {
-			return nil, fmt.Errorf("unable to convert namespaceLabelSelector to label selector: %w", nslErr)
-		}
-		indexName := namespaceWithLabelSelector + ev.handle.PluginInstanceID()
-		if nslErr := addNamespaceLabelSelectorIndexer(ev.handle.SharedInformerFactory().Core().V1().Namespaces().Informer(), indexName, selector); nslErr != nil {
-			return nil, fmt.Errorf("failed to add namespace label selector indexer: %w", nslErr)
-		}
-	}
-	return ev, nil
-}
-
-func addNamespaceLabelSelectorIndexer(informer cache.SharedIndexInformer, indexName string, selector labels.Selector) error {
-	indexer := informer.GetIndexer()
-	for name := range indexer.GetIndexers() {
-		if name == indexName {
-			return nil
-		}
-	}
-	return informer.AddIndexers(cache.Indexers{
-		indexName: func(obj interface{}) ([]string, error) {
-			ns, ok := obj.(*v1.Namespace)
-			if !ok {
-				return []string{}, errors.New("unexpected object")
-			}
-			if !selector.Empty() {
-				if !selector.Matches(labels.Set(ns.Labels)) {
-					return []string{}, nil
-				}
-			}
-			return []string{ns.GetName()}, nil
-		},
-	})
-}
-
-func (d *DefaultEvictor) addAllConstraints(logger klog.Logger, handle frameworktypes.Handle) error {
-	args := d.args
-	// Determine effective protected policies based on the provided arguments.
-	effectivePodProtections := getEffectivePodProtections(args)
-
-	if err := applyEffectivePodProtections(d, effectivePodProtections, handle); err != nil {
-		return fmt.Errorf("failed to apply effective protected policies: %w", err)
-	}
-	if constraints, err := evictionConstraintsForLabelSelector(logger, args.LabelSelector); err != nil {
-		return err
-	} else {
-		d.constraints = append(d.constraints, constraints...)
-	}
-	if constraints, err := evictionConstraintsForMinReplicas(logger, args.MinReplicas, handle); err != nil {
-		return err
-	} else {
-		d.constraints = append(d.constraints, constraints...)
-	}
-	d.constraints = append(d.constraints, evictionConstraintsForMinPodAge(args.MinPodAge)...)
-	return nil
-}
-
-// applyEffectivePodProtections configures the evictor with specified Pod protection.
-func applyEffectivePodProtections(d *DefaultEvictor, podProtections []PodProtection, handle frameworktypes.Handle) error {
-	protectionMap := make(map[PodProtection]bool, len(podProtections))
-	for _, protection := range podProtections {
-		protectionMap[protection] = true
-	}
-
-	// Apply protections
-	if err := applySystemCriticalPodsProtection(d, protectionMap, handle); err != nil {
-		return err
-	}
-	applyFailedBarePodsProtection(d, protectionMap)
-	applyLocalStoragePodsProtection(d, protectionMap)
-	applyDaemonSetPodsProtection(d, protectionMap)
-	applyPVCPodsProtection(d, protectionMap)
-	applyPodsWithoutPDBProtection(d, protectionMap, handle)
-	applyPodsWithResourceClaimsProtection(d, protectionMap)
-
-	return nil
-}
-
-// protectedPVCStorageClasses returns the list of storage classes that should
-// be protected from eviction. If the list is empty or nil then all storage
-// classes are protected (assuming PodsWithPVC protection is enabled).
-func protectedPVCStorageClasses(d *DefaultEvictor) []ProtectedStorageClass {
-	protcfg := d.args.PodProtections.Config
-	if protcfg == nil {
-		return nil
-	}
-	scconfig := protcfg.PodsWithPVC
-	if scconfig == nil {
-		return nil
-	}
-	return scconfig.ProtectedStorageClasses
-}
-
-// podStorageClasses returns a list of storage classes referred by a pod. We
-// need this when assessing if a pod should be protected because it refers to a
-// protected storage class.
-func podStorageClasses(inf informers.SharedInformerFactory, pod *v1.Pod) ([]string, error) {
-	lister := inf.Core().V1().PersistentVolumeClaims().Lister().PersistentVolumeClaims(
-		pod.Namespace,
-	)
-
-	referred := map[string]bool{}
-	for _, vol := range pod.Spec.Volumes {
-		if vol.PersistentVolumeClaim == nil {
-			continue
-		}
-
-		claim, err := lister.Get(vol.PersistentVolumeClaim.ClaimName)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"failed to get persistent volume claim %q/%q: %w",
-				pod.Namespace, vol.PersistentVolumeClaim.ClaimName, err,
-			)
-		}
-
-		// this should never happen as once a pvc is created with a nil
-		// storageClass it is automatically picked up by the default
-		// storage class. By returning an error here we make the pod
-		// protected from eviction.
-		if claim.Spec.StorageClassName == nil || *claim.Spec.StorageClassName == "" {
-			return nil, fmt.Errorf(
-				"failed to resolve storage class for pod %q/%q",
-				pod.Namespace, claim.Name,
-			)
-		}
-
-		referred[*claim.Spec.StorageClassName] = true
-	}
-
-	return slices.Collect(maps.Keys(referred)), nil
-}
-
-func applyFailedBarePodsProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool) {
-	isProtectionEnabled := protectionMap[FailedBarePods]
-	if !isProtectionEnabled {
-		d.logger.V(1).Info("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
+	if defaultEvictorArgs.EvictFailedBarePods {
+		klog.V(1).InfoS("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
+		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 {
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
-			if len(podutil.OwnerRef(pod)) == 0 {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			ownerRefList := podutil.OwnerRef(pod)
+			if len(ownerRefList) == 0 {
 				return fmt.Errorf("pod does not have any ownerRefs")
 			}
 			return nil
 		})
 	}
-}
+	if !defaultEvictorArgs.EvictSystemCriticalPods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if utils.IsCriticalPriorityPod(pod) {
+				return fmt.Errorf("pod has system critical priority")
+			}
+			return nil
+		})
 
-func applySystemCriticalPodsProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool, handle frameworktypes.Handle) error {
-	isProtectionEnabled := protectionMap[SystemCriticalPods]
-	if !isProtectionEnabled {
-		d.logger.V(1).Info("Warning: System critical pod protection is disabled. This could cause eviction of Kubernetes system pods.")
-		return nil
-	}
-
-	d.constraints = append(d.constraints, func(pod *v1.Pod) error {
-		if utils.IsCriticalPriorityPod(pod) {
-			return fmt.Errorf("pod has system critical priority and is protected against eviction")
-		}
-		return nil
-	})
-
-	priorityThreshold := d.args.PriorityThreshold
-	if priorityThreshold != nil && (priorityThreshold.Value != nil || len(priorityThreshold.Name) > 0) {
-		thresholdPriority, err := utils.GetPriorityValueFromPriorityThreshold(context.TODO(), handle.ClientSet(), priorityThreshold)
-		if err != nil {
-			d.logger.Error(err, "failed to get priority threshold")
-			return err
-		}
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
-			if !IsPodEvictableBasedOnPriority(pod, thresholdPriority) {
+		if defaultEvictorArgs.PriorityThreshold != nil && (defaultEvictorArgs.PriorityThreshold.Value != nil || len(defaultEvictorArgs.PriorityThreshold.Name) > 0) {
+			thresholdPriority, err := utils.GetPriorityValueFromPriorityThreshold(context.TODO(), handle.ClientSet(), defaultEvictorArgs.PriorityThreshold)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get priority threshold: %v", err)
+			}
+			ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+				if IsPodEvictableBasedOnPriority(pod, thresholdPriority) {
+					return nil
+				}
 				return fmt.Errorf("pod has higher priority than specified priority class threshold")
-			}
-			return nil
-		})
+			})
+		}
+	} else {
+		klog.V(1).InfoS("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.")
 	}
-	return nil
-}
-
-func applyLocalStoragePodsProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool) {
-	isProtectionEnabled := protectionMap[PodsWithLocalStorage]
-	if isProtectionEnabled {
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
+	if !defaultEvictorArgs.EvictLocalStoragePods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
 			if utils.IsPodWithLocalStorage(pod) {
-				return fmt.Errorf("pod has local storage and is protected against eviction")
+				return fmt.Errorf("pod has local storage and descheduler is not configured with evictLocalStoragePods")
 			}
 			return nil
 		})
 	}
-}
-
-func applyDaemonSetPodsProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool) {
-	isProtectionEnabled := protectionMap[DaemonSetPods]
-	if isProtectionEnabled {
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
+	if !defaultEvictorArgs.EvictDaemonSetPods {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
 			ownerRefList := podutil.OwnerRef(pod)
 			if utils.IsDaemonsetPod(ownerRefList) {
-				return fmt.Errorf("daemonset pods are protected against eviction")
+				return fmt.Errorf("pod is related to daemonset and descheduler is not configured with evictDaemonSetPods")
 			}
 			return nil
 		})
 	}
-}
-
-// applyPVCPodsProtection protects pods that refer to a PVC from eviction. If
-// the user has specified a list of storage classes to protect then only pods
-// referring to PVCs of those storage classes are protected.
-func applyPVCPodsProtection(d *DefaultEvictor, enabledProtections map[PodProtection]bool) {
-	if !enabledProtections[PodsWithPVC] {
-		return
+	if defaultEvictorArgs.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
+		})
+	}
+	selector, err := metav1.LabelSelectorAsSelector(defaultEvictorArgs.LabelSelector)
+	if err != nil {
+		return nil, fmt.Errorf("could not get selector from label selector")
+	}
+	if defaultEvictorArgs.LabelSelector != nil && !selector.Empty() {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if !selector.Matches(labels.Set(pod.Labels)) {
+				return fmt.Errorf("pod labels do not match the labelSelector filter in the policy parameter")
+			}
+			return nil
+		})
 	}
 
-	// if the user isn't filtering by storage classes we protect all pods
-	// referring to a PVC.
-	protected := protectedPVCStorageClasses(d)
-	if len(protected) == 0 {
-		d.constraints = append(
-			d.constraints,
-			func(pod *v1.Pod) error {
-				if utils.IsPodWithPVC(pod) {
-					return fmt.Errorf("pod with PVC is protected against eviction")
-				}
+	if defaultEvictorArgs.MinReplicas > 1 {
+		indexName := "metadata.ownerReferences"
+		indexer, err := getPodIndexerByOwnerRefs(indexName, handle)
+		if err != nil {
+			return nil, err
+		}
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if len(pod.OwnerReferences) == 0 {
 				return nil
-			},
-		)
-		return
-	}
+			}
 
-	protectedsc := map[string]bool{}
-	for _, class := range protected {
-		protectedsc[class.Name] = true
-	}
+			if len(pod.OwnerReferences) > 1 {
+				klog.V(5).InfoS("pod has multiple owner references which is not supported for minReplicas check", "size", len(pod.OwnerReferences), "pod", klog.KObj(pod))
+				return nil
+			}
 
-	d.constraints = append(
-		d.constraints, func(pod *v1.Pod) error {
-			classes, err := podStorageClasses(d.handle.SharedInformerFactory(), pod)
+			ownerRef := pod.OwnerReferences[0]
+			objs, err := indexer.ByIndex(indexName, string(ownerRef.UID))
 			if err != nil {
-				return err
+				return fmt.Errorf("unable to list pods for minReplicas filter in the policy parameter")
 			}
-			for _, class := range classes {
-				if !protectedsc[class] {
-					continue
-				}
-				return fmt.Errorf("pod using protected storage class %q", class)
+
+			if uint(len(objs)) < defaultEvictorArgs.MinReplicas {
+				return fmt.Errorf("owner has %d replicas which is less than minReplicas of %d", len(objs), defaultEvictorArgs.MinReplicas)
 			}
+
 			return nil
-		},
-	)
-}
+		})
+	}
 
-func applyPodsWithoutPDBProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool, handle frameworktypes.Handle) {
-	isProtectionEnabled := protectionMap[PodsWithoutPDB]
-	if isProtectionEnabled {
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
-			hasPdb, err := utils.IsPodCoveredByPDB(pod, handle.SharedInformerFactory().Policy().V1().PodDisruptionBudgets().Lister())
-			if err != nil {
-				return fmt.Errorf("unable to check if pod is covered by PodDisruptionBudget: %w", err)
-			}
-			if !hasPdb {
-				return fmt.Errorf("pod does not have a PodDisruptionBudget and is protected against eviction")
+	if defaultEvictorArgs.MinPodAge != nil {
+		ev.constraints = append(ev.constraints, func(pod *v1.Pod) error {
+			if pod.Status.StartTime == nil || time.Since(pod.Status.StartTime.Time) < defaultEvictorArgs.MinPodAge.Duration {
+				return fmt.Errorf("pod age is not older than MinPodAge: %s seconds", defaultEvictorArgs.MinPodAge.String())
 			}
 			return nil
 		})
 	}
-}
-
-func applyPodsWithResourceClaimsProtection(d *DefaultEvictor, protectionMap map[PodProtection]bool) {
-	isProtectionEnabled := protectionMap[PodsWithResourceClaims]
-	if isProtectionEnabled {
-		d.constraints = append(d.constraints, func(pod *v1.Pod) error {
-			if utils.IsPodWithResourceClaims(pod) {
-				return fmt.Errorf("pod has ResourceClaims and descheduler is configured to protect ResourceClaims pods")
-			}
-			return nil
-		})
-	}
-}
-
-// getEffectivePodProtections determines which policies are currently active.
-// It supports both new-style (PodProtections) and legacy-style flags.
-func getEffectivePodProtections(args *DefaultEvictorArgs) []PodProtection {
-	// determine whether to use PodProtections config
-	useNewConfig := len(args.PodProtections.DefaultDisabled) > 0 || len(args.PodProtections.ExtraEnabled) > 0
-
-	if !useNewConfig {
-		// fall back to the Deprecated config
-		return legacyGetPodProtections(args)
-	}
-
-	// effective is the final list of active protection.
-	effective := make([]PodProtection, 0)
-	effective = append(effective, defaultPodProtections...)
-
-	// Remove PodProtections that are in the DefaultDisabled list.
-	effective = slices.DeleteFunc(effective, func(protection PodProtection) bool {
-		return slices.Contains(args.PodProtections.DefaultDisabled, protection)
-	})
-
-	// Add extra enabled in PodProtections
-	effective = append(effective, args.PodProtections.ExtraEnabled...)
-
-	return effective
-}
-
-// legacyGetPodProtections returns protections using deprecated boolean flags.
-func legacyGetPodProtections(args *DefaultEvictorArgs) []PodProtection {
-	var protections []PodProtection
-
-	// defaultDisabled
-	if !args.EvictLocalStoragePods {
-		protections = append(protections, PodsWithLocalStorage)
-	}
-	if !args.EvictDaemonSetPods {
-		protections = append(protections, DaemonSetPods)
-	}
-	if !args.EvictSystemCriticalPods {
-		protections = append(protections, SystemCriticalPods)
-	}
-	if !args.EvictFailedBarePods {
-		protections = append(protections, FailedBarePods)
-	}
-
-	// extraEnabled
-	if args.IgnorePvcPods {
-		protections = append(protections, PodsWithPVC)
-	}
-	if args.IgnorePodsWithoutPDB {
-		protections = append(protections, PodsWithoutPDB)
-	}
-	return protections
+	return ev, nil
 }
 
 // Name retrieves the plugin name
@@ -434,47 +204,28 @@ func (d *DefaultEvictor) Name() string {
 }
 
 func (d *DefaultEvictor) PreEvictionFilter(pod *v1.Pod) bool {
-	logger := d.logger.WithValues("ExtensionPoint", frameworktypes.PreEvictionFilterExtensionPoint)
 	if d.args.NodeFit {
 		nodes, err := nodeutil.ReadyNodes(context.TODO(), d.handle.ClientSet(), d.handle.SharedInformerFactory().Core().V1().Nodes().Lister(), d.args.NodeSelector)
 		if err != nil {
-			logger.Error(err, "unable to list ready nodes", "pod", klog.KObj(pod))
+			klog.ErrorS(err, "unable to list ready nodes", "pod", klog.KObj(pod))
 			return false
 		}
 		if !nodeutil.PodFitsAnyOtherNode(d.handle.GetPodsAssignedToNodeFunc(), pod, nodes) {
-			logger.Info("pod does not fit on any other node because of nodeSelector(s), Taint(s), or nodes marked as unschedulable", "pod", klog.KObj(pod))
+			klog.InfoS("pod does not fit on any other node because of nodeSelector(s), Taint(s), or nodes marked as unschedulable", "pod", klog.KObj(pod))
 			return false
 		}
-	}
-
-	if d.args.NamespaceLabelSelector == nil || (len(d.args.NamespaceLabelSelector.MatchLabels) == 0 && len(d.args.NamespaceLabelSelector.MatchExpressions) == 0) {
 		return true
 	}
-	indexName := namespaceWithLabelSelector + d.handle.PluginInstanceID()
-	objs, err := d.handle.SharedInformerFactory().Core().V1().Namespaces().Informer().GetIndexer().ByIndex(indexName, pod.Namespace)
-	if err != nil {
-		logger.Error(err, "unable to list namespaces for namespaceLabelSelector filter in the policy parameter", "pod", klog.KObj(pod))
-		return false
-	}
-	if len(objs) == 0 {
-		logger.Info("pod namespace do not match the namespaceLabelSelector filter in the policy parameter", "pod", klog.KObj(pod))
-		return false
-	}
 	return true
 }
 
 func (d *DefaultEvictor) Filter(pod *v1.Pod) bool {
-	logger := d.logger.WithValues("ExtensionPoint", frameworktypes.FilterExtensionPoint)
 	checkErrs := []error{}
 
 	if HaveEvictAnnotation(pod) {
 		return true
 	}
 
-	if d.args.NoEvictionPolicy == MandatoryNoEvictionPolicy && evictionutils.HaveNoEvictionAnnotation(pod) {
-		return false
-	}
-
 	if utils.IsMirrorPod(pod) {
 		checkErrs = append(checkErrs, fmt.Errorf("pod is a mirror pod"))
 	}
@@ -494,7 +245,7 @@ func (d *DefaultEvictor) Filter(pod *v1.Pod) bool {
 	}
 
 	if len(checkErrs) > 0 {
-		logger.V(4).Info("Pod fails the following checks", "pod", klog.KObj(pod), "checks", utilerrors.NewAggregate(checkErrs).Error())
+		klog.V(4).InfoS("Pod fails the following checks", "pod", klog.KObj(pod), "checks", utilerrors.NewAggregate(checkErrs).Error())
 		return false
 	}
 
@@ -524,5 +275,6 @@ func getPodIndexerByOwnerRefs(indexName string, handle frameworktypes.Handle) (c
 	}); err != nil {
 		return nil, err
 	}
+
 	return indexer, nil
 }

pkg/framework/plugins/defaultevictor/defaults.go

@@ -21,6 +21,35 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 	return RegisterDefaults(scheme)
 }
 
-// SetDefaults_DefaultEvictorArgs sets the default values for the
-// DefaultEvictorArgs configuration.
-func SetDefaults_DefaultEvictorArgs(obj runtime.Object) {}
+// SetDefaults_DefaultEvictorArgs
+// TODO: the final default values would be discussed in community
+func SetDefaults_DefaultEvictorArgs(obj runtime.Object) {
+	args := obj.(*DefaultEvictorArgs)
+	if args.NodeSelector == "" {
+		args.NodeSelector = ""
+	}
+	if !args.EvictLocalStoragePods {
+		args.EvictLocalStoragePods = false
+	}
+	if !args.EvictDaemonSetPods {
+		args.EvictDaemonSetPods = false
+	}
+	if !args.EvictSystemCriticalPods {
+		args.EvictSystemCriticalPods = false
+	}
+	if !args.IgnorePvcPods {
+		args.IgnorePvcPods = false
+	}
+	if !args.EvictFailedBarePods {
+		args.EvictFailedBarePods = false
+	}
+	if args.LabelSelector == nil {
+		args.LabelSelector = nil
+	}
+	if args.PriorityThreshold == nil {
+		args.PriorityThreshold = nil
+	}
+	if !args.NodeFit {
+		args.NodeFit = false
+	}
+}

pkg/framework/plugins/defaultevictor/defaults_test.go

@@ -17,7 +17,6 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	utilptr "k8s.io/utils/ptr"
@@ -43,7 +42,6 @@ func TestSetDefaults_DefaultEvictorArgs(t *testing.T) {
 				LabelSelector:           nil,
 				PriorityThreshold:       nil,
 				NodeFit:                 false,
-				IgnorePodsWithoutPDB:    false,
 			},
 		},
 		{
@@ -59,8 +57,7 @@ func TestSetDefaults_DefaultEvictorArgs(t *testing.T) {
 				PriorityThreshold: &api.PriorityThreshold{
 					Value: utilptr.To[int32](800),
 				},
-				NodeFit:              true,
-				IgnorePodsWithoutPDB: true,
+				NodeFit: true,
 			},
 			want: &DefaultEvictorArgs{
 				NodeSelector:            "NodeSelector",
@@ -73,8 +70,7 @@ func TestSetDefaults_DefaultEvictorArgs(t *testing.T) {
 				PriorityThreshold: &api.PriorityThreshold{
 					Value: utilptr.To[int32](800),
 				},
-				NodeFit:              true,
-				IgnorePodsWithoutPDB: true,
+				NodeFit: true,
 			},
 		},
 	}

pkg/framework/plugins/defaultevictor/types.go

@@ -15,7 +15,6 @@ package defaultevictor
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"sigs.k8s.io/descheduler/pkg/api"
 )
 
@@ -26,133 +25,15 @@ import (
 type DefaultEvictorArgs struct {
 	metav1.TypeMeta `json:",inline"`
 
-	NodeSelector           string                 `json:"nodeSelector,omitempty"`
-	LabelSelector          *metav1.LabelSelector  `json:"labelSelector,omitempty"`
-	NamespaceLabelSelector *metav1.LabelSelector  `json:"namespaceLabelSelector,omitempty"`
-	PriorityThreshold      *api.PriorityThreshold `json:"priorityThreshold,omitempty"`
-	NodeFit                bool                   `json:"nodeFit,omitempty"`
-	MinReplicas            uint                   `json:"minReplicas,omitempty"`
-	MinPodAge              *metav1.Duration       `json:"minPodAge,omitempty"`
-	NoEvictionPolicy       NoEvictionPolicy       `json:"noEvictionPolicy,omitempty"`
-
-	// PodProtections holds the list of enabled and disabled protection policies.
-	// Users can selectively disable certain default protection rules or enable extra ones.
-	PodProtections PodProtections `json:"podProtections,omitempty"`
-
-	// Deprecated: Use DisabledDefaultPodProtection with "PodsWithLocalStorage" instead.
-	EvictLocalStoragePods bool `json:"evictLocalStoragePods,omitempty"`
-	// Deprecated: Use DisabledDefaultPodProtection with "DaemonSetPods" instead.
-	EvictDaemonSetPods bool `json:"evictDaemonSetPods,omitempty"`
-	// Deprecated: Use DisabledDefaultPodProtection with "SystemCriticalPods" instead.
-	EvictSystemCriticalPods bool `json:"evictSystemCriticalPods,omitempty"`
-	// Deprecated: Use ExtraPodProtection with "PodsWithPVC" instead.
-	IgnorePvcPods bool `json:"ignorePvcPods,omitempty"`
-	// Deprecated: Use ExtraPodProtection with "PodsWithoutPDB" instead.
-	IgnorePodsWithoutPDB bool `json:"ignorePodsWithoutPDB,omitempty"`
-	// Deprecated: Use DisabledDefaultPodProtection with "FailedBarePods" instead.
-	EvictFailedBarePods bool `json:"evictFailedBarePods,omitempty"`
+	NodeSelector            string                 `json:"nodeSelector,omitempty"`
+	EvictLocalStoragePods   bool                   `json:"evictLocalStoragePods,omitempty"`
+	EvictDaemonSetPods      bool                   `json:"evictDaemonSetPods,omitempty"`
+	EvictSystemCriticalPods bool                   `json:"evictSystemCriticalPods,omitempty"`
+	IgnorePvcPods           bool                   `json:"ignorePvcPods,omitempty"`
+	EvictFailedBarePods     bool                   `json:"evictFailedBarePods,omitempty"`
+	LabelSelector           *metav1.LabelSelector  `json:"labelSelector,omitempty"`
+	PriorityThreshold       *api.PriorityThreshold `json:"priorityThreshold,omitempty"`
+	NodeFit                 bool                   `json:"nodeFit,omitempty"`
+	MinReplicas             uint                   `json:"minReplicas,omitempty"`
+	MinPodAge               *metav1.Duration       `json:"minPodAge,omitempty"`
 }
-
-// PodProtection defines the protection policy for a pod.
-type PodProtection string
-
-const (
-	PodsWithLocalStorage   PodProtection = "PodsWithLocalStorage"
-	DaemonSetPods          PodProtection = "DaemonSetPods"
-	SystemCriticalPods     PodProtection = "SystemCriticalPods"
-	FailedBarePods         PodProtection = "FailedBarePods"
-	PodsWithPVC            PodProtection = "PodsWithPVC"
-	PodsWithoutPDB         PodProtection = "PodsWithoutPDB"
-	PodsWithResourceClaims PodProtection = "PodsWithResourceClaims"
-)
-
-// PodProtections holds the list of enabled and disabled protection policies.
-// NOTE: The list of default enabled pod protection policies is subject to change in future versions.
-// +k8s:deepcopy-gen=true
-type PodProtections struct {
-	// ExtraEnabled specifies additional protection policies that should be enabled.
-	// Supports: PodsWithPVC, PodsWithoutPDB
-	ExtraEnabled []PodProtection `json:"extraEnabled,omitempty"`
-
-	// DefaultDisabled specifies which default protection policies should be disabled.
-	// Supports: PodsWithLocalStorage, DaemonSetPods, SystemCriticalPods, FailedBarePods
-	DefaultDisabled []PodProtection `json:"defaultDisabled,omitempty"`
-
-	// Config holds configuration for pod protection policies. Depending on
-	// the enabled policies this may be required. For instance, when
-	// enabling the PodsWithPVC policy the user may specify which storage
-	// classes should be protected.
-	Config *PodProtectionsConfig `json:"config,omitempty"`
-}
-
-// PodProtectionsConfig holds configuration for pod protection policies. The
-// name of the fields here must be equal to a protection name. This struct is
-// meant to be extended as more protection policies are added.
-// +k8s:deepcopy-gen=true
-type PodProtectionsConfig struct {
-	PodsWithPVC *PodsWithPVCConfig `json:"PodsWithPVC,omitempty"`
-}
-
-// PodsWithPVCConfig holds configuration for the PodsWithPVC protection.
-// +k8s:deepcopy-gen=true
-type PodsWithPVCConfig struct {
-	// ProtectedStorageClasses is a list of storage classes that we want to
-	// protect. i.e. if a pod refers to one of these storage classes it is
-	// protected from being evicted. If none is provided then all pods with
-	// PVCs are protected from eviction.
-	ProtectedStorageClasses []ProtectedStorageClass `json:"protectedStorageClasses,omitempty"`
-}
-
-// ProtectedStorageClass is used to determine what storage classes are
-// protected when the PodsWithPVC protection is enabled. This object exists
-// so we can later on extend it with more configuration if needed.
-type ProtectedStorageClass struct {
-	Name string `json:"name"`
-}
-
-// defaultPodProtections holds the list of protection policies that are enabled by default.
-// User can use the 'disabledDefaultPodProtections' evictor arguments (via PodProtections.DefaultDisabled)
-// to disable any of these default protections.
-//
-// The following four policies are included by default:
-//   - PodsWithLocalStorage: Protects pods with local storage.
-//   - DaemonSetPods: Protects DaemonSet managed pods.
-//   - SystemCriticalPods: Protects system-critical pods.
-//   - FailedBarePods: Protects failed bare pods (not part of any controller).
-var defaultPodProtections = []PodProtection{
-	PodsWithLocalStorage,
-	SystemCriticalPods,
-	FailedBarePods,
-	DaemonSetPods,
-}
-
-// extraPodProtections holds a list of protection policies that the user can optionally enable
-// through the configuration (via PodProtections.ExtraEnabled). These policies are not enabled by default.
-//
-// Currently supported extra policies:
-//   - PodsWithPVC: Protects pods using PersistentVolumeClaims.
-//   - PodsWithoutPDB: Protects pods lacking a PodDisruptionBudget.
-//   - PodsWithResourceClaims: Protects pods using ResourceClaims.
-var extraPodProtections = []PodProtection{
-	PodsWithPVC,
-	PodsWithoutPDB,
-	PodsWithResourceClaims,
-}
-
-// NoEvictionPolicy dictates whether a no-eviction policy is preferred or mandatory.
-// Needs to be used with caution as this will give users ability to protect their pods
-// from eviction. Which might work against enfored policies. E.g. plugins evicting pods
-// violating security policies.
-type NoEvictionPolicy string
-
-const (
-	// PreferredNoEvictionPolicy interprets the no-eviction policy as a preference.
-	// Meaning the annotation will get ignored by the DefaultEvictor plugin.
-	// Yet, plugins may optionally sort their pods based on the annotation
-	// and focus on evicting pods that do not set the annotation.
-	PreferredNoEvictionPolicy NoEvictionPolicy = "Preferred"
-
-	// MandatoryNoEvictionPolicy interprets the no-eviction policy as mandatory.
-	// Every pod carying the annotation will get excluded from eviction.
-	MandatoryNoEvictionPolicy NoEvictionPolicy = "Mandatory"
-)

pkg/framework/plugins/defaultevictor/validation.go

@@ -15,86 +15,22 @@ package defaultevictor
 
 import (
 	"fmt"
-	"slices"
+
+	"k8s.io/klog/v2"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/klog/v2"
 )
 
 func ValidateDefaultEvictorArgs(obj runtime.Object) error {
 	args := obj.(*DefaultEvictorArgs)
-	var allErrs []error
+
 	if args.PriorityThreshold != nil && args.PriorityThreshold.Value != nil && len(args.PriorityThreshold.Name) > 0 {
-		allErrs = append(allErrs, fmt.Errorf("priority threshold misconfigured, only one of priorityThreshold fields can be set"))
+		return fmt.Errorf("priority threshold misconfigured, only one of priorityThreshold fields can be set, got %v", args)
 	}
 
 	if args.MinReplicas == 1 {
 		klog.V(4).Info("DefaultEvictor minReplicas must be greater than 1 to check for min pods during eviction. This check will be ignored during eviction.")
 	}
 
-	if args.NoEvictionPolicy != "" {
-		if args.NoEvictionPolicy != PreferredNoEvictionPolicy && args.NoEvictionPolicy != MandatoryNoEvictionPolicy {
-			allErrs = append(allErrs, fmt.Errorf("noEvictionPolicy accepts only %q values", []NoEvictionPolicy{PreferredNoEvictionPolicy, MandatoryNoEvictionPolicy}))
-		}
-	}
-
-	// check if any deprecated fields are set to true
-	hasDeprecatedFields := args.EvictLocalStoragePods || args.EvictDaemonSetPods ||
-		args.EvictSystemCriticalPods || args.IgnorePvcPods ||
-		args.EvictFailedBarePods || args.IgnorePodsWithoutPDB
-
-	// disallow mixing deprecated fields with PodProtections.ExtraEnabled and PodProtections.DefaultDisabled
-	if hasDeprecatedFields && (len(args.PodProtections.ExtraEnabled) > 0 || len(args.PodProtections.DefaultDisabled) > 0) {
-		allErrs = append(allErrs, fmt.Errorf("cannot use Deprecated fields alongside PodProtections.ExtraEnabled or PodProtections.DefaultDisabled"))
-	}
-
-	if len(args.PodProtections.ExtraEnabled) > 0 || len(args.PodProtections.DefaultDisabled) > 0 {
-
-		for _, policy := range args.PodProtections.ExtraEnabled {
-			if !slices.Contains(extraPodProtections, policy) {
-				allErrs = append(allErrs, fmt.Errorf("invalid pod protection policy in ExtraEnabled: %q. Valid options are: %v",
-					string(policy), extraPodProtections))
-			}
-		}
-
-		for _, policy := range args.PodProtections.DefaultDisabled {
-			if !slices.Contains(defaultPodProtections, policy) {
-				allErrs = append(allErrs, fmt.Errorf("invalid pod protection policy in DefaultDisabled: %q. Valid options are: %v",
-					string(policy), defaultPodProtections))
-			}
-		}
-
-		if hasDuplicates(args.PodProtections.DefaultDisabled) {
-			allErrs = append(allErrs, fmt.Errorf("PodProtections.DefaultDisabled contains duplicate entries"))
-		}
-
-		if hasDuplicates(args.PodProtections.ExtraEnabled) {
-			allErrs = append(allErrs, fmt.Errorf("PodProtections.ExtraEnabled contains duplicate entries"))
-		}
-
-		if slices.Contains(args.PodProtections.ExtraEnabled, PodsWithPVC) {
-			if args.PodProtections.Config != nil && args.PodProtections.Config.PodsWithPVC != nil {
-				protectedsc := args.PodProtections.Config.PodsWithPVC.ProtectedStorageClasses
-				for i, sc := range protectedsc {
-					if sc.Name == "" {
-						allErrs = append(allErrs, fmt.Errorf("PodProtections.Config.PodsWithPVC.ProtectedStorageClasses[%d] name cannot be empty", i))
-					}
-				}
-			}
-		}
-	}
-
-	return utilerrors.NewAggregate(allErrs)
-}
-
-func hasDuplicates(slice []PodProtection) bool {
-	seen := make(map[PodProtection]struct{}, len(slice))
-	for _, item := range slice {
-		if _, exists := seen[item]; exists {
-			return true
-		}
-		seen[item] = struct{}{}
-	}
-	return false
+	return nil
 }

pkg/framework/plugins/defaultevictor/validation_test.go

@@ -1,242 +0,0 @@
-/*
-Copyright 2024 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 defaultevictor
-
-import (
-	"fmt"
-	"testing"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	utilptr "k8s.io/utils/ptr"
-	"sigs.k8s.io/descheduler/pkg/api"
-)
-
-func TestValidateDefaultEvictorArgs(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    *DefaultEvictorArgs
-		errInfo error
-	}{
-		{
-			name: "passing invalid priority",
-			args: &DefaultEvictorArgs{
-				PriorityThreshold: &api.PriorityThreshold{
-					Value: utilptr.To[int32](1),
-					Name:  "priority-name",
-				},
-			},
-			errInfo: fmt.Errorf("priority threshold misconfigured, only one of priorityThreshold fields can be set"),
-		},
-		{
-			name: "passing invalid no eviction policy",
-			args: &DefaultEvictorArgs{
-				NoEvictionPolicy: "invalid-no-eviction-policy",
-			},
-			errInfo: fmt.Errorf("noEvictionPolicy accepts only %q values", []NoEvictionPolicy{PreferredNoEvictionPolicy, MandatoryNoEvictionPolicy}),
-		},
-		{
-			name: "Valid configuration with no deprecated fields",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{},
-					ExtraEnabled:    []PodProtection{},
-				},
-			},
-			errInfo: nil,
-		},
-		{
-			name: "Valid configuration: both Disabled and ExtraEnabled",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{
-						DaemonSetPods,
-						PodsWithLocalStorage,
-					},
-					ExtraEnabled: []PodProtection{
-						PodsWithPVC,
-					},
-				},
-			},
-			errInfo: nil,
-		},
-		{
-			name: "Valid configuration with ExtraEnabled",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{
-						PodsWithPVC,
-					},
-				},
-			},
-			errInfo: nil,
-		},
-		{
-			name: "Invalid configuration: Deprecated field used with Disabled",
-			args: &DefaultEvictorArgs{
-				EvictLocalStoragePods: true,
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{
-						DaemonSetPods,
-					},
-				},
-			},
-			errInfo: fmt.Errorf("cannot use Deprecated fields alongside PodProtections.ExtraEnabled or PodProtections.DefaultDisabled"),
-		},
-		{
-			name: "Invalid configuration: Deprecated field used with ExtraPodProtections",
-			args: &DefaultEvictorArgs{
-				EvictDaemonSetPods: true,
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{
-						PodsWithPVC,
-					},
-				},
-			},
-			errInfo: fmt.Errorf("cannot use Deprecated fields alongside PodProtections.ExtraEnabled or PodProtections.DefaultDisabled"),
-		},
-		{
-			name: "MinReplicas warning logged but no error",
-			args: &DefaultEvictorArgs{
-				MinReplicas: 1,
-			},
-			errInfo: nil,
-		},
-		{
-			name: "Invalid ExtraEnabled: Unknown policy",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{"InvalidPolicy"},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in ExtraEnabled: "InvalidPolicy". Valid options are: [PodsWithPVC PodsWithoutPDB PodsWithResourceClaims]`),
-		},
-		{
-			name: "Invalid ExtraEnabled: Misspelled policy",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{"PodsWithPVCC"},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in ExtraEnabled: "PodsWithPVCC". Valid options are: [PodsWithPVC PodsWithoutPDB PodsWithResourceClaims]`),
-		},
-		{
-			name: "Invalid ExtraEnabled: Policy from DefaultDisabled list",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{DaemonSetPods},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in ExtraEnabled: "DaemonSetPods". Valid options are: [PodsWithPVC PodsWithoutPDB PodsWithResourceClaims]`),
-		},
-		{
-			name: "Invalid DefaultDisabled: Unknown policy",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{"InvalidPolicy"},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in DefaultDisabled: "InvalidPolicy". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods]`),
-		},
-		{
-			name: "Invalid DefaultDisabled: Misspelled policy",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{"PodsWithLocalStorag"},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in DefaultDisabled: "PodsWithLocalStorag". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods]`),
-		},
-		{
-			name: "Invalid DefaultDisabled: Policy from ExtraEnabled list",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{PodsWithPVC},
-				},
-			},
-			errInfo: fmt.Errorf(`invalid pod protection policy in DefaultDisabled: "PodsWithPVC". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods]`),
-		},
-		{
-			name: "Invalid ExtraEnabled duplicate",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{PodsWithPVC, PodsWithPVC},
-				},
-			},
-			errInfo: fmt.Errorf(`PodProtections.ExtraEnabled contains duplicate entries`),
-		},
-		{
-			name: "Invalid DefaultDisabled duplicate",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					DefaultDisabled: []PodProtection{PodsWithLocalStorage, PodsWithLocalStorage},
-				},
-			},
-			errInfo: fmt.Errorf(`PodProtections.DefaultDisabled contains duplicate entries`),
-		},
-		{
-			name: "Invalid DefaultDisabled duplicate and Invalid ExtraEnabled duplicate and passing invalid no eviction policy",
-			args: &DefaultEvictorArgs{
-				NoEvictionPolicy: "invalid-no-eviction-policy",
-				PodProtections: PodProtections{
-					ExtraEnabled:    []PodProtection{PodsWithPVC, PodsWithPVC},
-					DefaultDisabled: []PodProtection{PodsWithLocalStorage, PodsWithLocalStorage, PodsWithoutPDB},
-				},
-			},
-			errInfo: fmt.Errorf(`[noEvictionPolicy accepts only ["Preferred" "Mandatory"] values, invalid pod protection policy in DefaultDisabled: "PodsWithoutPDB". Valid options are: [PodsWithLocalStorage SystemCriticalPods FailedBarePods DaemonSetPods], PodProtections.DefaultDisabled contains duplicate entries, PodProtections.ExtraEnabled contains duplicate entries]`),
-		},
-		{
-			name: "Protected storage classes without storage class name",
-			args: &DefaultEvictorArgs{
-				PodProtections: PodProtections{
-					ExtraEnabled: []PodProtection{PodsWithPVC},
-					Config: &PodProtectionsConfig{
-						PodsWithPVC: &PodsWithPVCConfig{
-							ProtectedStorageClasses: []ProtectedStorageClass{
-								{
-									Name: "",
-								},
-								{
-									Name: "protected-storage-class-0",
-								},
-								{
-									Name: "",
-								},
-								{
-									Name: "protected-storage-class-1",
-								},
-							},
-						},
-					},
-				},
-			},
-			errInfo: fmt.Errorf(`[PodProtections.Config.PodsWithPVC.ProtectedStorageClasses[0] name cannot be empty, PodProtections.Config.PodsWithPVC.ProtectedStorageClasses[2] name cannot be empty]`),
-		},
-	}
-
-	for _, testCase := range tests {
-		t.Run(testCase.name, func(t *testing.T) {
-			validateErr := ValidateDefaultEvictorArgs(runtime.Object(testCase.args))
-			if validateErr == nil || testCase.errInfo == nil {
-				if validateErr != testCase.errInfo {
-					t.Errorf("expected validity of plugin config: %q but got %q instead", testCase.errInfo, validateErr)
-				}
-			} else if validateErr.Error() != testCase.errInfo.Error() {
-				t.Errorf("expected validity of plugin config: %q but got %q instead", testCase.errInfo, validateErr)
-			}
-		})
-	}
-}

pkg/framework/plugins/defaultevictor/zz_generated.deepcopy.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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.
@@ -36,11 +36,6 @@ func (in *DefaultEvictorArgs) DeepCopyInto(out *DefaultEvictorArgs) {
 		*out = new(v1.LabelSelector)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.NamespaceLabelSelector != nil {
-		in, out := &in.NamespaceLabelSelector, &out.NamespaceLabelSelector
-		*out = new(v1.LabelSelector)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.PriorityThreshold != nil {
 		in, out := &in.PriorityThreshold, &out.PriorityThreshold
 		*out = new(api.PriorityThreshold)
@@ -51,7 +46,6 @@ func (in *DefaultEvictorArgs) DeepCopyInto(out *DefaultEvictorArgs) {
 		*out = new(v1.Duration)
 		**out = **in
 	}
-	in.PodProtections.DeepCopyInto(&out.PodProtections)
 	return
 }
 
@@ -72,76 +66,3 @@ func (in *DefaultEvictorArgs) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodProtections) DeepCopyInto(out *PodProtections) {
-	*out = *in
-	if in.ExtraEnabled != nil {
-		in, out := &in.ExtraEnabled, &out.ExtraEnabled
-		*out = make([]PodProtection, len(*in))
-		copy(*out, *in)
-	}
-	if in.DefaultDisabled != nil {
-		in, out := &in.DefaultDisabled, &out.DefaultDisabled
-		*out = make([]PodProtection, len(*in))
-		copy(*out, *in)
-	}
-	if in.Config != nil {
-		in, out := &in.Config, &out.Config
-		*out = new(PodProtectionsConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodProtections.
-func (in *PodProtections) DeepCopy() *PodProtections {
-	if in == nil {
-		return nil
-	}
-	out := new(PodProtections)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodProtectionsConfig) DeepCopyInto(out *PodProtectionsConfig) {
-	*out = *in
-	if in.PodsWithPVC != nil {
-		in, out := &in.PodsWithPVC, &out.PodsWithPVC
-		*out = new(PodsWithPVCConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodProtectionsConfig.
-func (in *PodProtectionsConfig) DeepCopy() *PodProtectionsConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(PodProtectionsConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PodsWithPVCConfig) DeepCopyInto(out *PodsWithPVCConfig) {
-	*out = *in
-	if in.ProtectedStorageClasses != nil {
-		in, out := &in.ProtectedStorageClasses, &out.ProtectedStorageClasses
-		*out = make([]ProtectedStorageClass, len(*in))
-		copy(*out, *in)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodsWithPVCConfig.
-func (in *PodsWithPVCConfig) DeepCopy() *PodsWithPVCConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(PodsWithPVCConfig)
-	in.DeepCopyInto(out)
-	return out
-}

pkg/framework/plugins/defaultevictor/zz_generated.defaults.go

@@ -2,7 +2,7 @@
 // +build !ignore_autogenerated
 
 /*
-Copyright 2026 The Kubernetes Authors.
+Copyright 2024 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/framework/plugins/example/README.md

@@ -1,90 +0,0 @@
-# Descheduler Plugin: Example Implementation
-
-This directory provides an example plugin for the Kubernetes Descheduler,
-demonstrating how to evict pods based on custom criteria. The plugin targets
-pods based on:
-
-* **Name Regex:** Pods matching a specified regular expression.
-* **Age:** Pods older than a defined duration.
-* **Namespace:** Pods within or outside a given list of namespaces (inclusion
-  or exclusion).
-
-## Building and Integrating the Plugin
-
-To incorporate this plugin into your Descheduler build, you must register it
-within the Descheduler's plugin registry. Follow these steps:
-
-1.  **Register the Plugin:**
-    * Modify the `pkg/descheduler/setupplugins.go` file.
-    * Add the following registration line to the end of the
-      `RegisterDefaultPlugins()` function:
-
-    ```go
-    pluginregistry.Register(
-      example.PluginName,
-      example.New,
-      &example.Example{},
-      &example.ExampleArgs{},
-      example.ValidateExampleArgs,
-      example.SetDefaults_Example,
-      registry,
-    )
-    ```
-
-2.  **Generate Code:**
-    * If you modify the plugin's code, execute `make gen` before rebuilding the
-      Descheduler. This ensures generated code is up-to-date.
-
-3.  **Rebuild the Descheduler:**
-    * Build the descheduler with your changes.
-
-## Plugin Configuration
-
-Configure the plugin's behavior using the Descheduler's policy configuration.
-Here's an example:
-
-```yaml
-apiVersion: descheduler/v1alpha2
-kind: DeschedulerPolicy
-profiles:
-- name: LifecycleAndUtilization
-  plugins:
-    deschedule:
-      enabled:
-        - Example
-  pluginConfig:
-  - name: Example
-    args:
-      regex: ^descheduler-test.*$
-      maxAge: 3m
-      namespaces:
-        include:
-        - default
-```
-
-## Explanation
-
-- `regex: ^descheduler-test.*$`: Evicts pods whose names match the regular
-  expression `^descheduler-test.*$`.
-- `maxAge: 3m`: Evicts pods older than 3 minutes.
-- `namespaces.include: - default`: Evicts pods within the default namespace.
-
-This configuration will cause the plugin to evict pods that meet all three
-criteria: matching the `regex`, exceeding the `maxAge`, and residing in the
-specified namespace.
-
-## Notes
-
-- This plugin is configured through the `ExampleArgs` struct, which defines the
-  plugin's parameters.
-- Plugins must implement a function to validate and another to set the default
-  values for their `Args` struct.
-- The fields in the `ExampleArgs` struct reflect directly into the
-  `DeschedulerPolicy` configuration.
-- Plugins must comply with the `DeschedulePlugin` interface to be registered
-  with the Descheduler.
-- The main functionality of the plugin is implemented in the `Deschedule()`
-  method, which is called by the Descheduler when the plugin is executed.
-- A good amount of descheduling logic can be achieved by means of filters.
-- Whenever a change in the Plugin's configuration is made the developer should
-  regenerate the code by running `make gen`.

pkg/framework/plugins/example/defaults.go

@@ -1,36 +0,0 @@
-/*
-Copyright 2025 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 example
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return RegisterDefaults(scheme)
-}
-
-// SetDefaults_Example sets the default arguments for the Example plugin. On
-// this case we set the default regex to match only empty strings (this should
-// not ever match anything). The default maximum age for pods is set to 5
-// minutes.
-func SetDefaults_Example(obj runtime.Object) {
-	args := obj.(*ExampleArgs)
-	if args.Regex == "" {
-		args.Regex = "^$"
-	}
-	if args.MaxAge == "" {
-		args.MaxAge = "5m"
-	}
-}

pkg/framework/plugins/example/example.go

@@ -1,186 +0,0 @@
-/*
-Copyright 2025 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 example
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"time"
-
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/klog/v2"
-
-	fwtypes "sigs.k8s.io/descheduler/pkg/framework/types"
-
-	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
-	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-)
-
-// PluginName is used when registering the plugin. You need to choose a unique
-// name across all plugins. This name is used to identify the plugin config in
-// the descheduler policy.
-const PluginName = "Example"
-
-// We need to ensure that the plugin struct complies with the DeschedulePlugin
-// interface. This prevent unexpected changes that may render this type
-// incompatible.
-var _ fwtypes.DeschedulePlugin = &Example{}
-
-// Example is our plugin (implementing the DeschedulePlugin interface). This
-// plugin will evict pods that match a regex and are older than a certain age.
-type Example struct {
-	logger    klog.Logger
-	handle    fwtypes.Handle
-	args      *ExampleArgs
-	podFilter podutil.FilterFunc
-}
-
-// New builds a plugin instance from its arguments. Arguments are passed in as
-// a runtime.Object. Handle is used by plugins to retrieve a kubernetes client
-// set, evictor interface, shared informer factory and other instruments shared
-// across different plugins.
-func New(ctx context.Context, args runtime.Object, handle fwtypes.Handle) (fwtypes.Plugin, error) {
-	// make sure we are receiving the right argument type.
-	exampleArgs, ok := args.(*ExampleArgs)
-	if !ok {
-		return nil, fmt.Errorf("args must be of type ExampleArgs, got %T", args)
-	}
-	logger := klog.FromContext(ctx).WithValues("plugin", PluginName)
-
-	// we can use the included and excluded namespaces to filter the pods we want
-	// to evict.
-	var includedNamespaces, excludedNamespaces sets.Set[string]
-	if exampleArgs.Namespaces != nil {
-		includedNamespaces = sets.New(exampleArgs.Namespaces.Include...)
-		excludedNamespaces = sets.New(exampleArgs.Namespaces.Exclude...)
-	}
-
-	// here we create a pod filter that will return only pods that can be
-	// evicted (according to the evictor and inside the namespaces we want).
-	// NOTE: here we could also add a function to filter out by the regex and
-	// age but for sake of the example we are keeping it simple and filtering
-	// those out in the Deschedule() function.
-	podFilter, err := podutil.NewOptions().
-		WithNamespaces(includedNamespaces).
-		WithoutNamespaces(excludedNamespaces).
-		WithFilter(
-			podutil.WrapFilterFuncs(
-				handle.Evictor().Filter,
-				handle.Evictor().PreEvictionFilter,
-			),
-		).
-		BuildFilterFunc()
-	if err != nil {
-		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
-	}
-
-	return &Example{
-		logger:    logger,
-		handle:    handle,
-		podFilter: podFilter,
-		args:      exampleArgs,
-	}, nil
-}
-
-// Name returns the plugin name.
-func (d *Example) Name() string {
-	return PluginName
-}
-
-// Deschedule is the function where most of the logic around eviction is laid
-// down. Here we go through all pods in all nodes and evict the ones that match
-// the regex and are older than the maximum age. This function receives a list
-// of nodes we need to process.
-func (d *Example) Deschedule(ctx context.Context, nodes []*v1.Node) *fwtypes.Status {
-	var podsToEvict []*v1.Pod
-	logger := klog.FromContext(klog.NewContext(ctx, d.logger)).WithValues("ExtensionPoint", fwtypes.DescheduleExtensionPoint)
-	logger.Info("Example plugin starting descheduling")
-
-	re, err := regexp.Compile(d.args.Regex)
-	if err != nil {
-		err = fmt.Errorf("fail to compile regex: %w", err)
-		return &fwtypes.Status{Err: err}
-	}
-
-	duration, err := time.ParseDuration(d.args.MaxAge)
-	if err != nil {
-		err = fmt.Errorf("fail to parse max age: %w", err)
-		return &fwtypes.Status{Err: err}
-	}
-
-	// here we create an auxiliar filter to remove all pods that don't
-	// match the provided regex or are still too young to be evicted.
-	// This filter will be used when we list all pods on a node. This
-	// filter here could have been part of the podFilter but we are
-	// keeping it separate for the sake of the example.
-	filter := func(pod *v1.Pod) bool {
-		if !re.MatchString(pod.Name) {
-			return false
-		}
-		deadline := pod.CreationTimestamp.Add(duration)
-		return time.Now().After(deadline)
-	}
-
-	// go node by node getting all pods that we can evict.
-	for _, node := range nodes {
-		// ListAllPodsOnANode is a helper function that retrieves all pods filtering out the ones we can't evict.
-		// ListPodsOnANode is a helper function that retrieves all pods(excluding Succeeded or Failed phases) filtering out the ones we can't evict.
-		// We merge the default filters with the one we created above.
-		//
-		// The difference between ListPodsOnANode and ListAllPodsOnANode lies in their handling of Pods based on their phase:
-		// - ListPodsOnANode excludes Pods that are in Succeeded or Failed phases because they do not occupy any resources.
-		// - ListAllPodsOnANode does not exclude Pods based on their phase, listing all Pods regardless of their state.
-		//
-		// In this context, we prefer using ListPodsOnANode because:
-		// 1. It ensures that only active Pods (not in Succeeded or Failed states) are considered for eviction.
-		// 2. This helps avoid unnecessary processing of Pods that no longer consume resources.
-		// 3. By applying an additional filter (d.podFilter and filter), we can further refine which Pods are eligible for eviction,
-		//    ensuring that only Pods meeting specific criteria are selected.
-		//
-		// However, if you need to consider all Pods including those in Succeeded or Failed states for other purposes,
-		// you should use ListAllPodsOnANode instead.
-		pods, err := podutil.ListPodsOnANode(
-			node.Name,
-			d.handle.GetPodsAssignedToNodeFunc(),
-			podutil.WrapFilterFuncs(d.podFilter, filter),
-		)
-		if err != nil {
-			err = fmt.Errorf("fail to list pods: %w", err)
-			return &fwtypes.Status{Err: err}
-		}
-
-		// as we have already filtered out pods that don't match the
-		// regex or are too young we can simply add them all to the
-		// eviction list.
-		podsToEvict = append(podsToEvict, pods...)
-	}
-
-	// evict all the pods.
-	for _, pod := range podsToEvict {
-		logger.Info("Example plugin evicting pod", "pod", klog.KObj(pod))
-		opts := evictions.EvictOptions{StrategyName: PluginName}
-		if err := d.handle.Evictor().Evict(ctx, pod, opts); err != nil {
-			logger.Error(err, "unable to evict pod", "pod", klog.KObj(pod))
-		}
-	}
-
-	logger.Info("Example plugin finished descheduling")
-	return nil
-}

pkg/framework/plugins/example/register.go

@@ -1,31 +0,0 @@
-/*
-Copyright 2025 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 example
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-var (
-	SchemeBuilder      = runtime.NewSchemeBuilder()
-	localSchemeBuilder = &SchemeBuilder
-	AddToScheme        = localSchemeBuilder.AddToScheme
-)
-
-func init() {
-	// We only register manually written functions here. The registration of the
-	// generated functions takes place in the generated files. The separation
-	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addDefaultingFuncs)
-}

pkg/framework/plugins/example/types.go

@@ -1,45 +0,0 @@
-/*
-Copyright 2025 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 example
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/descheduler/pkg/api"
-)
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// ExampleArgs holds a list of arguments used to configure the plugin. For this
-// simple example we only care about a regex, a maximum age and possibly a list
-// of namespaces to which we want to apply the descheduler. This plugin evicts
-// pods that match a given regular expression and are older than the maximum
-// allowed age. Most of the fields here were defined as strings so we can
-// validate them somewhere else (show you a better implementation example).
-type ExampleArgs struct {
-	metav1.TypeMeta `json:",inline"`
-
-	// Regex is a regular expression we use to match against pod names. If
-	// the pod name matches the regex it will be evicted. This is expected
-	// to be a valid regular expression (according to go's regexp package).
-	Regex string `json:"regex"`
-
-	// MaxAge is the maximum age a pod can have before it is considered for
-	// eviction. This is expected to be a valid time.Duration.
-	MaxAge string `json:"maxAge"`
-
-	// Namespaces allows us to filter on which namespaces we want to apply
-	// the descheduler.
-	Namespaces *api.Namespaces `json:"namespaces,omitempty"`
-}

pkg/framework/plugins/example/validation.go

@@ -1,45 +0,0 @@
-/*
-Copyright 2025 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 example
-
-import (
-	"fmt"
-	"regexp"
-	"time"
-
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-// ValidateExampleArgs validates if the plugin arguments are correct (we have
-// everything we need). On this case we only validate if we have a valid
-// regular expression and maximum age.
-func ValidateExampleArgs(obj runtime.Object) error {
-	args := obj.(*ExampleArgs)
-	if args.Regex == "" {
-		return fmt.Errorf("regex argument must be set")
-	}
-
-	if _, err := regexp.Compile(args.Regex); err != nil {
-		return fmt.Errorf("invalid regex: %v", err)
-	}
-
-	if _, err := time.ParseDuration(args.MaxAge); err != nil {
-		return fmt.Errorf("invalid max age: %v", err)
-	}
-
-	return nil
-}

pkg/framework/plugins/example/zz_generated.deepcopy.go

@@ -1,57 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright 2026 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 deepcopy-gen. DO NOT EDIT.
-
-package example
-
-import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	api "sigs.k8s.io/descheduler/pkg/api"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ExampleArgs) DeepCopyInto(out *ExampleArgs) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	if in.Namespaces != nil {
-		in, out := &in.Namespaces, &out.Namespaces
-		*out = new(api.Namespaces)
-		(*in).DeepCopyInto(*out)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExampleArgs.
-func (in *ExampleArgs) DeepCopy() *ExampleArgs {
-	if in == nil {
-		return nil
-	}
-	out := new(ExampleArgs)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ExampleArgs) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}

pkg/framework/plugins/example/zz_generated.defaults.go

@@ -1,33 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright 2026 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 defaulter-gen. DO NOT EDIT.
-
-package example
-
-import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// RegisterDefaults adds defaulters functions to the given scheme.
-// Public to allow building arbitrary schemes.
-// All generated defaulters are covering - they call all nested defaulters.
-func RegisterDefaults(scheme *runtime.Scheme) error {
-	return nil
-}

pkg/framework/plugins/nodeutilization/classifier/classifier.go

@@ -1,84 +0,0 @@
-/*
-Copyright 2025 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 classifier
-
-// Classifier is a function that classifies a resource usage based on a limit.
-// The function should return true if the resource usage matches the classifier
-// intent.
-type Classifier[K comparable, V any] func(K, V, V) bool
-
-// Comparer is a function that compares two objects. This function should return
-// -1 if the first object is less than the second, 0 if they are equal, and 1 if
-// the first object is greater than the second. Of course this is a simplification
-// and any value between -1 and 1 can be returned.
-type Comparer[V any] func(V, V) int
-
-// Values is a map of values indexed by a comparable key. An example of this
-// can be a list of resources indexed by a node name.
-type Values[K comparable, V any] map[K]V
-
-// Limits is a map of list of limits indexed by a comparable key. Each limit
-// inside the list requires a classifier to evaluate.
-type Limits[K comparable, V any] map[K][]V
-
-// Classify is a function that classifies based on classifier functions. This
-// function receives Values, a list of n Limits (indexed by name), and a list
-// of n Classifiers. The classifier at n position is called to evaluate the
-// limit at n position. The first classifier to return true will receive the
-// value, at this point the loop will break and the next value will be
-// evaluated. This function returns a slice of maps, each position in the
-// returned slice correspond to one of the classifiers (e.g. if n limits
-// and classifiers are provided, the returned slice will have n maps).
-func Classify[K comparable, V any](
-	values Values[K, V], limits Limits[K, V], classifiers ...Classifier[K, V],
-) []map[K]V {
-	result := make([]map[K]V, len(classifiers))
-	for i := range classifiers {
-		result[i] = make(map[K]V)
-	}
-
-	for index, usage := range values {
-		for i, limit := range limits[index] {
-			if len(classifiers) <= i {
-				continue
-			}
-			if !classifiers[i](index, usage, limit) {
-				continue
-			}
-			result[i][index] = usage
-			break
-		}
-	}
-
-	return result
-}
-
-// ForMap is a function that returns a classifier that compares all values in a
-// map. The function receives a Comparer function that is used to compare all
-// the map values. The returned Classifier will return true only if the
-// provided Comparer function returns a value less than 0 for all the values.
-func ForMap[K, I comparable, V any, M ~map[I]V](cmp Comparer[V]) Classifier[K, M] {
-	return func(_ K, usages, limits M) bool {
-		for idx, usage := range usages {
-			if limit, ok := limits[idx]; ok {
-				if cmp(usage, limit) >= 0 {
-					return false
-				}
-			}
-		}
-		return true
-	}
-}

pkg/framework/plugins/nodeutilization/classifier/classifier_test.go

@@ -1,739 +0,0 @@
-/*
-Copyright 2025 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 classifier
-
-import (
-	"reflect"
-	"testing"
-
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/utils/ptr"
-)
-
-func TestClassifySimple(t *testing.T) {
-	for _, tt := range []struct {
-		name        string
-		usage       map[string]int
-		limits      map[string][]int
-		classifiers []Classifier[string, int]
-		expected    []map[string]int
-	}{
-		{
-			name:     "empty",
-			usage:    map[string]int{},
-			limits:   map[string][]int{},
-			expected: []map[string]int{},
-		},
-		{
-			name: "one under one over",
-			usage: map[string]int{
-				"node1": 2,
-				"node2": 8,
-			},
-			limits: map[string][]int{
-				"node1": {4, 6},
-				"node2": {4, 6},
-			},
-			expected: []map[string]int{
-				{"node1": 2},
-				{"node2": 8},
-			},
-			classifiers: []Classifier[string, int]{
-				func(_ string, usage, limit int) bool {
-					return usage < limit
-				},
-				func(_ string, usage, limit int) bool {
-					return usage > limit
-				},
-			},
-		},
-		{
-			name: "randomly positioned over utilized",
-			usage: map[string]int{
-				"node1": 2,
-				"node2": 8,
-				"node3": 2,
-				"node4": 8,
-				"node5": 8,
-				"node6": 2,
-				"node7": 2,
-				"node8": 8,
-				"node9": 8,
-			},
-			limits: map[string][]int{
-				"node1": {4, 6},
-				"node2": {4, 6},
-				"node3": {4, 6},
-				"node4": {4, 6},
-				"node5": {4, 6},
-				"node6": {4, 6},
-				"node7": {4, 6},
-				"node8": {4, 6},
-				"node9": {4, 6},
-			},
-			expected: []map[string]int{
-				{
-					"node1": 2,
-					"node3": 2,
-					"node6": 2,
-					"node7": 2,
-				},
-				{
-					"node2": 8,
-					"node4": 8,
-					"node5": 8,
-					"node8": 8,
-					"node9": 8,
-				},
-			},
-			classifiers: []Classifier[string, int]{
-				func(_ string, usage, limit int) bool {
-					return usage < limit
-				},
-				func(_ string, usage, limit int) bool {
-					return usage > limit
-				},
-			},
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			result := Classify(tt.usage, tt.limits, tt.classifiers...)
-			if !reflect.DeepEqual(result, tt.expected) {
-				t.Fatalf("unexpected result: %v", result)
-			}
-		})
-	}
-}
-
-func TestClassify_pointers(t *testing.T) {
-	for _, tt := range []struct {
-		name        string
-		usage       map[string]map[v1.ResourceName]*resource.Quantity
-		limits      map[string][]map[v1.ResourceName]*resource.Quantity
-		classifiers []Classifier[string, map[v1.ResourceName]*resource.Quantity]
-		expected    []map[string]map[v1.ResourceName]*resource.Quantity
-	}{
-		{
-			name:     "empty",
-			usage:    map[string]map[v1.ResourceName]*resource.Quantity{},
-			limits:   map[string][]map[v1.ResourceName]*resource.Quantity{},
-			expected: []map[string]map[v1.ResourceName]*resource.Quantity{},
-		},
-		{
-			name: "single underutilized",
-			usage: map[string]map[v1.ResourceName]*resource.Quantity{
-				"node1": {
-					v1.ResourceCPU:    ptr.To(resource.MustParse("2")),
-					v1.ResourceMemory: ptr.To(resource.MustParse("2Gi")),
-				},
-			},
-			limits: map[string][]map[v1.ResourceName]*resource.Quantity{
-				"node1": {
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("4")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("4Gi")),
-					},
-				},
-			},
-			expected: []map[string]map[v1.ResourceName]*resource.Quantity{
-				{
-					"node1": {
-						v1.ResourceCPU:    ptr.To(resource.MustParse("2")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("2Gi")),
-					},
-				},
-			},
-			classifiers: []Classifier[string, map[v1.ResourceName]*resource.Quantity]{
-				ForMap[string, v1.ResourceName, *resource.Quantity, map[v1.ResourceName]*resource.Quantity](
-					func(usage, limit *resource.Quantity) int {
-						return usage.Cmp(*limit)
-					},
-				),
-			},
-		},
-		{
-			name: "single underutilized and properly utilized",
-			usage: map[string]map[v1.ResourceName]*resource.Quantity{
-				"node1": {
-					v1.ResourceCPU:    ptr.To(resource.MustParse("2")),
-					v1.ResourceMemory: ptr.To(resource.MustParse("2Gi")),
-				},
-				"node2": {
-					v1.ResourceCPU:    ptr.To(resource.MustParse("5")),
-					v1.ResourceMemory: ptr.To(resource.MustParse("5Gi")),
-				},
-				"node3": {
-					v1.ResourceCPU:    ptr.To(resource.MustParse("8")),
-					v1.ResourceMemory: ptr.To(resource.MustParse("8Gi")),
-				},
-			},
-			limits: map[string][]map[v1.ResourceName]*resource.Quantity{
-				"node1": {
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("4")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("4Gi")),
-					},
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("16")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("16Gi")),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("4")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("4Gi")),
-					},
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("16")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("16Gi")),
-					},
-				},
-				"node3": {
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("4")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("4Gi")),
-					},
-					{
-						v1.ResourceCPU:    ptr.To(resource.MustParse("16")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("16Gi")),
-					},
-				},
-			},
-			expected: []map[string]map[v1.ResourceName]*resource.Quantity{
-				{
-					"node1": {
-						v1.ResourceCPU:    ptr.To(resource.MustParse("2")),
-						v1.ResourceMemory: ptr.To(resource.MustParse("2Gi")),
-					},
-				},
-				{},
-			},
-			classifiers: []Classifier[string, map[v1.ResourceName]*resource.Quantity]{
-				ForMap[string, v1.ResourceName, *resource.Quantity, map[v1.ResourceName]*resource.Quantity](
-					func(usage, limit *resource.Quantity) int {
-						return usage.Cmp(*limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, *resource.Quantity, map[v1.ResourceName]*resource.Quantity](
-					func(usage, limit *resource.Quantity) int {
-						return limit.Cmp(*usage)
-					},
-				),
-			},
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			result := Classify(tt.usage, tt.limits, tt.classifiers...)
-			if !reflect.DeepEqual(result, tt.expected) {
-				t.Fatalf("unexpected result: %v", result)
-			}
-		})
-	}
-}
-
-func TestClassify(t *testing.T) {
-	for _, tt := range []struct {
-		name        string
-		usage       map[string]v1.ResourceList
-		limits      map[string][]v1.ResourceList
-		classifiers []Classifier[string, v1.ResourceList]
-		expected    []map[string]v1.ResourceList
-	}{
-		{
-			name:     "empty",
-			usage:    map[string]v1.ResourceList{},
-			limits:   map[string][]v1.ResourceList{},
-			expected: []map[string]v1.ResourceList{},
-		},
-		{
-			name: "single underutilized",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("2"),
-					v1.ResourceMemory: resource.MustParse("2Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node1": {
-						v1.ResourceCPU:    resource.MustParse("2"),
-						v1.ResourceMemory: resource.MustParse("2Gi"),
-					},
-				},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-			},
-		},
-		{
-			name: "less classifiers than limits",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("2"),
-					v1.ResourceMemory: resource.MustParse("2Gi"),
-				},
-				"node2": {
-					v1.ResourceCPU:    resource.MustParse("5"),
-					v1.ResourceMemory: resource.MustParse("5Gi"),
-				},
-				"node3": {
-					v1.ResourceCPU:    resource.MustParse("8"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-				"node3": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node1": {
-						v1.ResourceCPU:    resource.MustParse("2"),
-						v1.ResourceMemory: resource.MustParse("2Gi"),
-					},
-				},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-			},
-		},
-		{
-			name: "more classifiers than limits",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("20"),
-					v1.ResourceMemory: resource.MustParse("20"),
-				},
-				"node2": {
-					v1.ResourceCPU:    resource.MustParse("50"),
-					v1.ResourceMemory: resource.MustParse("50"),
-				},
-				"node3": {
-					v1.ResourceCPU:    resource.MustParse("80"),
-					v1.ResourceMemory: resource.MustParse("80"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("30"),
-						v1.ResourceMemory: resource.MustParse("30"),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    resource.MustParse("30"),
-						v1.ResourceMemory: resource.MustParse("30"),
-					},
-				},
-				"node3": {
-					{
-						v1.ResourceCPU:    resource.MustParse("30"),
-						v1.ResourceMemory: resource.MustParse("30"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node1": {
-						v1.ResourceCPU:    resource.MustParse("20"),
-						v1.ResourceMemory: resource.MustParse("20"),
-					},
-				},
-				{},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-		{
-			name: "single underutilized and properly utilized",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("2"),
-					v1.ResourceMemory: resource.MustParse("2Gi"),
-				},
-				"node2": {
-					v1.ResourceCPU:    resource.MustParse("5"),
-					v1.ResourceMemory: resource.MustParse("5Gi"),
-				},
-				"node3": {
-					v1.ResourceCPU:    resource.MustParse("8"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-				"node3": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("16"),
-						v1.ResourceMemory: resource.MustParse("16Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node1": {
-						v1.ResourceCPU:    resource.MustParse("2"),
-						v1.ResourceMemory: resource.MustParse("2Gi"),
-					},
-				},
-				{},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-		{
-			name: "single underutilized and multiple over utilized nodes",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("2"),
-					v1.ResourceMemory: resource.MustParse("2Gi"),
-				},
-				"node2": {
-					v1.ResourceCPU:    resource.MustParse("8"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-				"node3": {
-					v1.ResourceCPU:    resource.MustParse("8"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-				"node3": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node1": {
-						v1.ResourceCPU:    resource.MustParse("2"),
-						v1.ResourceMemory: resource.MustParse("2Gi"),
-					},
-				},
-				{
-					"node2": {
-						v1.ResourceCPU:    resource.MustParse("8"),
-						v1.ResourceMemory: resource.MustParse("8Gi"),
-					},
-					"node3": {
-						v1.ResourceCPU:    resource.MustParse("8"),
-						v1.ResourceMemory: resource.MustParse("8Gi"),
-					},
-				},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-		{
-			name: "over and under at the same time",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("1"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-				"node2": {
-					v1.ResourceCPU:    resource.MustParse("1"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-				"node2": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{},
-				{},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-		{
-			name: "only memory over utilized",
-			usage: map[string]v1.ResourceList{
-				"node1": {
-					v1.ResourceCPU:    resource.MustParse("5"),
-					v1.ResourceMemory: resource.MustParse("8Gi"),
-				},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{
-						v1.ResourceCPU:    resource.MustParse("4"),
-						v1.ResourceMemory: resource.MustParse("4Gi"),
-					},
-					{
-						v1.ResourceCPU:    resource.MustParse("6"),
-						v1.ResourceMemory: resource.MustParse("6Gi"),
-					},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{},
-				{},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-		{
-			name: "randomly positioned over utilized",
-			usage: map[string]v1.ResourceList{
-				"node1": {v1.ResourceCPU: resource.MustParse("8")},
-				"node2": {v1.ResourceCPU: resource.MustParse("2")},
-				"node3": {v1.ResourceCPU: resource.MustParse("8")},
-				"node4": {v1.ResourceCPU: resource.MustParse("2")},
-				"node5": {v1.ResourceCPU: resource.MustParse("8")},
-				"node6": {v1.ResourceCPU: resource.MustParse("8")},
-				"node7": {v1.ResourceCPU: resource.MustParse("8")},
-				"node8": {v1.ResourceCPU: resource.MustParse("2")},
-				"node9": {v1.ResourceCPU: resource.MustParse("5")},
-			},
-			limits: map[string][]v1.ResourceList{
-				"node1": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node2": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node3": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node4": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node5": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node6": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node7": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node8": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-				"node9": {
-					{v1.ResourceCPU: resource.MustParse("4")},
-					{v1.ResourceCPU: resource.MustParse("6")},
-				},
-			},
-			expected: []map[string]v1.ResourceList{
-				{
-					"node2": {v1.ResourceCPU: resource.MustParse("2")},
-					"node4": {v1.ResourceCPU: resource.MustParse("2")},
-					"node8": {v1.ResourceCPU: resource.MustParse("2")},
-				},
-				{
-					"node1": {v1.ResourceCPU: resource.MustParse("8")},
-					"node3": {v1.ResourceCPU: resource.MustParse("8")},
-					"node5": {v1.ResourceCPU: resource.MustParse("8")},
-					"node6": {v1.ResourceCPU: resource.MustParse("8")},
-					"node7": {v1.ResourceCPU: resource.MustParse("8")},
-				},
-			},
-			classifiers: []Classifier[string, v1.ResourceList]{
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return usage.Cmp(limit)
-					},
-				),
-				ForMap[string, v1.ResourceName, resource.Quantity, v1.ResourceList](
-					func(usage, limit resource.Quantity) int {
-						return limit.Cmp(usage)
-					},
-				),
-			},
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			result := Classify(tt.usage, tt.limits, tt.classifiers...)
-			if !reflect.DeepEqual(result, tt.expected) {
-				t.Fatalf("unexpected result: %v", result)
-			}
-		})
-	}
-}

pkg/framework/plugins/nodeutilization/highnodeutilization.go

@@ -19,9 +19,9 @@ package nodeutilization
 import (
 	"context"
 	"fmt"
-	"slices"
 
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/descheduler/pkg/api"
@@ -29,247 +29,164 @@ import (
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization/classifier"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization/normalizer"
 	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
 )
 
 const HighNodeUtilizationPluginName = "HighNodeUtilization"
 
-// this lines makes sure that HighNodeUtilization implements the BalancePlugin
-// interface.
-var _ frameworktypes.BalancePlugin = &HighNodeUtilization{}
+// HighNodeUtilization evicts pods from under utilized nodes so that scheduler can schedule according to its plugin.
+// Note that CPU/Memory requests are used to calculate nodes' utilization and not the actual resource usage.
 
-// HighNodeUtilization evicts pods from under utilized nodes so that scheduler
-// can schedule according to its plugin. Note that CPU/Memory requests are used
-// to calculate nodes' utilization and not the actual resource usage.
 type HighNodeUtilization struct {
-	logger         klog.Logger
-	handle         frameworktypes.Handle
-	args           *HighNodeUtilizationArgs
-	podFilter      func(pod *v1.Pod) bool
-	criteria       []any
-	resourceNames  []v1.ResourceName
-	highThresholds api.ResourceThresholds
-	usageClient    usageClient
+	handle                   frameworktypes.Handle
+	args                     *HighNodeUtilizationArgs
+	podFilter                func(pod *v1.Pod) bool
+	underutilizationCriteria []interface{}
+	resourceNames            []v1.ResourceName
+	targetThresholds         api.ResourceThresholds
+	usageSnapshot            usageClient
 }
 
-// NewHighNodeUtilization builds plugin from its arguments while passing a handle.
-func NewHighNodeUtilization(
-	ctx context.Context, genericArgs runtime.Object, handle frameworktypes.Handle,
-) (frameworktypes.Plugin, error) {
-	args, ok := genericArgs.(*HighNodeUtilizationArgs)
+var _ frameworktypes.BalancePlugin = &HighNodeUtilization{}
+
+// NewHighNodeUtilization builds plugin from its arguments while passing a handle
+func NewHighNodeUtilization(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	highNodeUtilizatioArgs, ok := args.(*HighNodeUtilizationArgs)
 	if !ok {
-		return nil, fmt.Errorf(
-			"want args to be of type HighNodeUtilizationArgs, got %T",
-			genericArgs,
-		)
-	}
-	logger := klog.FromContext(ctx).WithValues("plugin", HighNodeUtilizationPluginName)
-
-	// this plugins worries only about thresholds but the nodeplugins
-	// package was made to take two thresholds into account, one for low
-	// and another for high usage. here we make sure we set the high
-	// threshold to the maximum value for all resources for which we have a
-	// threshold.
-	highThresholds := make(api.ResourceThresholds)
-	for rname := range args.Thresholds {
-		highThresholds[rname] = MaxResourcePercentage
+		return nil, fmt.Errorf("want args to be of type HighNodeUtilizationArgs, got %T", args)
 	}
 
-	// get the resource names for which we have a threshold. this is
-	// later used when determining if we are going to evict a pod.
-	resourceThresholds := getResourceNames(args.Thresholds)
+	targetThresholds := make(api.ResourceThresholds)
+	setDefaultForThresholds(highNodeUtilizatioArgs.Thresholds, targetThresholds)
+	resourceNames := getResourceNames(targetThresholds)
 
-	// by default we evict pods from the under utilized nodes even if they
-	// don't define a request for a given threshold. this works most of the
-	// times and there is an use case for it. When using the restrict mode
-	// we evaluate if the pod has a request for any of the resources the
-	// user has provided as threshold.
-	filters := []podutil.FilterFunc{handle.Evictor().Filter}
-	if slices.Contains(args.EvictionModes, EvictionModeOnlyThresholdingResources) {
-		filters = append(
-			filters,
-			withResourceRequestForAny(resourceThresholds...),
-		)
+	underutilizationCriteria := []interface{}{
+		"CPU", highNodeUtilizatioArgs.Thresholds[v1.ResourceCPU],
+		"Mem", highNodeUtilizatioArgs.Thresholds[v1.ResourceMemory],
+		"Pods", highNodeUtilizatioArgs.Thresholds[v1.ResourcePods],
+	}
+	for name := range highNodeUtilizatioArgs.Thresholds {
+		if !nodeutil.IsBasicResource(name) {
+			underutilizationCriteria = append(underutilizationCriteria, string(name), int64(highNodeUtilizatioArgs.Thresholds[name]))
+		}
 	}
 
-	podFilter, err := podutil.
-		NewOptions().
-		WithFilter(podutil.WrapFilterFuncs(filters...)).
+	podFilter, err := podutil.NewOptions().
+		WithFilter(handle.Evictor().Filter).
 		BuildFilterFunc()
 	if err != nil {
 		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
 	}
 
-	// resourceNames is a list of all resource names this plugin cares
-	// about. we care about the resources for which we have a threshold and
-	// all we consider the basic resources (cpu, memory, pods).
-	resourceNames := uniquifyResourceNames(
-		append(
-			resourceThresholds,
-			v1.ResourceCPU,
-			v1.ResourceMemory,
-			v1.ResourcePods,
-		),
-	)
-
 	return &HighNodeUtilization{
-		logger:         logger,
-		handle:         handle,
-		args:           args,
-		resourceNames:  resourceNames,
-		highThresholds: highThresholds,
-		criteria:       thresholdsToKeysAndValues(args.Thresholds),
-		podFilter:      podFilter,
-		usageClient: newRequestedUsageClient(
-			resourceNames,
-			handle.GetPodsAssignedToNodeFunc(),
-		),
+		handle:                   handle,
+		args:                     highNodeUtilizatioArgs,
+		resourceNames:            resourceNames,
+		targetThresholds:         targetThresholds,
+		underutilizationCriteria: underutilizationCriteria,
+		podFilter:                podFilter,
+		usageSnapshot:            newRequestedUsageSnapshot(resourceNames, handle.GetPodsAssignedToNodeFunc()),
 	}, nil
 }
 
-// Name retrieves the plugin name.
+// Name retrieves the plugin name
 func (h *HighNodeUtilization) Name() string {
 	return HighNodeUtilizationPluginName
 }
 
-// Balance holds the main logic of the plugin. It evicts pods from under
-// utilized nodes. The goal here is to concentrate pods in fewer nodes so that
-// less nodes are used.
+// Balance extension point implementation for the plugin
 func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	logger := klog.FromContext(klog.NewContext(ctx, h.logger)).WithValues("ExtensionPoint", frameworktypes.BalanceExtensionPoint)
-
-	if err := h.usageClient.sync(ctx, nodes); err != nil {
+	if err := h.usageSnapshot.capture(nodes); err != nil {
 		return &frameworktypes.Status{
 			Err: fmt.Errorf("error getting node usage: %v", err),
 		}
 	}
 
-	// take a picture of the current state of the nodes, everything else
-	// here is based on this snapshot.
-	nodesMap, nodesUsageMap, podListMap := getNodeUsageSnapshot(nodes, h.usageClient)
-	capacities := referencedResourceListForNodesCapacity(nodes)
-
-	// node usages are not presented as percentages over the capacity.
-	// we need to normalize them to be able to compare them with the
-	// thresholds. thresholds are already provided by the user in
-	// percentage.
-	usage, thresholds := assessNodesUsagesAndStaticThresholds(
-		nodesUsageMap, capacities, h.args.Thresholds, h.highThresholds,
-	)
-
-	// classify nodes in two groups: underutilized and schedulable. we will
-	// later try to move pods from the first group to the second.
-	nodeGroups := classifier.Classify(
-		usage, thresholds,
-		// underutilized nodes.
-		func(nodeName string, usage, threshold api.ResourceThresholds) bool {
-			return isNodeBelowThreshold(usage, threshold)
+	sourceNodes, highNodes := classifyNodes(
+		getNodeUsage(nodes, h.usageSnapshot),
+		getNodeThresholds(nodes, h.args.Thresholds, h.targetThresholds, h.resourceNames, false, h.usageSnapshot),
+		func(node *v1.Node, usage NodeUsage, threshold NodeThresholds) bool {
+			return isNodeWithLowUtilization(usage, threshold.lowResourceThreshold)
 		},
-		// schedulable nodes.
-		func(nodeName string, usage, threshold api.ResourceThresholds) bool {
-			if nodeutil.IsNodeUnschedulable(nodesMap[nodeName]) {
-				logger.V(2).Info(
-					"Node is unschedulable",
-					"node", klog.KObj(nodesMap[nodeName]),
-				)
+		func(node *v1.Node, usage NodeUsage, threshold NodeThresholds) bool {
+			if nodeutil.IsNodeUnschedulable(node) {
+				klog.V(2).InfoS("Node is unschedulable", "node", klog.KObj(node))
 				return false
 			}
-			return true
-		},
-	)
+			return !isNodeWithLowUtilization(usage, threshold.lowResourceThreshold)
+		})
 
-	// the nodeplugin package works by means of NodeInfo structures. these
-	// structures hold a series of information about the nodes. now that
-	// we have classified the nodes, we can build the NodeInfo structures
-	// for each group. NodeInfo structs carry usage and available resources
-	// for each node.
-	nodeInfos := make([][]NodeInfo, 2)
-	category := []string{"underutilized", "overutilized"}
-	for i := range nodeGroups {
-		for nodeName := range nodeGroups[i] {
-			logger.Info(
-				"Node has been classified",
-				"category", category[i],
-				"node", klog.KObj(nodesMap[nodeName]),
-				"usage", nodesUsageMap[nodeName],
-				"usagePercentage", normalizer.Round(usage[nodeName]),
-			)
-			nodeInfos[i] = append(nodeInfos[i], NodeInfo{
-				NodeUsage: NodeUsage{
-					node:    nodesMap[nodeName],
-					usage:   nodesUsageMap[nodeName],
-					allPods: podListMap[nodeName],
-				},
-				available: capNodeCapacitiesToThreshold(
-					nodesMap[nodeName],
-					thresholds[nodeName][1],
-					h.resourceNames,
-				),
-			})
-		}
+	// log message in one line
+	klog.V(1).InfoS("Criteria for a node below target utilization", h.underutilizationCriteria...)
+	klog.V(1).InfoS("Number of underutilized nodes", "totalNumber", len(sourceNodes))
+
+	if len(sourceNodes) == 0 {
+		klog.V(1).InfoS("No node is underutilized, nothing to do here, you might tune your thresholds further")
+		return nil
 	}
-
-	lowNodes, schedulableNodes := nodeInfos[0], nodeInfos[1]
-
-	logger.V(1).Info("Criteria for a node below target utilization", h.criteria...)
-	logger.V(1).Info("Number of underutilized nodes", "totalNumber", len(lowNodes))
-
-	if len(lowNodes) == 0 {
-		logger.V(1).Info(
-			"No node is underutilized, nothing to do here, you might tune your thresholds further",
-		)
+	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) == len(nodes) {
+		klog.V(1).InfoS("All nodes are underutilized, nothing to do here")
+		return nil
+	}
+	if len(highNodes) == 0 {
+		klog.V(1).InfoS("No node is available to schedule the pods, nothing to do here")
 		return nil
 	}
 
-	if len(lowNodes) <= h.args.NumberOfNodes {
-		logger.V(1).Info(
-			"Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here",
-			"underutilizedNodes", len(lowNodes),
-			"numberOfNodes", h.args.NumberOfNodes,
-		)
-		return nil
-	}
-
-	if len(lowNodes) == len(nodes) {
-		logger.V(1).Info("All nodes are underutilized, nothing to do here")
-		return nil
-	}
-
-	if len(schedulableNodes) == 0 {
-		logger.V(1).Info("No node is available to schedule the pods, nothing to do here")
-		return nil
-	}
-
-	// stops the eviction process if the total available capacity sage has
-	// dropped to zero - no more pods can be scheduled. this will signalize
-	// to stop if any of the available resources has dropped to zero.
-	continueEvictionCond := func(_ NodeInfo, avail api.ReferencedResourceList) bool {
-		for name := range avail {
-			if avail[name].CmpInt64(0) < 1 {
+	// 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 {
+			if totalAvailableUsage[name].CmpInt64(0) < 1 {
 				return false
 			}
 		}
+
 		return true
 	}
 
-	// sorts the nodes by the usage in ascending order.
-	sortNodesByUsage(lowNodes, true)
+	// Sort the nodes by the usage in ascending order
+	sortNodesByUsage(sourceNodes, true)
 
 	evictPodsFromSourceNodes(
 		ctx,
 		h.args.EvictableNamespaces,
-		lowNodes,
-		schedulableNodes,
+		sourceNodes,
+		highNodes,
 		h.handle.Evictor(),
 		evictions.EvictOptions{StrategyName: HighNodeUtilizationPluginName},
 		h.podFilter,
 		h.resourceNames,
 		continueEvictionCond,
-		h.usageClient,
-		nil,
+		h.usageSnapshot,
 	)
 
 	return nil
 }
+
+func setDefaultForThresholds(thresholds, targetThresholds api.ResourceThresholds) {
+	// check if Pods/CPU/Mem are set, if not, set them to 100
+	if _, ok := thresholds[v1.ResourcePods]; !ok {
+		thresholds[v1.ResourcePods] = MaxResourcePercentage
+	}
+	if _, ok := thresholds[v1.ResourceCPU]; !ok {
+		thresholds[v1.ResourceCPU] = MaxResourcePercentage
+	}
+	if _, ok := thresholds[v1.ResourceMemory]; !ok {
+		thresholds[v1.ResourceMemory] = MaxResourcePercentage
+	}
+
+	// Default targetThreshold resource values to 100
+	targetThresholds[v1.ResourcePods] = MaxResourcePercentage
+	targetThresholds[v1.ResourceCPU] = MaxResourcePercentage
+	targetThresholds[v1.ResourceMemory] = MaxResourcePercentage
+
+	for name := range thresholds {
+		if !nodeutil.IsBasicResource(name) {
+			targetThresholds[name] = MaxResourcePercentage
+		}
+	}
+}

pkg/framework/plugins/nodeutilization/highnodeutilization_test.go

@@ -23,6 +23,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	policy "k8s.io/api/policy/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
@@ -47,7 +48,6 @@ func TestHighNodeUtilization(t *testing.T) {
 	testCases := []struct {
 		name                string
 		thresholds          api.ResourceThresholds
-		evictionModes       []EvictionMode
 		nodes               []*v1.Node
 		pods                []*v1.Pod
 		expectedPodsEvicted uint
@@ -96,7 +96,17 @@ func TestHighNodeUtilization(t *testing.T) {
 				test.BuildTestPod("p1", 400, 0, n1NodeName, func(pod *v1.Pod) {
 					// A pod with local storage.
 					test.SetNormalOwnerRef(pod)
-					test.SetHostPathEmptyDirVolumeSource(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()
 				}),
@@ -104,7 +114,8 @@ func TestHighNodeUtilization(t *testing.T) {
 					// A Critical Pod.
 					test.SetNormalOwnerRef(pod)
 					pod.Namespace = "kube-system"
-					test.SetPodPriority(pod, utils.SystemCriticalPriority)
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
 				}),
 				// These won't be evicted.
 				test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetDSOwnerRef),
@@ -156,7 +167,8 @@ func TestHighNodeUtilization(t *testing.T) {
 					// A Critical Pod.
 					test.SetNormalOwnerRef(pod)
 					pod.Namespace = "kube-system"
-					test.SetPodPriority(pod, utils.SystemCriticalPriority)
+					priority := utils.SystemCriticalPriority
+					pod.Spec.Priority = &priority
 				}),
 				// These won't be evicted.
 				test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef),
@@ -232,11 +244,13 @@ func TestHighNodeUtilization(t *testing.T) {
 			},
 			// All pods are assumed to be burstable (test.BuildTestNode always sets both cpu/memory resource requests to some value)
 			pods: []*v1.Pod{
-				test.BuildTestPod("p1", 0, 0, n1NodeName, func(pod *v1.Pod) {
+				test.BuildTestPod("p1", 400, 0, n1NodeName, func(pod *v1.Pod) {
 					test.SetRSOwnerRef(pod)
 					test.MakeBestEffortPod(pod)
 				}),
-				test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef),
+				test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) {
+					test.SetRSOwnerRef(pod)
+				}),
 				// These won't be evicted.
 				test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef),
 				test.BuildTestPod("p4", 400, 0, n2NodeName, test.SetRSOwnerRef),
@@ -419,51 +433,6 @@ func TestHighNodeUtilization(t *testing.T) {
 			},
 			expectedPodsEvicted: 0,
 		},
-		{
-			name: "with extended resource threshold and no extended resource pods",
-			thresholds: api.ResourceThresholds{
-				extendedResource: 40,
-			},
-			evictionModes: []EvictionMode{EvictionModeOnlyThresholdingResources},
-			nodes: []*v1.Node{
-				test.BuildTestNode(n1NodeName, 4000, 3000, 10, func(node *v1.Node) {
-					test.SetNodeExtendedResource(node, extendedResource, 10)
-				}),
-				test.BuildTestNode(n2NodeName, 4000, 3000, 10, func(node *v1.Node) {
-					test.SetNodeExtendedResource(node, extendedResource, 10)
-				}),
-				test.BuildTestNode(n3NodeName, 4000, 3000, 10, func(node *v1.Node) {
-					test.SetNodeExtendedResource(node, extendedResource, 10)
-				}),
-			},
-			pods: []*v1.Pod{
-				// pods on node1 have the extended resource
-				// request set and they put the node in the
-				// over utilization range.
-				test.BuildTestPod("p1", 100, 0, n1NodeName, func(pod *v1.Pod) {
-					test.SetRSOwnerRef(pod)
-					test.SetPodExtendedResourceRequest(pod, extendedResource, 3)
-				}),
-				test.BuildTestPod("p2", 100, 0, n1NodeName, func(pod *v1.Pod) {
-					test.SetRSOwnerRef(pod)
-					test.SetPodExtendedResourceRequest(pod, extendedResource, 3)
-				}),
-				// pods in the other nodes must not be evicted
-				// because they do not have the extended
-				// resource defined in their requests.
-				test.BuildTestPod("p3", 500, 0, n2NodeName, test.SetRSOwnerRef),
-				test.BuildTestPod("p4", 500, 0, n2NodeName, func(pod *v1.Pod) {
-					test.SetRSOwnerRef(pod)
-				}),
-				test.BuildTestPod("p5", 500, 0, n2NodeName, func(pod *v1.Pod) {
-					test.SetRSOwnerRef(pod)
-				}),
-				test.BuildTestPod("p6", 500, 0, n2NodeName, func(pod *v1.Pod) {
-					test.SetRSOwnerRef(pod)
-				}),
-			},
-			expectedPodsEvicted: 0,
-		},
 	}
 
 	for _, testCase := range testCases {
@@ -505,14 +474,10 @@ func TestHighNodeUtilization(t *testing.T) {
 				})
 			}
 
-			plugin, err := NewHighNodeUtilization(
-				ctx,
-				&HighNodeUtilizationArgs{
-					Thresholds:    testCase.thresholds,
-					EvictionModes: testCase.evictionModes,
-				},
-				handle,
-			)
+			plugin, err := NewHighNodeUtilization(&HighNodeUtilizationArgs{
+				Thresholds: testCase.thresholds,
+			},
+				handle)
 			if err != nil {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
@@ -621,7 +586,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 				t.Fatalf("Unable to initialize a framework handle: %v", err)
 			}
 
-			plugin, err := NewHighNodeUtilization(ctx, &HighNodeUtilizationArgs{
+			plugin, err := NewHighNodeUtilization(&HighNodeUtilizationArgs{
 				Thresholds: api.ResourceThresholds{
 					v1.ResourceCPU: 40,
 				},

pkg/framework/plugins/nodeutilization/lownodeutilization.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 
@@ -28,279 +29,144 @@ import (
 	"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/plugins/nodeutilization/classifier"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization/normalizer"
 	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
 )
 
 const LowNodeUtilizationPluginName = "LowNodeUtilization"
 
-// this lines makes sure that HighNodeUtilization implements the BalancePlugin
-// interface.
-var _ frameworktypes.BalancePlugin = &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.
 
-// 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 {
-	logger                klog.Logger
-	handle                frameworktypes.Handle
-	args                  *LowNodeUtilizationArgs
-	podFilter             func(pod *v1.Pod) bool
-	underCriteria         []any
-	overCriteria          []any
-	resourceNames         []v1.ResourceName
-	extendedResourceNames []v1.ResourceName
-	usageClient           usageClient
+	handle                   frameworktypes.Handle
+	args                     *LowNodeUtilizationArgs
+	podFilter                func(pod *v1.Pod) bool
+	underutilizationCriteria []interface{}
+	overutilizationCriteria  []interface{}
+	resourceNames            []v1.ResourceName
+	usageSnapshot            usageClient
 }
 
-// NewLowNodeUtilization builds plugin from its arguments while passing a
-// handle. this plugin aims to move workload from overutilized nodes to
-// underutilized nodes.
-func NewLowNodeUtilization(
-	ctx context.Context, genericArgs runtime.Object, handle frameworktypes.Handle,
-) (frameworktypes.Plugin, error) {
-	args, ok := genericArgs.(*LowNodeUtilizationArgs)
+var _ frameworktypes.BalancePlugin = &LowNodeUtilization{}
+
+// NewLowNodeUtilization builds plugin from its arguments while passing a handle
+func NewLowNodeUtilization(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+	lowNodeUtilizationArgsArgs, ok := args.(*LowNodeUtilizationArgs)
 	if !ok {
-		return nil, fmt.Errorf(
-			"want args to be of type LowNodeUtilizationArgs, got %T",
-			genericArgs,
-		)
+		return nil, fmt.Errorf("want args to be of type LowNodeUtilizationArgs, got %T", args)
 	}
-	logger := klog.FromContext(ctx).WithValues("plugin", LowNodeUtilizationPluginName)
 
-	// resourceNames holds a list of resources for which the user has
-	// provided thresholds for. extendedResourceNames holds those as well
-	// as cpu, memory and pods if no prometheus collection is used.
-	resourceNames := getResourceNames(args.Thresholds)
-	extendedResourceNames := resourceNames
+	setDefaultForLNUThresholds(lowNodeUtilizationArgsArgs.Thresholds, lowNodeUtilizationArgsArgs.TargetThresholds, lowNodeUtilizationArgsArgs.UseDeviationThresholds)
 
-	// if we are using prometheus we need to validate we have everything we
-	// need. if we aren't then we need to make sure we are also collecting
-	// data for cpu, memory and pods.
-	metrics := args.MetricsUtilization
-	if metrics != nil && metrics.Source == api.PrometheusMetrics {
-		if err := validatePrometheusMetricsUtilization(args); err != nil {
-			return nil, err
+	underutilizationCriteria := []interface{}{
+		"CPU", lowNodeUtilizationArgsArgs.Thresholds[v1.ResourceCPU],
+		"Mem", lowNodeUtilizationArgsArgs.Thresholds[v1.ResourceMemory],
+		"Pods", lowNodeUtilizationArgsArgs.Thresholds[v1.ResourcePods],
+	}
+	for name := range lowNodeUtilizationArgsArgs.Thresholds {
+		if !nodeutil.IsBasicResource(name) {
+			underutilizationCriteria = append(underutilizationCriteria, string(name), int64(lowNodeUtilizationArgsArgs.Thresholds[name]))
 		}
-	} else {
-		extendedResourceNames = uniquifyResourceNames(
-			append(
-				resourceNames,
-				v1.ResourceCPU,
-				v1.ResourceMemory,
-				v1.ResourcePods,
-			),
-		)
 	}
 
-	podFilter, err := podutil.
-		NewOptions().
+	overutilizationCriteria := []interface{}{
+		"CPU", lowNodeUtilizationArgsArgs.TargetThresholds[v1.ResourceCPU],
+		"Mem", lowNodeUtilizationArgsArgs.TargetThresholds[v1.ResourceMemory],
+		"Pods", lowNodeUtilizationArgsArgs.TargetThresholds[v1.ResourcePods],
+	}
+	for name := range lowNodeUtilizationArgsArgs.TargetThresholds {
+		if !nodeutil.IsBasicResource(name) {
+			overutilizationCriteria = append(overutilizationCriteria, string(name), int64(lowNodeUtilizationArgsArgs.TargetThresholds[name]))
+		}
+	}
+
+	podFilter, err := podutil.NewOptions().
 		WithFilter(handle.Evictor().Filter).
 		BuildFilterFunc()
 	if err != nil {
 		return nil, fmt.Errorf("error initializing pod filter function: %v", err)
 	}
 
-	// this plugins supports different ways of collecting usage data. each
-	// different way provides its own "usageClient". the metrics-based client
-	// is reset at every extension point so we always get the latest prometheus
-	// client (whose SA token can be rotated after plugin creation).
-	// XXX MetricsServer is deprecated, removed once dropped.
-	var usageClient usageClient = newRequestedUsageClient(
-		extendedResourceNames, handle.GetPodsAssignedToNodeFunc(),
-	)
+	resourceNames := getResourceNames(lowNodeUtilizationArgsArgs.Thresholds)
+
+	var usageSnapshot usageClient
+	if lowNodeUtilizationArgsArgs.MetricsUtilization.MetricsServer {
+		usageSnapshot = newActualUsageSnapshot(resourceNames, handle.GetPodsAssignedToNodeFunc(), handle.MetricsCollector())
+	} else {
+		usageSnapshot = newRequestedUsageSnapshot(resourceNames, handle.GetPodsAssignedToNodeFunc())
+	}
 
 	return &LowNodeUtilization{
-		logger:                logger,
-		handle:                handle,
-		args:                  args,
-		underCriteria:         thresholdsToKeysAndValues(args.Thresholds),
-		overCriteria:          thresholdsToKeysAndValues(args.TargetThresholds),
-		resourceNames:         resourceNames,
-		extendedResourceNames: extendedResourceNames,
-		podFilter:             podFilter,
-		usageClient:           usageClient,
+		handle:                   handle,
+		args:                     lowNodeUtilizationArgsArgs,
+		underutilizationCriteria: underutilizationCriteria,
+		overutilizationCriteria:  overutilizationCriteria,
+		resourceNames:            resourceNames,
+		podFilter:                podFilter,
+		usageSnapshot:            usageSnapshot,
 	}, nil
 }
 
-// Name retrieves the plugin name.
+// Name retrieves the plugin name
 func (l *LowNodeUtilization) Name() string {
 	return LowNodeUtilizationPluginName
 }
 
-// resetUsageClient refreshes the usageClient field from the current handle
-// state. It must be called at the start of every extension point so that a
-// rotated prometheus SA token is picked up without restarting the process.
-func (l *LowNodeUtilization) resetUsageClient() error {
-	if l.args.MetricsUtilization == nil {
-		return nil
-	}
-	client, err := usageClientForMetrics(l.args, l.handle, l.extendedResourceNames)
-	if err != nil {
-		return err
-	}
-	l.usageClient = client
-	return nil
-}
-
-// Balance holds the main logic of the plugin. It evicts pods from over
-// utilized nodes to under utilized nodes. The goal here is to evenly
-// distribute pods across nodes.
+// Balance extension point implementation for the plugin
 func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	logger := klog.FromContext(klog.NewContext(ctx, l.logger)).WithValues("ExtensionPoint", frameworktypes.BalanceExtensionPoint)
-
-	if err := l.resetUsageClient(); err != nil {
-		return &frameworktypes.Status{
-			Err: fmt.Errorf("error initializing usage client: %v", err),
-		}
-	}
-
-	if err := l.usageClient.sync(ctx, nodes); err != nil {
+	if err := l.usageSnapshot.capture(nodes); err != nil {
 		return &frameworktypes.Status{
 			Err: fmt.Errorf("error getting node usage: %v", err),
 		}
 	}
 
-	// starts by taking a snapshot ofthe nodes usage. we will use this
-	// snapshot to assess the nodes usage and classify them as
-	// underutilized or overutilized.
-	nodesMap, nodesUsageMap, podListMap := getNodeUsageSnapshot(nodes, l.usageClient)
-	capacities := referencedResourceListForNodesCapacity(nodes)
-
-	// usage, by default, is exposed in absolute values. we need to normalize
-	// them (convert them to percentages) to be able to compare them with the
-	// user provided thresholds. thresholds are already provided in percentage
-	// in the <0; 100> interval.
-	var usage map[string]api.ResourceThresholds
-	var thresholds map[string][]api.ResourceThresholds
-	if l.args.UseDeviationThresholds {
-		// here the thresholds provided by the user represent
-		// deviations from the average so we need to treat them
-		// differently. when calculating the average we only
-		// need to consider the resources for which the user
-		// has provided thresholds.
-		usage, thresholds = assessNodesUsagesAndRelativeThresholds(
-			filterResourceNames(nodesUsageMap, l.resourceNames),
-			capacities,
-			l.args.Thresholds,
-			l.args.TargetThresholds,
-		)
-	} else {
-		usage, thresholds = assessNodesUsagesAndStaticThresholds(
-			nodesUsageMap,
-			capacities,
-			l.args.Thresholds,
-			l.args.TargetThresholds,
-		)
-	}
-
-	// classify nodes in under and over utilized. we will later try to move
-	// pods from the overutilized nodes to the underutilized ones.
-	nodeGroups := classifier.Classify(
-		usage, thresholds,
-		// underutilization criteria processing. nodes that are
-		// underutilized but aren't schedulable are ignored.
-		func(nodeName string, usage, threshold api.ResourceThresholds) bool {
-			if nodeutil.IsNodeUnschedulable(nodesMap[nodeName]) {
-				logger.V(2).Info(
-					"Node is unschedulable, thus not considered as underutilized",
-					"node", klog.KObj(nodesMap[nodeName]),
-				)
+	lowNodes, sourceNodes := classifyNodes(
+		getNodeUsage(nodes, l.usageSnapshot),
+		getNodeThresholds(nodes, l.args.Thresholds, l.args.TargetThresholds, l.resourceNames, l.args.UseDeviationThresholds, l.usageSnapshot),
+		// 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) {
+				klog.V(2).InfoS("Node is unschedulable, thus not considered as underutilized", "node", klog.KObj(node))
 				return false
 			}
-			return isNodeBelowThreshold(usage, threshold)
+			return isNodeWithLowUtilization(usage, threshold.lowResourceThreshold)
 		},
-		// overutilization criteria evaluation.
-		func(nodeName string, usage, threshold api.ResourceThresholds) bool {
-			return isNodeAboveThreshold(usage, threshold)
+		func(node *v1.Node, usage NodeUsage, threshold NodeThresholds) bool {
+			return isNodeAboveTargetUtilization(usage, threshold.highResourceThreshold)
 		},
 	)
 
-	// the nodeutilization package was designed to work with NodeInfo
-	// structs. these structs holds information about how utilized a node
-	// is. we need to go through the result of the classification and turn
-	// it into NodeInfo structs.
-	nodeInfos := make([][]NodeInfo, 2)
-	categories := []string{"underutilized", "overutilized"}
-	classifiedNodes := map[string]bool{}
-	for i := range nodeGroups {
-		for nodeName := range nodeGroups[i] {
-			classifiedNodes[nodeName] = true
+	// log message for nodes with low utilization
+	klog.V(1).InfoS("Criteria for a node under utilization", l.underutilizationCriteria...)
+	klog.V(1).InfoS("Number of underutilized nodes", "totalNumber", len(lowNodes))
 
-			logger.Info(
-				"Node has been classified",
-				"category", categories[i],
-				"node", klog.KObj(nodesMap[nodeName]),
-				"usage", nodesUsageMap[nodeName],
-				"usagePercentage", normalizer.Round(usage[nodeName]),
-			)
-
-			nodeInfos[i] = append(nodeInfos[i], NodeInfo{
-				NodeUsage: NodeUsage{
-					node:    nodesMap[nodeName],
-					usage:   nodesUsageMap[nodeName],
-					allPods: podListMap[nodeName],
-				},
-				available: capNodeCapacitiesToThreshold(
-					nodesMap[nodeName],
-					thresholds[nodeName][1],
-					l.extendedResourceNames,
-				),
-			})
-		}
-	}
-
-	// log nodes that are appropriately utilized.
-	for nodeName := range nodesMap {
-		if !classifiedNodes[nodeName] {
-			logger.Info(
-				"Node is appropriately utilized",
-				"node", klog.KObj(nodesMap[nodeName]),
-				"usage", nodesUsageMap[nodeName],
-				"usagePercentage", normalizer.Round(usage[nodeName]),
-			)
-		}
-	}
-
-	lowNodes, highNodes := nodeInfos[0], nodeInfos[1]
-
-	// log messages for nodes with low and high utilization
-	logger.V(1).Info("Criteria for a node under utilization", l.underCriteria...)
-	logger.V(1).Info("Number of underutilized nodes", "totalNumber", len(lowNodes))
-	logger.V(1).Info("Criteria for a node above target utilization", l.overCriteria...)
-	logger.V(1).Info("Number of overutilized nodes", "totalNumber", len(highNodes))
+	// log message for over utilized nodes
+	klog.V(1).InfoS("Criteria for a node above target utilization", l.overutilizationCriteria...)
+	klog.V(1).InfoS("Number of overutilized nodes", "totalNumber", len(sourceNodes))
 
 	if len(lowNodes) == 0 {
-		logger.V(1).Info(
-			"No node is underutilized, nothing to do here, you might tune your thresholds further",
-		)
+		klog.V(1).InfoS("No node is underutilized, nothing to do here, you might tune your thresholds further")
 		return nil
 	}
 
 	if len(lowNodes) <= l.args.NumberOfNodes {
-		logger.V(1).Info(
-			"Number of nodes underutilized is less or equal than NumberOfNodes, nothing to do here",
-			"underutilizedNodes", len(lowNodes),
-			"numberOfNodes", 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) == len(nodes) {
-		logger.V(1).Info("All nodes are underutilized, nothing to do here")
+		klog.V(1).InfoS("All nodes are underutilized, nothing to do here")
 		return nil
 	}
 
-	if len(highNodes) == 0 {
-		logger.V(1).Info("All nodes are under target utilization, nothing to do here")
+	if len(sourceNodes) == 0 {
+		klog.V(1).InfoS("All nodes are under target utilization, nothing to do here")
 		return nil
 	}
 
-	// this is a stop condition for the eviction process. we stop as soon
-	// as the node usage drops below the threshold.
-	continueEvictionCond := func(nodeInfo NodeInfo, totalAvailableUsage api.ReferencedResourceList) bool {
-		if !isNodeAboveTargetUtilization(nodeInfo.NodeUsage, nodeInfo.available) {
+	// 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) {
 			return false
 		}
 		for name := range totalAvailableUsage {
@@ -312,90 +178,52 @@ func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *fra
 		return true
 	}
 
-	// sort the nodes by the usage in descending order
-	sortNodesByUsage(highNodes, false)
-
-	var nodeLimit *uint
-	if l.args.EvictionLimits != nil {
-		nodeLimit = l.args.EvictionLimits.Node
-	}
+	// Sort the nodes by the usage in descending order
+	sortNodesByUsage(sourceNodes, false)
 
 	evictPodsFromSourceNodes(
 		ctx,
 		l.args.EvictableNamespaces,
-		highNodes,
+		sourceNodes,
 		lowNodes,
 		l.handle.Evictor(),
 		evictions.EvictOptions{StrategyName: LowNodeUtilizationPluginName},
 		l.podFilter,
-		l.extendedResourceNames,
+		l.resourceNames,
 		continueEvictionCond,
-		l.usageClient,
-		nodeLimit,
+		l.usageSnapshot,
 	)
 
 	return nil
 }
 
-// validatePrometheusMetricsUtilization validates the Prometheus metrics
-// utilization. XXX this should be done way earlier than this.
-func validatePrometheusMetricsUtilization(args *LowNodeUtilizationArgs) error {
-	if args.MetricsUtilization.Prometheus == nil {
-		return fmt.Errorf("prometheus property is missing")
-	}
-
-	if args.MetricsUtilization.Prometheus.Query == "" {
-		return fmt.Errorf("prometheus query is missing")
-	}
-
-	uResourceNames := getResourceNames(args.Thresholds)
-	oResourceNames := getResourceNames(args.TargetThresholds)
-	if len(uResourceNames) != 1 || uResourceNames[0] != MetricResource {
-		return fmt.Errorf(
-			"thresholds are expected to specify a single instance of %q resource, got %v instead",
-			MetricResource, uResourceNames,
-		)
-	}
-
-	if len(oResourceNames) != 1 || oResourceNames[0] != MetricResource {
-		return fmt.Errorf(
-			"targetThresholds are expected to specify a single instance of %q resource, got %v instead",
-			MetricResource, oResourceNames,
-		)
-	}
-
-	return nil
-}
-
-// usageClientForMetrics returns the correct usage client based on the
-// metrics source. XXX MetricsServer is deprecated, removed once dropped.
-func usageClientForMetrics(
-	args *LowNodeUtilizationArgs, handle frameworktypes.Handle, resources []v1.ResourceName,
-) (usageClient, error) {
-	metrics := args.MetricsUtilization
-	switch {
-	case metrics.MetricsServer, metrics.Source == api.KubernetesMetrics:
-		if handle.MetricsCollector() == nil {
-			return nil, fmt.Errorf("metrics client not initialized")
+func setDefaultForLNUThresholds(thresholds, targetThresholds api.ResourceThresholds, useDeviationThresholds bool) {
+	// check if Pods/CPU/Mem are set, if not, set them to 100
+	if _, ok := thresholds[v1.ResourcePods]; !ok {
+		if useDeviationThresholds {
+			thresholds[v1.ResourcePods] = MinResourcePercentage
+			targetThresholds[v1.ResourcePods] = MinResourcePercentage
+		} else {
+			thresholds[v1.ResourcePods] = MaxResourcePercentage
+			targetThresholds[v1.ResourcePods] = MaxResourcePercentage
 		}
-		return newActualUsageClient(
-			resources,
-			handle.GetPodsAssignedToNodeFunc(),
-			handle.MetricsCollector(),
-		), nil
-
-	case metrics.Source == api.PrometheusMetrics:
-		if handle.PrometheusClient() == nil {
-			return nil, fmt.Errorf("prometheus client not initialized")
+	}
+	if _, ok := thresholds[v1.ResourceCPU]; !ok {
+		if useDeviationThresholds {
+			thresholds[v1.ResourceCPU] = MinResourcePercentage
+			targetThresholds[v1.ResourceCPU] = MinResourcePercentage
+		} else {
+			thresholds[v1.ResourceCPU] = MaxResourcePercentage
+			targetThresholds[v1.ResourceCPU] = MaxResourcePercentage
+		}
+	}
+	if _, ok := thresholds[v1.ResourceMemory]; !ok {
+		if useDeviationThresholds {
+			thresholds[v1.ResourceMemory] = MinResourcePercentage
+			targetThresholds[v1.ResourceMemory] = MinResourcePercentage
+		} else {
+			thresholds[v1.ResourceMemory] = MaxResourcePercentage
+			targetThresholds[v1.ResourceMemory] = MaxResourcePercentage
 		}
-		return newPrometheusUsageClient(
-			handle.GetPodsAssignedToNodeFunc(),
-			handle.PrometheusClient(),
-			metrics.Prometheus.Query,
-		), nil
-	case metrics.Source != "":
-		return nil, fmt.Errorf("unrecognized metrics source")
-	default:
-		return nil, fmt.Errorf("metrics source is empty")
 	}
 }