Merge pull request #1808 from ingvagabund/profile-instance-id

feat(profile): inject a plugin instance ID to each built plugin

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+## 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,27 +20,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v2.1
+        uses: azure/setup-helm@v4.2.0
         with:
-          version: v3.9.2
+          version: v3.15.1
 
-      - uses: actions/setup-python@v3.1.2
+      - uses: actions/setup-python@v5.1.1
         with:
-          python-version: 3.7
+          python-version: 3.12
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.20.7'
+          go-version-file: 'go.mod'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.1
+        uses: helm/chart-testing-action@v2.6.1
         with:
-          version: v3.7.0
+          version: v3.11.0
+
+      - name: Install Helm Unit Test Plugin
+        run: |
+          helm plugin install https://github.com/helm-unittest/helm-unittest
+
+      - name: Run Helm Unit Tests
+        run: |
+          helm unittest charts/descheduler --strict -d
 
       - name: Run chart-testing (list-changed)
         id: list-changed

.github/workflows/manifests.yaml

@@ -5,22 +5,28 @@ on:
 
 jobs:
   deploy:
-    strategy: 
+    strategy:
       matrix:
-        k8s-version: ["v1.28.0"]
-        descheduler-version: ["v0.27.1"]
-        descheduler-api: ["v1alpha1", "v1alpha2"]
+        k8s-version: ["v1.34.0"]
+        descheduler-version: ["v0.34.0"]
+        descheduler-api: ["v1alpha2"]
         manifest: ["deployment"]
+        kind-version: ["v0.30.0"] # keep in sync with test/run-e2e-tests.sh
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@v1.12.0
         with:
           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@v5
+        with:
+          go-version-file: go.mod
+          cache: true
       - name: Build image
         run: |
           VERSION="dev" make dev-image

.github/workflows/release.yaml

@@ -5,6 +5,9 @@ on:
     branches:
       - release-*
 
+permissions:
+  contents: write # allow actions to update gh-pages branch
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -20,12 +23,12 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v4.2.0
         with:
-          version: v3.7.0
+          version: v3.15.1
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.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

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 2m
+  timeout: 5m
 
 linters:
   disable-all: true
@@ -15,4 +15,4 @@ linters-settings:
   gofumpt:
     extra-rules: true
   goimports:
-local-prefixes: sigs.k8s.io/descheduler
+    local-prefixes: sigs.k8s.io/descheduler

CONTRIBUTING-descheduler.md

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

Dockerfile.dev

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

Makefile

@@ -26,12 +26,14 @@ ARCHS = amd64 arm arm64
 
 LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitbranch=${BRANCH} -X ${LDFLAG_LOCATION}.gitsha1=${SHA1}"
 
-GOLANGCI_VERSION := v1.52.1
+GOLANGCI_VERSION := v1.64.8
 HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null)
 
-GOFUMPT_VERSION := v0.4.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))
+
 # REGISTRY is the container registry to push
 # into. The default is to push to the staging
 # registry, not production.
@@ -134,7 +136,7 @@ gen:
 	./hack/update-docs.sh
 
 gen-docker:
-	$(CONTAINER_ENGINE) run --entrypoint make -it -v $(CURRENT_DIR):/go/src/sigs.k8s.io/descheduler -w /go/src/sigs.k8s.io/descheduler golang:1.20.7 gen
+	$(CONTAINER_ENGINE) run --entrypoint make -it -v $(CURRENT_DIR):/go/src/sigs.k8s.io/descheduler -w /go/src/sigs.k8s.io/descheduler golang:$(GO_VERSION) gen
 
 verify-gen:
 	./hack/verify-conversions.sh
@@ -146,7 +148,7 @@ lint:
 ifndef HAS_GOLANGCI
 	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
+	./_output/bin/golangci-lint run -v
 
 fmt:
 ifndef HAS_GOFUMPT

OWNERS

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

README.md

@@ -2,7 +2,7 @@
 ![Release Charts](https://github.com/kubernetes-sigs/descheduler/workflows/Release%20Charts/badge.svg)
 
 <p align="left">
-	↖️ Click at the [bullet list icon] at the top left corner of the Readme visualization for the github generated table of contents.
+	↗️️ Click at the [bullet list icon] at the top right corner of the Readme visualization for the github generated table of contents.
 </p>
 
 <p align="center">
@@ -33,16 +33,16 @@ 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.26.1`), follow the documentation in
+`registry.k8s.io/descheduler/descheduler:v0.34.0`), follow the documentation in
 that version's release branch, as listed below:
 
 |Descheduler Version|Docs link|
 |---|---|
-|v0.28.x|[`release-1.28`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.28/README.md)|
-|v0.27.x|[`release-1.27`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.27/README.md)|
-|v0.26.x|[`release-1.26`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.26/README.md)|
-|v0.25.x|[`release-1.25`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.25/README.md)|
-|v0.24.x|[`release-1.24`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.24/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)|
 
 The
 [`master`](https://github.com/kubernetes-sigs/descheduler/blob/master/README.md)
@@ -94,17 +94,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=v0.26.1' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=release-1.34' | kubectl apply -f -
 ```
 
 Run As A CronJob
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.26.1' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=release-1.34' | kubectl apply -f -
 ```
 
 Run As A Deployment
 ```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.26.1' | kubectl apply -f -
+kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=release-1.34' | kubectl apply -f -
 ```
 
 ## User Guide
@@ -113,34 +113,106 @@ See the [user guide](docs/user-guide.md) in the `/docs` directory.
 
 ## Policy, Default Evictor and Strategy plugins
 
-**⚠️ v1alpha1 configuration is still supported, but deprecated (and soon will be removed). Please consider migrating to v1alpha2 (described bellow). For previous v1alpha1 documentation go to [docs/deprecated/v1alpha1.md](docs/deprecated/v1alpha1.md) ⚠️**
-
 The Descheduler Policy is configurable and includes default strategy plugins that can be enabled or disabled. It includes a common eviction configuration at the top level, as well as configuration from the Evictor plugin (Default Evictor, if not specified otherwise). Top-level configuration and Evictor plugin configuration are applied to all evictions.
 
 ### Top Level configuration
 
 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) |
+| 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.
+
 
 ### 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` | 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))|
+| 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.                                                               |
+| `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.
 
 ### Example policy
 
@@ -156,15 +228,35 @@ kind: "DeschedulerPolicy"
 nodeSelector: "node=node1" # you don't need to set this, if not set all will be processed
 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:
-        evictSystemCriticalPods: true
-        evictFailedBarePods: true
-        evictLocalStoragePods: true
+        podProtections:
+          defaultDisabled:
+            #- "PodsWithLocalStorage"
+            #- "SystemCriticalPods"
+            #- "DaemonSetPods"
+            #- "FailedBarePods"
+          extraEnabled:
+            #- "PodsWithPVC"
+            #- "PodsWithoutPDB"
+            #- "PodsWithResourceClaims"
+          config: {}
         nodeFit: true
+        minReplicas: 2
     plugins:
       # DefaultEvictor is enabled for both `filter` and `preEvictionFilter`
       # filter:
@@ -204,7 +296,7 @@ Balance Plugins: These plugins process all pods, or groups of pods, and determin
 | [RemovePodsViolatingTopologySpreadConstraint](#removepodsviolatingtopologyspreadconstraint) |Balance|Evicts pods violating TopologySpreadConstraints|
 | [RemovePodsHavingTooManyRestarts](#removepodshavingtoomanyrestarts) |Deschedule|Evicts pods having too many restarts|
 | [PodLifeTime](#podlifetime) |Deschedule|Evicts pods that have exceeded a specified age limit|
-| [RemoveFailedPods](#removefailedpods) |Deschedule|Evicts pods with certain failed reasons|
+| [RemoveFailedPods](#removefailedpods) |Deschedule|Evicts pods with certain failed reasons and exit codes|
 
 
 ### RemoveDuplicates
@@ -274,11 +366,18 @@ 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:** Node resource consumption is determined by the requests and limits of pods, not actual usage.
+**NOTE:** By default 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. Implementing metrics-based descheduling is currently TODO for the project.
+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.
 
 **Parameters:**
 
@@ -288,7 +387,13 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 |`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:**
 
@@ -308,6 +413,12 @@ profiles:
           "cpu" : 50
           "memory": 50
           "pods": 50
+        # metricsUtilization:
+        #   source: Prometheus
+        #   prometheus:
+        #     query: instance:node_cpu:rate:sum
+        evictionLimits:
+          node: 5
     plugins:
       balance:
         enabled:
@@ -323,10 +434,12 @@ 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 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
+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
 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
 
@@ -352,6 +465,12 @@ 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
@@ -364,8 +483,15 @@ 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
@@ -381,10 +507,11 @@ profiles:
           "memory": 20
           "pods": 20
         evictableNamespaces:
-          namespaces:
-            exclude:
-            - "kube-system"
-            - "namespace1"
+          exclude:
+          - "kube-system"
+          - "namespace1"
+        evictionModes:
+          - "OnlyThresholdingResources"
     plugins:
       balance:
         enabled:
@@ -500,18 +627,22 @@ key=value matches an excludedTaints entry, the taint will be ignored.
 For example, excludedTaints entry "dedicated" would match all taints with key "dedicated", regardless of value.
 excludedTaints entry "dedicated=special-user" would match taints with key "dedicated" and value "special-user".
 
+If a list of includedTaints is provided, a taint will be considered if and only if it matches an included key **or** key=value from the list. Otherwise it will be ignored. Leaving includedTaints unset will include any taint by default.
+
 **Parameters:**
 
 |Name|Type|
 |---|---|
 |`excludedTaints`|list(string)|
+|`includedTaints`|list(string)|
 |`includePreferNoSchedule`|bool|
 |`namespaces`|(see [namespace filtering](#namespace-filtering))|
 |`labelSelector`|(see [label filtering](#label-filtering))|
 
 **Example:**
 
-````yaml
+Setting `excludedTaints`
+```yaml
 apiVersion: "descheduler/v1alpha2"
 kind: "DeschedulerPolicy"
 profiles:
@@ -526,7 +657,25 @@ profiles:
       deschedule:
         enabled:
           - "RemovePodsViolatingNodeTaints"
-````
+```
+
+Setting `includedTaints`
+```yaml
+apiVersion: "descheduler/v1alpha2"
+kind: "DeschedulerPolicy"
+profiles:
+  - name: ProfileName
+    pluginConfig:
+    - name: "RemovePodsViolatingNodeTaints"
+      args:
+        includedTaints:
+        - decommissioned=end-of-life # include only taints with key "decommissioned" and value "end-of-life"
+        - reserved # include all taints with key "reserved"
+    plugins:
+      deschedule:
+        enabled:
+          - "RemovePodsViolatingNodeTaints"
+```
 
 ### RemovePodsViolatingTopologySpreadConstraint
 
@@ -548,6 +697,19 @@ topologyBalanceNodeFit: false
 
 Strategy parameter `labelSelector` is not utilized when balancing topology domains and is only applied during eviction to determine if the pod can be evicted.
 
+[Supported Constraints](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/#spread-constraint-definition) fields:
+
+|Name|Supported?|
+|----|----------|
+|`maxSkew`|Yes|
+|`minDomains`|No|
+|`topologyKey`|Yes|
+|`whenUnsatisfiable`|Yes|
+|`labelSelector`|Yes|
+|`matchLabelKeys`|Yes|
+|`nodeAffinityPolicy`|Yes|
+|`nodeTaintsPolicy`|Yes|
+
 **Parameters:**
 
 |Name|Type|
@@ -624,20 +786,25 @@ profiles:
 This strategy evicts pods that are older than `maxPodLifeTimeSeconds`.
 
 You can also specify `states` parameter to **only** evict pods matching the following conditions:
-  - [Pod Phase](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase) status of: `Running`, `Pending`
-  - [Container State Waiting](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-waiting) condition of: `PodInitializing`, `ContainerCreating`
+> The primary purpose for using states like `Succeeded` and `Failed` is releasing resources so that new pods can be rescheduled.
+> I.e., the main motivation is not for cleaning pods, rather to release resources.
+  - [Pod Phase](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase) status of: `Running`, `Pending`, `Succeeded`, `Failed`, `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`
 
 If a value for `states` or `podStatusPhases` is not specified,
 Pods in any state (even `Running`) are considered for eviction.
 
 **Parameters:**
 
-|Name|Type|Notes|
-|---|---|---|
-|`maxPodLifeTimeSeconds`|int||
-|`states`|list(string)|Only supported in v0.25+|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))||
-|`labelSelector`|(see [label filtering](#label-filtering))||
+| 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:**
 
@@ -660,10 +827,8 @@ profiles:
 ```
 
 ### RemoveFailedPods
-
 This strategy evicts pods that are in failed status phase.
-You can provide an optional parameter to filter by failed `reasons`.
-`reasons` can be expanded to include reasons of InitContainers as well by setting the optional parameter `includingInitContainers` to `true`.
+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.
 Lastly, you can specify the optional parameter `excludeOwnerKinds` and if a pod
 has any of these `Kind`s listed as an `OwnerRef`, that pod will not be considered for eviction.
@@ -675,6 +840,7 @@ has any of these `Kind`s listed as an `OwnerRef`, that pod will not be considere
 |`minPodLifetimeSeconds`|uint|
 |`excludeOwnerKinds`|list(string)|
 |`reasons`|list(string)|
+|`exitCodes`|list(int32)|
 |`includingInitContainers`|bool|
 |`namespaces`|(see [namespace filtering](#namespace-filtering))|
 |`labelSelector`|(see [label filtering](#label-filtering))|
@@ -691,6 +857,8 @@ profiles:
       args:
         reasons:
         - "NodeAffinity"
+        exitCodes:
+        - 1
         includingInitContainers: true
         excludeOwnerKinds:
         - "Job"
@@ -705,7 +873,7 @@ profiles:
 
 ### Namespace filtering
 
-The following strategies accept a `namespaces` parameter which allows to specify a list of including, resp. excluding namespaces:
+The following strategies accept a `namespaces` parameter which allows to specify a list of including and excluding namespaces respectively:
 * `PodLifeTime`
 * `RemovePodsHavingTooManyRestarts`
 * `RemovePodsViolatingNodeTaints`
@@ -715,11 +883,10 @@ The following strategies accept a `namespaces` parameter which allows to specify
 * `RemovePodsViolatingTopologySpreadConstraint`
 * `RemoveFailedPods`
 
-
-The following strategies accept a `evictableNamespaces` parameter which allows to specify a list of excluding namespaces:
+The following strategies accept an `evictableNamespaces` parameter which allows to specify a list of excluding namespaces:
 * `LowNodeUtilization` and `HighNodeUtilization` (Only filtered right before eviction)
 
-For example with PodLifeTime:
+In the following example with `PodLifeTime`, `PodLifeTime` gets executed only over `namespace1` and `namespace2`.
 
 ```yaml
 apiVersion: "descheduler/v1alpha2"
@@ -740,8 +907,7 @@ profiles:
           - "PodLifeTime"
 ```
 
-In the example `PodLifeTime` gets executed only over `namespace1` and `namespace2`.
-The similar holds for `exclude` field:
+The similar holds for `exclude` field. The strategy gets executed over all namespaces but `namespace1` and `namespace2` in the following example.
 
 ```yaml
 apiVersion: "descheduler/v1alpha2"
@@ -762,9 +928,7 @@ profiles:
           - "PodLifeTime"
 ```
 
-The strategy gets executed over all namespaces but `namespace1` and `namespace2`.
-
-It's not allowed to compute `include` with `exclude` field.
+It's not allowed to combine `include` with `exclude` field.
 
 ### Priority filtering
 
@@ -822,7 +986,7 @@ does not exist, descheduler won't create it and will throw an error.
 
 ### Label filtering
 
-The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#labelselector-v1-meta)
+The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#labelselector-v1-meta)
 to filter pods by their labels:
 
 * `PodLifeTime`
@@ -867,6 +1031,7 @@ profiles:
 - `nodeAffinity` on the pod
 - Resource `requests` made by the pod and the resources available on other nodes
 - Whether any of the other nodes are marked as `unschedulable`
+- Any `podAntiAffinity` between the pod and the pods on the other nodes
 
 E.g.
 
@@ -888,7 +1053,7 @@ profiles:
           - "PodLifeTime"
 ```
 
-Note that node fit filtering references the current pod spec, and not that of it's owner.
+Note that node fit filtering references the current pod spec, and not that of its owner.
 Thus, if the pod is owned by a ReplicationController (and that ReplicationController was modified recently),
 the pod may be running with an outdated spec, which the descheduler will reference when determining node fit.
 This is expected behavior as the descheduler is a "best-effort" mechanism.
@@ -902,17 +1067,21 @@ When the descheduler decides to evict pods from a node, it employs the following
 * [Critical pods](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/) (with priorityClassName set to system-cluster-critical or system-node-critical) are never evicted (unless `evictSystemCriticalPods: true` is set).
 * Pods (static or mirrored pods or standalone pods) not part of an ReplicationController, ReplicaSet(Deployment), StatefulSet, or Job are
 never evicted because these pods won't be recreated. (Standalone pods in failed status phase can be evicted by setting `evictFailedBarePods: true`)
-* Pods associated with DaemonSets are never evicted.
+* Pods associated with DaemonSets are never evicted (unless `evictDaemonSetPods: true` is set).
 * Pods with local storage are never evicted (unless `evictLocalStoragePods: true` is set).
 * 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 annotation `descheduler.alpha.kubernetes.io/evict` are eligible for eviction. This
+* All types of pods with the `descheduler.alpha.kubernetes.io/evict` annotation 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.
@@ -941,10 +1110,15 @@ 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 |
+| 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) |
 
 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.
@@ -960,6 +1134,13 @@ packages that it is compiled with.
 
 | Descheduler | Supported Kubernetes Version |
 |-------------|------------------------------|
+| 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                        |
@@ -997,7 +1178,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][prow].
+This repository uses the Kubernetes bots. See a full list of the commands [here](https://go.k8s.io/bot-commands).
 
 ### Communicating With Contributors
 

charts/descheduler/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: descheduler
-version: 0.27.1
-appVersion: 0.27.1
+version: 0.34.0
+appVersion: 0.34.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
@@ -13,4 +13,4 @@ sources:
 - https://github.com/kubernetes-sigs/descheduler
 maintainers:
 - name: Kubernetes SIG Scheduling
-  email: kubernetes-sig-scheduling@googlegroups.com
+  email: sig-scheduling@kubernetes.io

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 on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+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.
 
 ## Prerequisites
 
@@ -52,9 +52,11 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `imagePullSecrets`                  | Docker repository secrets                                                                                             | `[]`                                      |
 | `nameOverride`                      | String to partially override `descheduler.fullname` template (will prepend the release name)                          | `""`                                      |
 | `fullnameOverride`                  | String to fully override `descheduler.fullname` template                                                              | `""`                                      |
+| `namespaceOverride`                 | Override the deployment namespace; defaults to .Release.Namespace                                                     | `""`                                      |
 | `cronJobApiVersion`                 | CronJob API Group Version                                                                                             | `"batch/v1"`                              |
 | `schedule`                          | The cron schedule to run the _descheduler_ job on                                                                     | `"*/2 * * * *"`                           |
 | `startingDeadlineSeconds`           | If set, configure `startingDeadlineSeconds` for the _descheduler_ job                                                 | `nil`                                     |
+| `timeZone`                          | configure `timeZone` for CronJob                                                                                      | `nil`                                     |
 | `successfulJobsHistoryLimit`        | If set, configure `successfulJobsHistoryLimit` for the _descheduler_ job                                              | `3`                                       |
 | `failedJobsHistoryLimit`            | If set, configure `failedJobsHistoryLimit` for the _descheduler_ job                                                  | `1`                                       |
 | `ttlSecondsAfterFinished`           | If set, configure `ttlSecondsAfterFinished` for the _descheduler_ job                                                 | `nil`                                     |
@@ -62,13 +64,16 @@ 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`                                     |
@@ -83,6 +88,7 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `serviceMonitor.metricRelabelings`  | MetricRelabelConfigs to apply to samples after scraping, but before ingestion                                         | `[]`                                      |
 | `serviceMonitor.relabelings`        | RelabelConfigs to apply to samples before scraping                                                                    | `[]`                                      |
 | `affinity`                          | Node affinity to run the descheduler cronjob/deployment on specific nodes                                             | `nil`                                     |
+| `topologySpreadConstraints`         | Topology Spread Constraints to spread the descheduler cronjob/deployment across the cluster                           | `[]`                                     |
 | `tolerations`                       | tolerations to run the descheduler cronjob/deployment on specific nodes                                               | `nil`                                     |
 | `suspend`                           | Set spec.suspend in descheduler cronjob                                                                               | `false`                                   |
 | `commonLabels`                      | Labels to apply to all resources                                                                                      | `{}`                                      |

charts/descheduler/templates/NOTES.txt

@@ -1,7 +1,7 @@
 Descheduler installed as a {{ .Values.kind }}.
 
 {{- if eq .Values.kind "Deployment" }}
-{{- if eq .Values.replicas 1.0}}
+{{- if eq (.Values.replicas | int) 1 }}
 WARNING: You set replica count as 1 and workload kind as Deployment however leaderElection is not enabled. Consider enabling Leader Election for HA mode.
 {{- end}}
 {{- if .Values.leaderElection }}
@@ -10,3 +10,13 @@ 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/_helpers.tpl

@@ -24,6 +24,14 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Expand the namespace of the release.
+Allows overriding it for multi-namespace deployments in combined charts.
+*/}}
+{{- define "descheduler.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -87,8 +95,10 @@ Leader Election
 {{- if .Values.leaderElection.resourceName }}
 - --leader-elect-resource-name={{ .Values.leaderElection.resourceName }}
 {{- end }}
-{{- if .Values.leaderElection.resourceNamescape }}
-- --leader-elect-resource-namespace={{ .Values.leaderElection.resourceNamescape }}
+{{/* resource namespace value starts with a typo so keeping resourceNamescape for backwards compatibility */}}
+{{- $resourceNamespace := default .Values.leaderElection.resourceNamespace .Values.leaderElection.resourceNamescape -}}
+{{- if $resourceNamespace -}}
+- --leader-elect-resource-namespace={{ $resourceNamespace }}
 {{- end -}}
 {{- end }}
 {{- end }}

charts/descheduler/templates/clusterrole.yaml

@@ -24,6 +24,9 @@ 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"]
@@ -33,4 +36,13 @@ rules:
   resourceNames: ["{{ .Values.leaderElection.resourceName | default "descheduler" }}"]
   verbs: ["get", "patch", "delete"]
 {{- end }}
+{{- 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/clusterrolebinding.yaml

@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "descheduler.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ include "descheduler.namespace" . }}
 {{- end -}}

charts/descheduler/templates/configmap.yaml

@@ -1,12 +1,14 @@
+{{- if .Values.deschedulerPolicy }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "descheduler.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "descheduler.namespace" . }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
 data:
   policy.yaml: |
     apiVersion: "{{ .Values.deschedulerPolicyAPIVersion }}"
     kind: "DeschedulerPolicy"
-{{ toYaml .Values.deschedulerPolicy | trim | indent 4 }}
+{{ tpl (toYaml .Values.deschedulerPolicy) . | trim | indent 4 }}
+{{- end }}

charts/descheduler/templates/cronjob.yaml

@@ -3,9 +3,16 @@ apiVersion: {{ .Values.cronJobApiVersion | default "batch/v1" }}
 kind: CronJob
 metadata:
   name: {{ template "descheduler.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  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 }}
@@ -15,17 +22,34 @@ spec:
   {{- if .Values.startingDeadlineSeconds }}
   startingDeadlineSeconds: {{ .Values.startingDeadlineSeconds }}
   {{- end }}
-  {{- if .Values.successfulJobsHistoryLimit }}
+  {{- if ne .Values.successfulJobsHistoryLimit nil }}
   successfulJobsHistoryLimit: {{ .Values.successfulJobsHistoryLimit }}
   {{- end }}
-  {{- if .Values.failedJobsHistoryLimit }}
+  {{- if ne .Values.failedJobsHistoryLimit nil }}
   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" . }}
@@ -48,6 +72,14 @@ spec:
           affinity:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.topologySpreadConstraints }}
+          topologySpreadConstraints:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.dnsConfig }}
+          dnsConfig:
+            {{- .Values.dnsConfig | toYaml | nindent 12 }}
+          {{- end }}
           {{- with .Values.tolerations }}
           tolerations:
             {{- toYaml . | nindent 12 }}
@@ -56,6 +88,9 @@ spec:
           priorityClassName: {{ .Values.priorityClassName }}
           {{- end }}
           serviceAccountName: {{ template "descheduler.serviceAccountName" . }}
+          {{- if kindIs "bool" .Values.automountServiceAccountToken }}
+          automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+          {{- end }}
           restartPolicy: "Never"
           {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
@@ -68,21 +103,39 @@ spec:
               command:
                 {{- toYaml .Values.command | nindent 16 }}
               args:
-                - --policy-config-file: "/policy-dir/policy.yaml"
+                - --policy-config-file=/policy-dir/policy.yaml
                 {{- range $key, $value := .Values.cmdOptions }}
-                - {{ printf "--%s" $key }}{{ if $value }}={{ $value }}{{ end }}
+                {{- if ne $value nil }}
+                - {{ printf "--%s=%s" $key (toString $value) }}
+                {{- else }}
+                - {{ printf "--%s" $key }}
+                {{- end }}
                 {{- end }}
               livenessProbe:
                 {{- toYaml .Values.livenessProbe | nindent 16 }}
+              ports:
+                {{- toYaml .Values.ports | nindent 16 }}
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
+              {{- if .Values.securityContext }}
               securityContext:
                 {{- toYaml .Values.securityContext | nindent 16 }}
+              {{- end }}
               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 }}
+          {{- end }}
           volumes:
           - 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

@@ -3,11 +3,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "descheduler.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "descheduler.namespace" . }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations: {{- toYaml .Values.deploymentAnnotations | nindent 4 }}
+  {{- end }}
 spec:
-  {{- if gt .Values.replicas 1.0}}
+  {{- if gt (.Values.replicas | int) 1 }}
   {{- if not .Values.leaderElection.enabled }}
   {{- fail "You must set leaderElection to use more than 1 replica"}}
   {{- end}}
@@ -31,10 +34,17 @@ spec:
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.dnsConfig }}
+      dnsConfig:
+        {{- .Values.dnsConfig | toYaml | nindent 8 }}
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
       serviceAccountName: {{ template "descheduler.serviceAccountName" . }}
+      {{- if kindIs "bool" .Values.automountServiceAccountToken }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
       {{- toYaml . | nindent 6 }}
@@ -49,25 +59,42 @@ spec:
             - --policy-config-file=/policy-dir/policy.yaml
             - --descheduling-interval={{ required "deschedulingInterval required for running as Deployment" .Values.deschedulingInterval }}
             {{- range $key, $value := .Values.cmdOptions }}
-            - {{ printf "--%s" $key }}{{ if $value }}={{ $value }}{{ end }}
+            {{- if ne $value nil }}
+            - {{ printf "--%s=%s" $key (toString $value) }}
+            {{- else }}
+            - {{ printf "--%s" $key }}
             {{- end }}
+            {{- end }}
+            {{- if .Values.leaderElection.enabled }}
             {{- include "descheduler.leaderElection" . | nindent 12 }}
+            {{- end }}
           ports:
-            - containerPort: 10258
-              protocol: TCP
+            {{- toYaml .Values.ports | nindent 12 }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.securityContext }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+          {{- end }}
           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 }}
+      {{- end }}
       volumes:
         - 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 }}
@@ -76,6 +103,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

charts/descheduler/templates/service.yaml

@@ -6,9 +6,15 @@ metadata:
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
   name: {{ template "descheduler.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "descheduler.namespace" . }}
 spec:
   clusterIP: None
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ toYaml .Values.service.ipFamilies | nindent 4 }}
+  {{- end }}
   ports:
   - name: http-metrics
     port: 10258

charts/descheduler/templates/serviceaccount.yaml

@@ -1,9 +1,12 @@
 {{- 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: {{ .Release.Namespace }}
+  namespace: {{ include "descheduler.namespace" . }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
 {{- if .Values.serviceAccount.annotations }}

charts/descheduler/templates/servicemonitor.yaml

@@ -14,7 +14,7 @@ spec:
   jobLabel: jobLabel
   namespaceSelector:
     matchNames:
-    - {{ .Release.Namespace }}
+    - {{ include "descheduler.namespace" . }}
   selector:
     matchLabels:
       {{- include "descheduler.selectorLabels" . | nindent 6 }}

charts/descheduler/tests/.gitignore

@@ -0,0 +1 @@
+__snapshot__

charts/descheduler/tests/cronjob_annotations_test.yaml

@@ -0,0 +1,109 @@
+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/cronjob_test.yaml

@@ -0,0 +1,17 @@
+suite: Test Descheduler CronJob
+
+templates:
+  - "*.yaml"
+
+release:
+  name: descheduler
+
+set:
+  kind: CronJob
+
+tests:
+  - it: creates CronJob when kind is set
+    template: templates/cronjob.yaml
+    asserts:
+      - isKind:
+          of: CronJob

charts/descheduler/tests/deployment_test.yaml

@@ -0,0 +1,49 @@
+suite: Test Descheduler Deployment
+
+templates:
+  - "*.yaml"
+
+release:
+  name: descheduler
+
+set:
+  kind: Deployment
+
+tests:
+  - it: creates Deployment when kind is set
+    template: templates/deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+  
+  - it: enables leader-election
+    set:
+      leaderElection:
+        enabled: true
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect=true
+
+  - it: support leader-election resourceNamespace
+    set:
+      leaderElection:
+        enabled: true
+        resourceNamespace: test
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-resource-namespace=test
+
+  - it: support legacy leader-election resourceNamescape
+    set:
+      leaderElection:
+        enabled: true
+        resourceNamescape: typo
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-resource-namespace=typo

charts/descheduler/values.yaml

@@ -18,9 +18,13 @@ resources:
   requests:
     cpu: 500m
     memory: 256Mi
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
+  limits:
+    cpu: 500m
+    memory: 256Mi
+
+ports:
+  - containerPort: 10258
+    protocol: TCP
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -32,9 +36,16 @@ securityContext:
   runAsNonRoot: true
   runAsUser: 1000
 
+# podSecurityContext -- [Security context for pod](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
+podSecurityContext: {}
+  # fsGroup: 1000
+
 nameOverride: ""
 fullnameOverride: ""
 
+# -- Override the deployment namespace; defaults to .Release.Namespace
+namespaceOverride: ""
+
 # labels that'll be applied to all resources
 commonLabels: {}
 
@@ -44,7 +55,9 @@ suspend: false
 # startingDeadlineSeconds: 200
 # successfulJobsHistoryLimit: 3
 # failedJobsHistoryLimit: 1
-# ttlSecondsAfterFinished 600
+# ttlSecondsAfterFinished: 600
+# activeDeadlineSeconds: 60 # Make sure this value is SHORTER than the cron interval.
+# timeZone: Etc/UTC
 
 # Required when running as a Deployment
 deschedulingInterval: 5m
@@ -65,7 +78,7 @@ leaderElection: {}
 #  retryPeriod: 2s
 #  resourceLock: "leases"
 #  resourceName: "descheduler"
-#  resourceNamescape: "kube-system"
+#  resourceNamespace: "kube-system"
 
 command:
 - "/bin/descheduler"
@@ -74,14 +87,15 @@ cmdOptions:
   v: 3
 
 # Recommended to use the latest Policy API version supported by the Descheduler app version
-deschedulerPolicyAPIVersion: "descheduler/v1alpha1"
+deschedulerPolicyAPIVersion: "descheduler/v1alpha2"
 
+# deschedulerPolicy contains the policies the descheduler will execute.
 deschedulerPolicy:
   # nodeSelector: "key1=value1,key2=value2"
   # maxNoOfPodsToEvictPerNode: 10
   # maxNoOfPodsToEvictPerNamespace: 10
-  # ignorePvcPods: true
-  # evictLocalStoragePods: true
+  # metricsProviders:
+  # - source: KubernetesMetrics
   # tracing:
   #   collectorEndpoint: otel-collector.observability.svc.cluster.local:4317
   #   transportCert: ""
@@ -89,40 +103,50 @@ deschedulerPolicy:
   #   serviceNamespace: ""
   #   sampleRate: 1.0
   #   fallbackToNoOpProviderOnError: true
-  strategies:
-    RemoveDuplicates:
-      enabled: true
-    RemovePodsHavingTooManyRestarts:
-      enabled: true
-      params:
-        podsHavingTooManyRestarts:
-          podRestartThreshold: 100
-          includingInitContainers: true
-    RemovePodsViolatingNodeTaints:
-      enabled: true
-    RemovePodsViolatingNodeAffinity:
-      enabled: true
-      params:
-        nodeAffinityType:
-        - requiredDuringSchedulingIgnoredDuringExecution
-    RemovePodsViolatingInterPodAntiAffinity:
-      enabled: true
-    RemovePodsViolatingTopologySpreadConstraint:
-      enabled: true
-      params:
-        includeSoftConstraints: false
-    LowNodeUtilization:
-      enabled: true
-      params:
-        nodeResourceUtilizationThresholds:
-          thresholds:
-            cpu: 20
-            memory: 20
-            pods: 20
-          targetThresholds:
-            cpu: 50
-            memory: 50
-            pods: 50
+  profiles:
+    - name: default
+      pluginConfig:
+        - name: DefaultEvictor
+          args:
+            podProtections:
+              defaultDisabled:
+              - "PodsWithLocalStorage"
+              extraEnabled:
+              - "PodsWithPVC"
+        - name: RemoveDuplicates
+        - name: RemovePodsHavingTooManyRestarts
+          args:
+            podRestartThreshold: 100
+            includingInitContainers: true
+        - name: RemovePodsViolatingNodeAffinity
+          args:
+            nodeAffinityType:
+            - requiredDuringSchedulingIgnoredDuringExecution
+        - name: RemovePodsViolatingNodeTaints
+        - name: RemovePodsViolatingInterPodAntiAffinity
+        - name: RemovePodsViolatingTopologySpreadConstraint
+        - name: LowNodeUtilization
+          args:
+            thresholds:
+              cpu: 20
+              memory: 20
+              pods: 20
+            targetThresholds:
+              cpu: 50
+              memory: 50
+              pods: 50
+      plugins:
+        balance:
+          enabled:
+            - RemoveDuplicates
+            - RemovePodsViolatingTopologySpreadConstraint
+            - LowNodeUtilization
+        deschedule:
+          enabled:
+            - RemovePodsHavingTooManyRestarts
+            - RemovePodsViolatingNodeTaints
+            - RemovePodsViolatingNodeAffinity
+            - RemovePodsViolatingInterPodAntiAffinity
 
 priorityClassName: system-cluster-critical
 
@@ -148,6 +172,13 @@ affinity: {}
 #              values:
 #                - descheduler
 #        topologyKey: "kubernetes.io/hostname"
+topologySpreadConstraints: []
+# - maxSkew: 1
+#   topologyKey: kubernetes.io/hostname
+#   whenUnsatisfiable: DoNotSchedule
+#   labelSelector:
+#     matchLabels:
+#       app.kubernetes.io/name: descheduler
 tolerations: []
 # - key: 'management'
 #   operator: 'Equal'
@@ -166,22 +197,54 @@ 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: {}
 
 podLabels: {}
 
+dnsConfig: {}
+
 livenessProbe:
   failureThreshold: 3
   httpGet:
     path: /healthz
     port: 10258
     scheme: HTTPS
-  initialDelaySeconds: 3
-  periodSeconds: 10
+  initialDelaySeconds: 5
+  periodSeconds: 20
+  timeoutSeconds: 5
 
 service:
   enabled: false
+  # @param service.ipFamilyPolicy [string], support SingleStack, PreferDualStack and RequireDualStack
+  #
+  ipFamilyPolicy: ""
+  # @param service.ipFamilies [array] List of IP families (e.g. IPv4, IPv6) assigned to the service.
+  # Ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/
+  # E.g.
+  # ipFamilies:
+  #   - IPv6
+  #   - IPv4
+  ipFamilies: []
 
 serviceMonitor:
   enabled: false
@@ -205,3 +268,30 @@ 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

cmd/descheduler/app/options/options.go

@@ -18,17 +18,29 @@ 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"
 )
 
@@ -40,10 +52,18 @@ const (
 type DeschedulerServer struct {
 	componentconfig.DeschedulerConfiguration
 
-	Client         clientset.Interface
-	EventClient    clientset.Interface
-	SecureServing  *apiserveroptions.SecureServingOptionsWithLoopback
-	DisableMetrics bool
+	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
 }
 
 // NewDeschedulerServer creates a new DeschedulerServer with default parameters
@@ -86,7 +106,6 @@ func newDefaultComponentConfig() (*componentconfig.DeschedulerConfiguration, err
 
 // AddFlags adds flags for a specific SchedulerServer to the specified FlagSet
 func (rs *DeschedulerServer) AddFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&rs.Logging.Format, "logging-format", "text", `Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log_dir, --log_file, --log_file_max_size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning.`)
 	fs.DurationVar(&rs.DeschedulingInterval, "descheduling-interval", rs.DeschedulingInterval, "Time interval between two consecutive descheduler executions. Setting this value instructs the descheduler to run in a continuous loop at the interval specified.")
 	fs.StringVar(&rs.ClientConnection.Kubeconfig, "kubeconfig", rs.ClientConnection.Kubeconfig, "File with kube configuration. Deprecated, use client-connection-kubeconfig instead.")
 	fs.StringVar(&rs.ClientConnection.Kubeconfig, "client-connection-kubeconfig", rs.ClientConnection.Kubeconfig, "File path to kube configuration for interacting with kubernetes apiserver.")
@@ -101,8 +120,34 @@ func (rs *DeschedulerServer) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&rs.Tracing.ServiceNamespace, "otel-trace-namespace", "", "OTEL Trace namespace to be used with the resources")
 	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

@@ -20,24 +20,23 @@ package app
 import (
 	"context"
 	"io"
-	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
-	"k8s.io/apiserver/pkg/server/healthz"
+	"github.com/spf13/cobra"
 
 	"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"
-	apiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/apiserver/pkg/server/mux"
-	restclient "k8s.io/client-go/rest"
-	registry "k8s.io/component-base/logs/api/v1"
-	jsonLog "k8s.io/component-base/logs/json"
+	"k8s.io/component-base/featuregate"
+	"k8s.io/component-base/logs"
+	logsapi "k8s.io/component-base/logs/api/v1"
 	_ "k8s.io/component-base/logs/json/register"
 	"k8s.io/component-base/metrics/legacyregistry"
 	"k8s.io/klog/v2"
@@ -50,81 +49,91 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 		klog.ErrorS(err, "unable to initialize server")
 	}
 
+	featureGate := featuregate.NewFeatureGate()
+	logConfig := logsapi.NewLoggingConfiguration()
+
 	cmd := &cobra.Command{
 		Use:   "descheduler",
 		Short: "descheduler",
-		Long:  `The descheduler evicts pods which may be bound to less desired nodes`,
-		Run: func(cmd *cobra.Command, args []string) {
-			// s.Logs.Config.Format = s.Logging.Format
-
-			// 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
+		Long:  "The descheduler evicts pods which may be bound to less desired nodes",
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			logs.InitLogs()
+			if logsapi.ValidateAndApply(logConfig, featureGate); err != nil {
+				return err
+			}
+			descheduler.SetupPlugins()
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if err = s.Apply(); err != nil {
+				klog.ErrorS(err, "failed to apply")
+				return err
 			}
 
-			var factory registry.LogFormatFactory
-			if s.Logging.Format == "json" {
-				factory = jsonLog.Factory{}
+			if err = Run(cmd.Context(), s); err != nil {
+				klog.ErrorS(err, "failed to run descheduler server")
+				return err
 			}
 
-			if factory == nil {
-				klog.ClearLogger()
-			} else {
-				log, loggerControl := factory.Create(registry.LoggingConfiguration{
-					Format:    s.Logging.Format,
-					Verbosity: s.Logging.Verbosity,
-				}, registry.LoggingOptions{})
-				defer loggerControl.Flush()
-				klog.SetLogger(log)
-			}
-
-			ctx, done := signal.NotifyContext(context.Background(), 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 = Run(ctx, s)
-			if err != nil {
-				klog.ErrorS(err, "descheduler server")
-			}
-
-			done()
-			// wait for metrics server to close
-			<-stoppedCh
+			return nil
 		},
 	}
 	cmd.SetOut(out)
 	flags := cmd.Flags()
 	s.AddFlags(flags)
+
+	runtime.Must(logsapi.AddFeatureGates(featureGate))
+	logsapi.AddFlags(logConfig, flags)
+
 	return cmd
 }
 
-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 {
-		return err
+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())
 	}
-	defer tracing.Shutdown(ctx)
+
+	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)
+	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)
+	}()
+
 	// increase the fake watch channel so the dry-run mode can be run
 	// over a cluster with thousands of pods
 	watch.DefaultChanSize = 100000
-	return descheduler.Run(ctx, rs)
-}
+	err = descheduler.Run(ctx, rs)
+	if err != nil {
+		return err
+	}
 
-func SetupLogs() {
-	klog.SetOutput(os.Stdout)
-	klog.InitFlags(nil)
+	done()
+	if stoppedCh != nil {
+		// wait for metrics server to close
+		<-stoppedCh
+	}
+
+	return nil
 }

cmd/descheduler/descheduler.go

@@ -21,14 +21,8 @@ import (
 
 	"k8s.io/component-base/cli"
 	"sigs.k8s.io/descheduler/cmd/descheduler/app"
-	"sigs.k8s.io/descheduler/pkg/descheduler"
 )
 
-func init() {
-	app.SetupLogs()
-	descheduler.SetupPlugins()
-}
-
 func main() {
 	out := os.Stdout
 	cmd := app.NewDeschedulerCommand(out)

docs/cli/descheduler.md

@@ -19,19 +19,30 @@ descheduler [flags]
       --client-connection-kubeconfig string      File path to kube configuration for interacting with kubernetes apiserver.
       --client-connection-qps float32            QPS to use for interacting with kubernetes apiserver.
       --descheduling-interval duration           Time interval between two consecutive descheduler executions. Setting this value instructs the descheduler to run in a continuous loop at the interval specified.
+      --disable-http2-serving                    If true, HTTP2 serving will be disabled [default=false]
       --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', 'endpointsleases' and 'configmapsleases'. (default "leases")
+      --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-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)
-      --logging-format string                    Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log_dir, --log_file, --log_file_max_size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning. (default "text")
+      --log-flush-frequency duration             Maximum number of seconds between log flushes (default 5s)
+      --log-json-info-buffer-size quantity       [Alpha] In JSON format with split output streams, the info messages can be buffered for a while to increase performance. The default value of zero bytes disables buffering. The size can be specified as number of bytes (512), multiples of 1000 (1K), multiples of 1024 (2Ki), or powers of those (3M, 4G, 5Mi, 6Gi). Enable the LoggingAlphaOptions feature gate to use this.
+      --log-json-split-stream                    [Alpha] In JSON format, write error messages to stderr and info messages to stdout. The default is to write a single stream to stdout. Enable the LoggingAlphaOptions feature gate to use this.
+      --log-text-info-buffer-size quantity       [Alpha] In text format with split output streams, the info messages can be buffered for a while to increase performance. The default value of zero bytes disables buffering. The size can be specified as number of bytes (512), multiples of 1000 (1K), multiples of 1024 (2Ki), or powers of those (3M, 4G, 5Mi, 6Gi). Enable the LoggingAlphaOptions feature gate to use this.
+      --log-text-split-stream                    [Alpha] In text format, write error messages to stderr and info messages to stdout. The default is to write a single stream to stdout. Enable the LoggingAlphaOptions feature gate to use this.
+      --logging-format string                    Sets the log format. Permitted formats: "json" (gated by LoggingBetaOptions), "text". (default "text")
       --otel-collector-endpoint string           Set this flag to the OpenTelemetry Collector Service Address
       --otel-fallback-no-op-on-error             Fallback to NoOp Tracer in case of error
       --otel-sample-rate float                   Sample rate to collect the Traces (default 1)
@@ -44,11 +55,13 @@ descheduler [flags]
       --secure-port int                          The port on which to serve HTTPS with authentication and authorization. If 0, don't serve HTTPS at all. (default 10258)
       --tls-cert-file string                     File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory specified by --cert-dir.
       --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, TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_256_GCM_SHA384. 
-                                                 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_SHA256, TLS_RSA_WITH_RC4_128_SHA.
+                                                 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-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 [])
+  -v, --v Level                                  number for the log level verbosity
+      --vmodule pattern=N,...                    comma-separated list of pattern=N settings for file-filtered logging (only works for text log format)
 ```
 
 ### SEE ALSO

docs/contributor-guide.md

@@ -3,7 +3,7 @@
 ## Required Tools
 
 - [Git](https://git-scm.com/downloads)
-- [Go 1.16+](https://golang.org/dl/)
+- [Go 1.23+](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/deprecated/v1alpha1.md

@@ -1,784 +0,0 @@
-[![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/descheduler)](https://goreportcard.com/report/sigs.k8s.io/descheduler)
-![Release Charts](https://github.com/kubernetes-sigs/descheduler/workflows/Release%20Charts/badge.svg)
-
-<p align="center">
-    <img src="assets/logo/descheduler-stacked-color.png" width="40%" align="center" alt="descheduler">
-</p>
-
-# Descheduler for Kubernetes
-
-Scheduling in Kubernetes is the process of binding pending pods to nodes, and is performed by
-a component of Kubernetes called kube-scheduler. The scheduler's decisions, whether or where a
-pod can or can not be scheduled, are guided by its configurable policy which comprises of set of
-rules, called predicates and priorities. The scheduler's decisions are influenced by its view of
-a Kubernetes cluster at that point of time when a new pod appears for scheduling.
-As Kubernetes clusters are very dynamic and their state changes over time, there may be desire
-to move already running pods to some other nodes for various reasons:
-
-* Some nodes are under or over utilized.
-* The original scheduling decision does not hold true any more, as taints or labels are added to
-or removed from nodes, pod/node affinity requirements are not satisfied any more.
-* Some nodes failed and their pods moved to other nodes.
-* New nodes are added to clusters.
-
-Consequently, there might be several pods scheduled on less desired nodes in a cluster.
-Descheduler, based on its policy, finds pods that can be moved and evicts them. Please
-note, in current implementation, descheduler does not schedule replacement of evicted pods
-but relies on the default scheduler for that.
-
-Table of Contents
-=================
-<!-- toc -->
-- [Quick Start](#quick-start)
-  - [Run As A Job](#run-as-a-job)
-  - [Run As A CronJob](#run-as-a-cronjob)
-  - [Run As A Deployment](#run-as-a-deployment)
-  - [Install Using Helm](#install-using-helm)
-  - [Install Using Kustomize](#install-using-kustomize)
-- [User Guide](#user-guide)
-- [Policy and Strategies](#policy-and-strategies)
-  - [RemoveDuplicates](#removeduplicates)
-  - [LowNodeUtilization](#lownodeutilization)
-  - [HighNodeUtilization](#highnodeutilization)
-  - [RemovePodsViolatingInterPodAntiAffinity](#removepodsviolatinginterpodantiaffinity)
-  - [RemovePodsViolatingNodeAffinity](#removepodsviolatingnodeaffinity)
-  - [RemovePodsViolatingNodeTaints](#removepodsviolatingnodetaints)
-  - [RemovePodsViolatingTopologySpreadConstraint](#removepodsviolatingtopologyspreadconstraint)
-  - [RemovePodsHavingTooManyRestarts](#removepodshavingtoomanyrestarts)
-  - [PodLifeTime](#podlifetime)
-  - [RemoveFailedPods](#removefailedpods)
-- [Filter Pods](#filter-pods)
-  - [Namespace filtering](#namespace-filtering)
-  - [Priority filtering](#priority-filtering)
-  - [Label filtering](#label-filtering)
-  - [Node Fit filtering](#node-fit-filtering)
-- [Pod Evictions](#pod-evictions)
-  - [Pod Disruption Budget (PDB)](#pod-disruption-budget-pdb)
-- [High Availability](#high-availability)
-  - [Configure HA Mode](#configure-ha-mode)
-- [Metrics](#metrics)
-- [Compatibility Matrix](#compatibility-matrix)
-- [Getting Involved and Contributing](#getting-involved-and-contributing)
-  - [Communicating With Contributors](#communicating-with-contributors)
-- [Roadmap](#roadmap)
-  - [Code of conduct](#code-of-conduct)
-<!-- /toc -->
-
-## Quick Start
-
-The descheduler can be run as a `Job`, `CronJob`, or `Deployment` inside of a k8s cluster. It has the
-advantage of being able to be run multiple times without needing user intervention.
-The descheduler pod is run as a critical pod in the `kube-system` namespace to avoid
-being evicted by itself or by the kubelet.
-
-### Run As A Job
-
-```
-kubectl create -f kubernetes/base/rbac.yaml
-kubectl create -f kubernetes/base/configmap.yaml
-kubectl create -f kubernetes/job/job.yaml
-```
-
-### Run As A CronJob
-
-```
-kubectl create -f kubernetes/base/rbac.yaml
-kubectl create -f kubernetes/base/configmap.yaml
-kubectl create -f kubernetes/cronjob/cronjob.yaml
-```
-
-### Run As A Deployment
-
-```
-kubectl create -f kubernetes/base/rbac.yaml
-kubectl create -f kubernetes/base/configmap.yaml
-kubectl create -f kubernetes/deployment/deployment.yaml
-```
-
-### Install Using Helm
-
-Starting with release v0.18.0 there is an official helm chart that can be used to install the
-descheduler. See the [helm chart README](https://github.com/kubernetes-sigs/descheduler/blob/master/charts/descheduler/README.md) for detailed instructions.
-
-The descheduler helm chart is also listed on the [artifact hub](https://artifacthub.io/packages/helm/descheduler/descheduler).
-
-### Install Using Kustomize
-
-You can use kustomize to install descheduler.
-See the [resources | Kustomize](https://kubectl.docs.kubernetes.io/references/kustomize/cmd/build/) for detailed instructions.
-
-Run As A Job
-```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/job?ref=v0.28.0' | kubectl apply -f -
-```
-
-Run As A CronJob
-```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.28.0' | kubectl apply -f -
-```
-
-Run As A Deployment
-```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.28.0' | kubectl apply -f -
-```
-
-## User Guide
-
-See the [user guide](docs/user-guide.md) in the `/docs` directory.
-
-## Policy and Strategies
-
-Descheduler's policy is configurable and includes strategies that can be enabled or disabled. By default, all strategies are enabled.
-
-The policy includes a common configuration that applies to all the strategies:
-| Name | Default Value | Description |
-|------|---------------|-------------|
-| `nodeSelector` | `nil` | limiting the nodes which are processed |
-| `evictLocalStoragePods` | `false` | allows eviction of pods with local storage |
-| `evictSystemCriticalPods` | `false` | [Warning: Will evict Kubernetes system pods] allows eviction of pods with any priority, including system pods like kube-dns |
-| `ignorePvcPods` | `false` | set whether PVC pods should be evicted or ignored |
-| `maxNoOfPodsToEvictPerNode` | `nil` | maximum number of pods evicted from each node (summed through all strategies) |
-| `maxNoOfPodsToEvictPerNamespace` | `nil` | maximum number of pods evicted from each namespace (summed through all strategies) |
-| `evictFailedBarePods` | `false` | allow eviction of pods without owner references and in failed phase |
-
-As part of the policy, the parameters associated with each strategy can be configured.
-See each strategy for details on available parameters.
-
-**Policy:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-nodeSelector: prod=dev
-evictFailedBarePods: false
-evictLocalStoragePods: true
-evictSystemCriticalPods: true
-maxNoOfPodsToEvictPerNode: 40
-ignorePvcPods: false
-strategies:
-  ...
-```
-
-The following diagram provides a visualization of most of the strategies to help
-categorize how strategies fit together.
-
-![Strategies diagram](strategies_diagram.png)
-
-### RemoveDuplicates
-
-This strategy makes sure that there is only one pod associated with a ReplicaSet (RS),
-ReplicationController (RC), StatefulSet, or Job running on the same node. If there are more,
-those duplicate pods are evicted for better spreading of pods in a cluster. This issue could happen
-if some nodes went down due to whatever reasons, and pods on them were moved to other nodes leading to
-more than one pod associated with a RS or RC, for example, running on the same node. Once the failed nodes
-are ready again, this strategy could be enabled to evict those duplicate pods.
-
-It provides one optional parameter, `excludeOwnerKinds`, which is a list of OwnerRef `Kind`s. If a pod
-has any of these `Kind`s listed as an `OwnerRef`, that pod will not be considered for eviction. Note that
-pods created by Deployments are considered for eviction by this strategy. The `excludeOwnerKinds` parameter
-should include `ReplicaSet` to have pods created by Deployments excluded.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`excludeOwnerKinds`|list(string)|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemoveDuplicates":
-     enabled: true
-     params:
-       removeDuplicates:
-         excludeOwnerKinds:
-         - "ReplicaSet"
-```
-
-### LowNodeUtilization
-
-This strategy finds nodes that are under utilized and evicts pods, if possible, from other nodes
-in the hope that recreation of evicted pods will be scheduled on these underutilized nodes. The
-parameters of this strategy are configured under `nodeResourceUtilizationThresholds`.
-
-The under utilization of nodes is determined by a configurable threshold `thresholds`. The threshold
-`thresholds` can be configured for cpu, memory, number of pods, and extended resources in terms of percentage (the percentage is
-calculated as the current resources requested on the node vs [total allocatable](https://kubernetes.io/docs/concepts/architecture/nodes/#capacity).
-For pods, this means the number of pods on the node as a fraction of the pod capacity set for that node).
-
-If a node's usage is below threshold for all (cpu, memory, number of pods and extended resources), the node is considered underutilized.
-Currently, pods request resource requirements are considered for computing node resource utilization.
-
-There is another configurable threshold, `targetThresholds`, that is used to compute those potential nodes
-from where pods could be evicted. If a node's usage is above targetThreshold for any (cpu, memory, number of pods, or extended resources),
-the node is considered over utilized. Any node between the thresholds, `thresholds` and `targetThresholds` is
-considered appropriately utilized and is not considered for eviction. The threshold, `targetThresholds`,
-can be configured for cpu, memory, and number of pods too in terms of percentage.
-
-These thresholds, `thresholds` and `targetThresholds`, could be tuned as per your cluster requirements. Note that this
-strategy evicts pods from `overutilized nodes` (those with usage above `targetThresholds`) to `underutilized nodes`
-(those with usage below `thresholds`), it will abort if any number of `underutilized nodes` or `overutilized nodes` is zero.
-
-Additionally, the strategy accepts a `useDeviationThresholds` parameter.
-If that parameter is set to `true`, the thresholds are considered as percentage deviations from mean resource usage.
-`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:** 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. Implementing metrics-based descheduling is currently TODO for the project.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`thresholds`|map(string:int)|
-|`targetThresholds`|map(string:int)|
-|`numberOfNodes`|int|
-|`useDeviationThresholds`|bool|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-|`Namespaces`|(see [namespace filtering](#namespace-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "LowNodeUtilization":
-     enabled: true
-     params:
-       nodeResourceUtilizationThresholds:
-         thresholds:
-           "cpu" : 20
-           "memory": 20
-           "pods": 20
-         targetThresholds:
-           "cpu" : 50
-           "memory": 50
-           "pods": 50
-```
-
-Policy should pass the following validation checks:
-* Three basic native types of resources are supported: `cpu`, `memory` and `pods`.
-If any of these resource types is not specified, all its thresholds default to 100% to avoid nodes going from underutilized to overutilized.
-* Extended resources are supported. For example, resource type `nvidia.com/gpu` is specified for GPU node utilization. Extended resources are optional,
-and will not be used to compute node's usage if it's not specified in `thresholds` and `targetThresholds` explicitly.
-* `thresholds` or `targetThresholds` can not be nil and they must configure exactly the same types of resources.
-* 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 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.
-
-### HighNodeUtilization
-
-This strategy finds nodes that are under utilized and evicts pods from the nodes in the hope that these pods will be
-scheduled compactly into fewer nodes.  Used in conjunction with node auto-scaling, this strategy is intended to help
-trigger down scaling of under utilized nodes.
-This strategy **must** be used with the scheduler scoring strategy `MostAllocated`. The parameters of this strategy are
-configured under `nodeResourceUtilizationThresholds`.
-
-The under utilization of nodes is determined by a configurable threshold `thresholds`. The threshold
-`thresholds` can be configured for cpu, memory, number of pods, and extended resources in terms of percentage. The percentage is
-calculated as the current resources requested on the node vs [total allocatable](https://kubernetes.io/docs/concepts/architecture/nodes/#capacity).
-For pods, this means the number of pods on the node as a fraction of the pod capacity set for that node.
-
-If a node's usage is below threshold for all (cpu, memory, number of pods and extended resources), the node is considered underutilized.
-Currently, pods request resource requirements are considered for computing node resource utilization.
-Any node above `thresholds` is considered appropriately utilized and is not considered for eviction.
-
-The `thresholds` param could be tuned as per your cluster requirements. Note that this
-strategy evicts pods from `underutilized nodes` (those with usage below `thresholds`)
-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.
-
-**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. Implementing metrics-based descheduling is currently TODO for the project.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`thresholds`|map(string:int)|
-|`numberOfNodes`|int|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-|`Namespaces`|(see [namespace filtering](#namespace-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "HighNodeUtilization":
-     enabled: true
-     params:
-       nodeResourceUtilizationThresholds:
-         thresholds:
-           "cpu" : 20
-           "memory": 20
-           "pods": 20
-```
-
-Policy should pass the following validation checks:
-* Three basic native types of resources are supported: `cpu`, `memory` and `pods`. If any of these resource types is not specified, all its thresholds default to 100%.
-* Extended resources are supported. For example, resource type `nvidia.com/gpu` is specified for GPU node utilization. Extended resources are optional, and will not be used to compute node's usage if it's not specified in `thresholds` explicitly.
-* `thresholds` can not be nil.
-* The valid range of the resource's percentage value is \[0, 100\]
-
-There is another parameter associated with the `HighNodeUtilization` strategy, called `numberOfNodes`.
-This parameter can be configured to activate the strategy only when the number of under utilized nodes
-is 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.
-
-### RemovePodsViolatingInterPodAntiAffinity
-
-This strategy makes sure that pods violating interpod anti-affinity are removed from nodes. For example,
-if there is podA on a node and podB and podC (running on the same node) have anti-affinity rules which prohibit
-them to run on the same node, then podA will be evicted from the node so that podB and podC could run. This
-issue could happen, when the anti-affinity rules for podB and podC are created when they are already running on
-node.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemovePodsViolatingInterPodAntiAffinity":
-     enabled: true
-```
-
-### RemovePodsViolatingNodeAffinity
-
-This strategy makes sure all pods violating
-[node affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity)
-are eventually removed from nodes. Node affinity rules allow a pod to specify
-`requiredDuringSchedulingIgnoredDuringExecution` type, which tells the scheduler
-to respect node affinity when scheduling the pod but kubelet to ignore
-in case node changes over time and no longer respects the affinity.
-When enabled, the strategy serves as a temporary implementation
-of `requiredDuringSchedulingRequiredDuringExecution` and evicts pod for kubelet
-that no longer respects node affinity.
-
-For example, there is podA scheduled on nodeA which satisfies the node
-affinity rule `requiredDuringSchedulingIgnoredDuringExecution` at the time
-of scheduling. Over time nodeA stops to satisfy the rule. When the strategy gets
-executed and there is another node available that satisfies the node affinity rule,
-podA gets evicted from nodeA.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`nodeAffinityType`|list(string)|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemovePodsViolatingNodeAffinity":
-    enabled: true
-    params:
-      nodeAffinityType:
-      - "requiredDuringSchedulingIgnoredDuringExecution"
-```
-
-### RemovePodsViolatingNodeTaints
-
-This strategy makes sure that pods violating NoSchedule taints on nodes are removed. For example there is a
-pod "podA" with a toleration to tolerate a taint ``key=value:NoSchedule`` scheduled and running on the tainted
-node. If the node's taint is subsequently updated/removed, taint is no longer satisfied by its pods' tolerations
-and will be evicted.
-
-Node taints can be excluded from consideration by specifying a list of excludedTaints. If a node taint key **or**
-key=value matches an excludedTaints entry, the taint will be ignored.
-
-For example, excludedTaints entry "dedicated" would match all taints with key "dedicated", regardless of value.
-excludedTaints entry "dedicated=special-user" would match taints with key "dedicated" and value "special-user".
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`excludedTaints`|list(string)|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-````yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemovePodsViolatingNodeTaints":
-    enabled: true
-    params:
-      excludedTaints:
-      - dedicated=special-user # exclude taints with key "dedicated" and value "special-user"
-      - reserved # exclude all taints with key "reserved"
-````
-
-### RemovePodsViolatingTopologySpreadConstraint
-
-This strategy makes sure that pods violating [topology spread constraints](https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/)
-are evicted from nodes. Specifically, it tries to evict the minimum number of pods required to balance topology domains to within each constraint's `maxSkew`.
-This strategy requires k8s version 1.18 at a minimum.
-
-By default, this strategy only deals with hard constraints, setting parameter `includeSoftConstraints` to `true` will
-include soft constraints.
-
-Strategy parameter `labelSelector` is not utilized when balancing topology domains and is only applied during eviction to determine if the pod can be evicted.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`includeSoftConstraints`|bool|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemovePodsViolatingTopologySpreadConstraint":
-     enabled: true
-     params:
-       includeSoftConstraints: false
-```
-
-
-### RemovePodsHavingTooManyRestarts
-
-This strategy makes sure that pods having too many restarts are removed from nodes. For example a pod with EBS/PD that
-can't get the volume/disk attached to the instance, then the pod should be re-scheduled to other nodes. Its parameters
-include `podRestartThreshold`, which is the number of restarts (summed over all eligible containers) at which a pod
-should be evicted, and `includingInitContainers`, which determines whether init container restarts should be factored
-into that calculation.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`podRestartThreshold`|int|
-|`includingInitContainers`|bool|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemovePodsHavingTooManyRestarts":
-     enabled: true
-     params:
-       podsHavingTooManyRestarts:
-         podRestartThreshold: 100
-         includingInitContainers: true
-```
-
-### PodLifeTime
-
-This strategy evicts pods that are older than `maxPodLifeTimeSeconds`.
-
-You can also specify `states` parameter to **only** evict pods matching the following conditions:
-  - [Pod Phase](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase) status of: `Running`, `Pending`
-  - [Container State Waiting](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-waiting) condition of: `PodInitializing`, `ContainerCreating`
-
-If a value for `states` or `podStatusPhases` is not specified,
-Pods in any state (even `Running`) are considered for eviction.
-
-**Parameters:**
-
-|Name|Type|Notes|
-|---|---|---|
-|`maxPodLifeTimeSeconds`|int||
-|`podStatusPhases`|list(string)|Deprecated in v0.25+ Use `states` instead|
-|`states`|list(string)|Only supported in v0.25+|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))||
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))||
-|`namespaces`|(see [namespace filtering](#namespace-filtering))||
-|`labelSelector`|(see [label filtering](#label-filtering))||
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-     enabled: true
-     params:
-       podLifeTime:
-         maxPodLifeTimeSeconds: 86400
-         states:
-         - "Pending"
-         - "PodInitializing"
-```
-
-### RemoveFailedPods
-
-This strategy evicts pods that are in failed status phase.
-You can provide an optional parameter to filter by failed `reasons`.
-`reasons` can be expanded to include reasons 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.
-Lastly, you can specify the optional parameter `excludeOwnerKinds` and if a pod
-has any of these `Kind`s listed as an `OwnerRef`, that pod will not be considered for eviction.
-
-**Parameters:**
-
-|Name|Type|
-|---|---|
-|`minPodLifetimeSeconds`|uint|
-|`excludeOwnerKinds`|list(string)|
-|`reasons`|list(string)|
-|`includingInitContainers`|bool|
-|`thresholdPriority`|int (see [priority filtering](#priority-filtering))|
-|`thresholdPriorityClassName`|string (see [priority filtering](#priority-filtering))|
-|`namespaces`|(see [namespace filtering](#namespace-filtering))|
-|`labelSelector`|(see [label filtering](#label-filtering))|
-|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-
-**Example:**
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "RemoveFailedPods":
-     enabled: true
-     params:
-       failedPods:
-         reasons:
-         - "NodeAffinity"
-         includingInitContainers: true
-         excludeOwnerKinds:
-         - "Job"
-         minPodLifetimeSeconds: 3600
-```
-
-## Filter Pods
-
-### Namespace filtering
-
-The following strategies accept a `namespaces` parameter which allows to specify a list of including, resp. excluding namespaces:
-* `PodLifeTime`
-* `RemovePodsHavingTooManyRestarts`
-* `RemovePodsViolatingNodeTaints`
-* `RemovePodsViolatingNodeAffinity`
-* `RemovePodsViolatingInterPodAntiAffinity`
-* `RemoveDuplicates`
-* `RemovePodsViolatingTopologySpreadConstraint`
-* `RemoveFailedPods`
-* `LowNodeUtilization` and `HighNodeUtilization` (Only filtered right before eviction)
-
-For example:
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-     enabled: true
-     params:
-        podLifeTime:
-          maxPodLifeTimeSeconds: 86400
-        namespaces:
-          include:
-          - "namespace1"
-          - "namespace2"
-```
-
-In the examples `PodLifeTime` gets executed only over `namespace1` and `namespace2`.
-The similar holds for `exclude` field:
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-     enabled: true
-     params:
-        podLifeTime:
-          maxPodLifeTimeSeconds: 86400
-        namespaces:
-          exclude:
-          - "namespace1"
-          - "namespace2"
-```
-
-The strategy gets executed over all namespaces but `namespace1` and `namespace2`.
-
-It's not allowed to compute `include` with `exclude` field.
-
-### Priority filtering
-
-All strategies are able to configure a priority threshold, only pods under the threshold can be evicted. You can
-specify this threshold by setting `thresholdPriorityClassName`(setting the threshold to the value of the given
-priority class) or `thresholdPriority`(directly setting the threshold) parameters. By default, this threshold
-is set to the value of `system-cluster-critical` priority class.
-
-Note: Setting `evictSystemCriticalPods` to true disables priority filtering entirely.
-
-E.g.
-
-Setting `thresholdPriority`
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-     enabled: true
-     params:
-        podLifeTime:
-          maxPodLifeTimeSeconds: 86400
-        thresholdPriority: 10000
-```
-
-Setting `thresholdPriorityClassName`
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-     enabled: true
-     params:
-        podLifeTime:
-          maxPodLifeTimeSeconds: 86400
-        thresholdPriorityClassName: "priorityclass1"
-```
-
-Note that you can't configure both `thresholdPriority` and `thresholdPriorityClassName`, if the given priority class
-does not exist, descheduler won't create it and will throw an error.
-
-### Label filtering
-
-The following strategies can configure a [standard kubernetes labelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#labelselector-v1-meta)
-to filter pods by their labels:
-
-* `PodLifeTime`
-* `RemovePodsHavingTooManyRestarts`
-* `RemovePodsViolatingNodeTaints`
-* `RemovePodsViolatingNodeAffinity`
-* `RemovePodsViolatingInterPodAntiAffinity`
-* `RemovePodsViolatingTopologySpreadConstraint`
-* `RemoveFailedPods`
-
-This allows running strategies among pods the descheduler is interested in.
-
-For example:
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-    enabled: true
-    params:
-      podLifeTime:
-        maxPodLifeTimeSeconds: 86400
-      labelSelector:
-        matchLabels:
-          component: redis
-        matchExpressions:
-          - {key: tier, operator: In, values: [cache]}
-          - {key: environment, operator: NotIn, values: [dev]}
-```
-
-
-### Node Fit filtering
-
-The following strategies accept a `nodeFit` boolean parameter which can optimize descheduling:
-* `RemoveDuplicates`
-* `LowNodeUtilization`
-* `HighNodeUtilization`
-* `RemovePodsViolatingInterPodAntiAffinity`
-* `RemovePodsViolatingNodeAffinity`
-* `RemovePodsViolatingNodeTaints`
-* `RemovePodsViolatingTopologySpreadConstraint`
-* `RemovePodsHavingTooManyRestarts`
-* `RemoveFailedPods`
-
- If set to `true` the descheduler will consider whether or not the pods that meet eviction criteria will fit on other nodes before evicting them. If a pod cannot be rescheduled to another node, it will not be evicted. Currently the following criteria are considered when setting `nodeFit` to `true`:
-- A `nodeSelector` on the pod
-- Any `tolerations` on the pod and any `taints` on the other nodes
-- `nodeAffinity` on the pod
-- Resource `requests` made by the pod and the resources available on other nodes
-- Whether any of the other nodes are marked as `unschedulable`
-
-E.g.
-
-```yaml
-apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "LowNodeUtilization":
-    enabled: true
-    params:
-      nodeFit: true
-      nodeResourceUtilizationThresholds:
-        thresholds:
-          "cpu": 20
-          "memory": 20
-          "pods": 20
-        targetThresholds:
-          "cpu": 50
-          "memory": 50
-          "pods": 50
-```
-
-Note that node fit filtering references the current pod spec, and not that of it's owner.
-Thus, if the pod is owned by a ReplicationController (and that ReplicationController was modified recently),
-the pod may be running with an outdated spec, which the descheduler will reference when determining node fit.
-This is expected behavior as the descheduler is a "best-effort" mechanism.
-
-Using Deployments instead of ReplicationControllers provides an automated rollout of pod spec changes, therefore ensuring that the descheduler has an up-to-date view of the cluster state.

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 `kubernetes-sig-scheduling@googlegroups.com` to announce the release
+6. Email `sig-scheduling@kubernetes.io` 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 `kubernetes-sig-scheduling@googlegroups.com` to announce the release
+6. Email `sig-scheduling@kubernetes.io` to announce the release
 
 ### Flowchart
 

docs/user-guide.md

@@ -4,22 +4,13 @@ Starting with descheduler release v0.10.0 container images are available in the
 
 Descheduler Version | Container Image                                 | Architectures           |
 ------------------- |-------------------------------------------------|-------------------------|
-v0.28.0             | registry.k8s.io/descheduler/descheduler:v0.28.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.27.1             | registry.k8s.io/descheduler/descheduler:v0.27.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.27.0             | registry.k8s.io/descheduler/descheduler:v0.27.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.26.1             | registry.k8s.io/descheduler/descheduler:v0.26.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.26.0             | registry.k8s.io/descheduler/descheduler:v0.26.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.25.1             | registry.k8s.io/descheduler/descheduler:v0.25.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.25.0             | registry.k8s.io/descheduler/descheduler:v0.25.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.24.1             | registry.k8s.io/descheduler/descheduler:v0.24.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.24.0             | registry.k8s.io/descheduler/descheduler:v0.24.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.23.1             | registry.k8s.io/descheduler/descheduler:v0.23.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.22.0             | registry.k8s.io/descheduler/descheduler:v0.22.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.21.0             | registry.k8s.io/descheduler/descheduler:v0.21.0 | AMD64<br>ARM64<br>ARMv7 |
-v0.20.0             | registry.k8s.io/descheduler/descheduler:v0.20.0 | AMD64<br>ARM64          |
-v0.19.0             | registry.k8s.io/descheduler/descheduler:v0.19.0 | AMD64                   |
-v0.18.0             | registry.k8s.io/descheduler/descheduler:v0.18.0 | AMD64                   |
-v0.10.0             | registry.k8s.io/descheduler/descheduler:v0.10.0 | AMD64                   |
+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 |
 
 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

go.mod

@@ -1,116 +1,138 @@
 module sigs.k8s.io/descheduler
 
-go 1.20
+go 1.24.0
+
+toolchain go1.24.3
+
+godebug default=go1.24
 
 require (
 	github.com/client9/misspell v0.3.4
-	github.com/google/go-cmp v0.5.9
-	github.com/spf13/cobra v1.7.0
-	github.com/spf13/pflag v1.0.5
-	go.opentelemetry.io/otel v1.10.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0
-	go.opentelemetry.io/otel/sdk v1.10.0
-	go.opentelemetry.io/otel/trace v1.10.0
-	google.golang.org/grpc v1.54.0
-	k8s.io/api v0.28.0
-	k8s.io/apimachinery v0.28.0
-	k8s.io/apiserver v0.28.0
-	k8s.io/client-go v0.28.0
-	k8s.io/code-generator v0.28.0
-	k8s.io/component-base v0.28.0
-	k8s.io/component-helpers v0.28.0
-	k8s.io/klog/v2 v2.100.1
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	github.com/google/go-cmp v0.7.0
+	github.com/prometheus/client_golang v1.22.0
+	github.com/prometheus/common v0.64.0
+	github.com/spf13/cobra v1.10.0
+	github.com/spf13/pflag v1.0.9
+	go.opentelemetry.io/otel v1.36.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0
+	go.opentelemetry.io/otel/sdk v1.36.0
+	go.opentelemetry.io/otel/trace v1.36.0
+	google.golang.org/grpc v1.72.2
+	k8s.io/api v0.34.0
+	k8s.io/apimachinery v0.34.0
+	k8s.io/apiserver v0.34.0
+	k8s.io/client-go v0.34.0
+	k8s.io/code-generator v0.34.0
+	k8s.io/component-base v0.34.0
+	k8s.io/component-helpers v0.34.0
+	k8s.io/klog/v2 v2.130.1
+	k8s.io/metrics v0.34.0
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
+	kubevirt.io/api v1.3.0
+	kubevirt.io/client-go v1.3.0
+	kubevirt.io/containerized-data-importer-api v1.60.1 // indirect; drops dependency on o/api
 	sigs.k8s.io/mdtoc v1.1.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
+require golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+
 require (
+	cel.dev/expr v0.24.0 // indirect
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
-	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // 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/kit v0.13.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.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-logr/zapr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-logr/zapr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/glog v1.2.4 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect
-	github.com/google/cel-go v0.16.0 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/cel-go v0.26.0 // indirect
+	github.com/google/gnostic-models v0.7.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-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
+	github.com/jpillora/backoff 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/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // 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/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // 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.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/stoewer/go-strcase v1.2.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
-	go.opentelemetry.io/otel/metric v0.31.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	github.com/stoewer/go-strcase v1.3.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.etcd.io/etcd/api/v3 v3.6.4 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
+	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.13.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
+	google.golang.org/protobuf v1.36.6 // 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
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kms v0.28.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/apiextensions-apiserver v0.30.0 // indirect
+	k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
+	k8s.io/kms v0.34.0 // indirect
+	k8s.io/kube-openapi v0.30.0 // indirect
+	kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )
+
+replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b

hack/cherry_pick_pull.sh

@@ -0,0 +1,257 @@
+#!/usr/bin/env bash
+
+# Copyright 2015 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.
+
+# Usage Instructions: https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md
+
+# Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How
+# meta.) Assumes you care about pulls from remote "upstream" and
+# checks them out to a branch named:
+#  automated-cherry-pick-of-<pr>-<target branch>-<timestamp>
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+declare -r REPO_ROOT
+cd "${REPO_ROOT}"
+
+STARTINGBRANCH=$(git symbolic-ref --short HEAD)
+declare -r STARTINGBRANCH
+declare -r REBASEMAGIC="${REPO_ROOT}/.git/rebase-apply"
+DRY_RUN=${DRY_RUN:-""}
+REGENERATE_DOCS=${REGENERATE_DOCS:-""}
+UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream}
+FORK_REMOTE=${FORK_REMOTE:-origin}
+MAIN_REPO_ORG=${MAIN_REPO_ORG:-$(git remote get-url "$UPSTREAM_REMOTE" | awk '{gsub(/http[s]:\/\/|git@/,"")}1' | awk -F'[@:./]' 'NR==1{print $3}')}
+MAIN_REPO_NAME=${MAIN_REPO_NAME:-$(git remote get-url "$UPSTREAM_REMOTE" | awk '{gsub(/http[s]:\/\/|git@/,"")}1' | awk -F'[@:./]' 'NR==1{print $4}')}
+
+if [[ -z ${GITHUB_USER:-} ]]; then
+  echo "Please export GITHUB_USER=<your-user> (or GH organization, if that's where your fork lives)"
+  exit 1
+fi
+
+if ! command -v gh > /dev/null; then
+  echo "Can't find 'gh' tool in PATH, please install from https://github.com/cli/cli"
+  exit 1
+fi
+
+if [[ "$#" -lt 2 ]]; then
+  echo "${0} <remote branch> <pr-number>...: cherry pick one or more <pr> onto <remote branch> and leave instructions for proposing pull request"
+  echo
+  echo "  Checks out <remote branch> and handles the cherry-pick of <pr> (possibly multiple) for you."
+  echo "  Examples:"
+  echo "    $0 upstream/release-3.14 12345        # Cherry-picks PR 12345 onto upstream/release-3.14 and proposes that as a PR."
+  echo "    $0 upstream/release-3.14 12345 56789  # Cherry-picks PR 12345, then 56789 and proposes the combination as a single PR."
+  echo
+  echo "  Set the DRY_RUN environment var to skip git push and creating PR."
+  echo "  This is useful for creating patches to a release branch without making a PR."
+  echo "  When DRY_RUN is set the script will leave you in a branch containing the commits you cherry-picked."
+  echo
+  echo "  Set the REGENERATE_DOCS environment var to regenerate documentation for the target branch after picking the specified commits."
+  echo "  This is useful when picking commits containing changes to API documentation."
+  echo
+  echo "  Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)"
+  echo "  to override the default remote names to what you have locally."
+  echo
+  echo "  For merge process info, see https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md"
+  exit 2
+fi
+
+# Checks if you are logged in. Will error/bail if you are not.
+gh auth status
+
+if git_status=$(git status --porcelain --untracked=no 2>/dev/null) && [[ -n "${git_status}" ]]; then
+  echo "!!! Dirty tree. Clean up and try again."
+  exit 1
+fi
+
+if [[ -e "${REBASEMAGIC}" ]]; then
+  echo "!!! 'git rebase' or 'git am' in progress. Clean up and try again."
+  exit 1
+fi
+
+declare -r BRANCH="$1"
+shift 1
+declare -r PULLS=( "$@" )
+
+function join { local IFS="$1"; shift; echo "$*"; }
+PULLDASH=$(join - "${PULLS[@]/#/#}") # Generates something like "#12345-#56789"
+declare -r PULLDASH
+PULLSUBJ=$(join " " "${PULLS[@]/#/#}") # Generates something like "#12345 #56789"
+declare -r PULLSUBJ
+
+echo "+++ Updating remotes..."
+git remote update "${UPSTREAM_REMOTE}" "${FORK_REMOTE}"
+
+if ! git log -n1 --format=%H "${BRANCH}" >/dev/null 2>&1; then
+  echo "!!! '${BRANCH}' not found. The second argument should be something like ${UPSTREAM_REMOTE}/release-0.21."
+  echo "    (In particular, it needs to be a valid, existing remote branch that I can 'git checkout'.)"
+  exit 1
+fi
+
+NEWBRANCHREQ="automated-cherry-pick-of-${PULLDASH}" # "Required" portion for tools.
+declare -r NEWBRANCHREQ
+NEWBRANCH="$(echo "${NEWBRANCHREQ}-${BRANCH}" | sed 's/\//-/g')"
+declare -r NEWBRANCH
+NEWBRANCHUNIQ="${NEWBRANCH}-$(date +%s)"
+declare -r NEWBRANCHUNIQ
+echo "+++ Creating local branch ${NEWBRANCHUNIQ}"
+
+cleanbranch=""
+gitamcleanup=false
+function return_to_kansas {
+  if [[ "${gitamcleanup}" == "true" ]]; then
+    echo
+    echo "+++ Aborting in-progress git am."
+    git am --abort >/dev/null 2>&1 || true
+  fi
+
+  # return to the starting branch and delete the PR text file
+  if [[ -z "${DRY_RUN}" ]]; then
+    echo
+    echo "+++ Returning you to the ${STARTINGBRANCH} branch and cleaning up."
+    git checkout -f "${STARTINGBRANCH}" >/dev/null 2>&1 || true
+    if [[ -n "${cleanbranch}" ]]; then
+      git branch -D "${cleanbranch}" >/dev/null 2>&1 || true
+    fi
+  fi
+}
+trap return_to_kansas EXIT
+
+SUBJECTS=()
+function make-a-pr() {
+  local rel
+  rel="$(basename "${BRANCH}")"
+  echo
+  echo "+++ Creating a pull request on GitHub at ${GITHUB_USER}:${NEWBRANCH}"
+
+  local numandtitle
+  numandtitle=$(printf '%s\n' "${SUBJECTS[@]}")
+  prtext=$(cat <<EOF
+Cherry pick of ${PULLSUBJ} on ${rel}.
+
+${numandtitle}
+
+For details on the cherry pick process, see the [cherry pick requests](https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md) page.
+
+\`\`\`release-note
+
+\`\`\`
+EOF
+)
+
+  gh pr create --title="Automated cherry pick of ${numandtitle}" --body="${prtext}" --head "${GITHUB_USER}:${NEWBRANCH}" --base "${rel}" --repo="${MAIN_REPO_ORG}/${MAIN_REPO_NAME}"
+}
+
+git checkout -b "${NEWBRANCHUNIQ}" "${BRANCH}"
+cleanbranch="${NEWBRANCHUNIQ}"
+
+gitamcleanup=true
+for pull in "${PULLS[@]}"; do
+  echo "+++ Downloading patch to /tmp/${pull}.patch (in case you need to do this again)"
+
+  curl -o "/tmp/${pull}.patch" -sSL "https://github.com/${MAIN_REPO_ORG}/${MAIN_REPO_NAME}/pull/${pull}.patch"
+  echo
+  echo "+++ About to attempt cherry pick of PR. To reattempt:"
+  echo "  $ git am -3 /tmp/${pull}.patch"
+  echo
+  git am -3 "/tmp/${pull}.patch" || {
+    conflicts=false
+    while unmerged=$(git status --porcelain | grep ^U) && [[ -n ${unmerged} ]] \
+      || [[ -e "${REBASEMAGIC}" ]]; do
+      conflicts=true # <-- We should have detected conflicts once
+      echo
+      echo "+++ Conflicts detected:"
+      echo
+      (git status --porcelain | grep ^U) || echo "!!! None. Did you git am --continue?"
+      echo
+      echo "+++ Please resolve the conflicts in another window (and remember to 'git add / git am --continue')"
+      read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
+      echo
+      if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
+        echo "Aborting." >&2
+        exit 1
+      fi
+    done
+
+    if [[ "${conflicts}" != "true" ]]; then
+      echo "!!! git am failed, likely because of an in-progress 'git am' or 'git rebase'"
+      exit 1
+    fi
+  }
+
+  # set the subject
+  subject=$(grep -m 1 "^Subject" "/tmp/${pull}.patch" | sed -e 's/Subject: \[PATCH//g' | sed 's/.*] //')
+  SUBJECTS+=("#${pull}: ${subject}")
+
+  # remove the patch file from /tmp
+  rm -f "/tmp/${pull}.patch"
+done
+gitamcleanup=false
+
+# Re-generate docs (if needed)
+if [[ -n "${REGENERATE_DOCS}" ]]; then
+  echo
+  echo "Regenerating docs..."
+  if ! hack/generate-docs.sh; then
+    echo
+    echo "hack/generate-docs.sh FAILED to complete."
+    exit 1
+  fi
+fi
+
+if [[ -n "${DRY_RUN}" ]]; then
+  echo "!!! Skipping git push and PR creation because you set DRY_RUN."
+  echo "To return to the branch you were in when you invoked this script:"
+  echo
+  echo "  git checkout ${STARTINGBRANCH}"
+  echo
+  echo "To delete this branch:"
+  echo
+  echo "  git branch -D ${NEWBRANCHUNIQ}"
+  exit 0
+fi
+
+if git remote -v | grep ^"${FORK_REMOTE}" | grep "${MAIN_REPO_ORG}/${MAIN_REPO_NAME}.git"; then
+  echo "!!! You have ${FORK_REMOTE} configured as your ${MAIN_REPO_ORG}/${MAIN_REPO_NAME}.git"
+  echo "This isn't normal. Leaving you with push instructions:"
+  echo
+  echo "+++ First manually push the branch this script created:"
+  echo
+  echo "  git push REMOTE ${NEWBRANCHUNIQ}:${NEWBRANCH}"
+  echo
+  echo "where REMOTE is your personal fork (maybe ${UPSTREAM_REMOTE}? Consider swapping those.)."
+  echo "OR consider setting UPSTREAM_REMOTE and FORK_REMOTE to different values."
+  echo
+  make-a-pr
+  cleanbranch=""
+  exit 0
+fi
+
+echo
+echo "+++ I'm about to do the following to push to GitHub (and I'm assuming ${FORK_REMOTE} is your personal fork):"
+echo
+echo "  git push ${FORK_REMOTE} ${NEWBRANCHUNIQ}:${NEWBRANCH}"
+echo
+read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
+if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
+  echo "Aborting." >&2
+  exit 1
+fi
+
+git push "${FORK_REMOTE}" -f "${NEWBRANCHUNIQ}:${NEWBRANCH}"
+make-a-pr

hack/lib/generator-help.sh

@@ -20,6 +20,6 @@ function find_dirs_containing_comment_tags() {
      | LC_ALL=C sort -u \
      )
 
-   IFS=",";
+   IFS=" ";
    printf '%s' "${array[*]}";
 }

hack/lib/go.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# 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.
+
+# go::verify_version verifies the go version is supported by the project.
+# descheduler actively supports 3 versions, therefore 3 go versions are supported.
+go::verify_version() {
+  GO_VERSION=($(go version))
+
+  if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.22|go1.23|go1.24') ]]; then
+    echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
+    exit 1
+  fi
+}

hack/update-generated-conversions.sh

@@ -6,5 +6,5 @@ go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/con
 
 ${OS_OUTPUT_BINPATH}/conversion-gen \
 		--go-header-file "hack/boilerplate/boilerplate.go.txt" \
-		--input-dirs "$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")" \
-		--output-file-base zz_generated.conversion
+		--output-file zz_generated.conversion.go \
+		$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")

hack/update-generated-deep-copies.sh

@@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepc
 
 ${OS_OUTPUT_BINPATH}/deepcopy-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")" \
-                --output-file-base zz_generated.deepcopy
+                --output-file zz_generated.deepcopy.go \
+                $(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")
 

hack/update-generated-defaulters.sh

@@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defa
 
 ${OS_OUTPUT_BINPATH}/defaulter-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")" \
-		--extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
-                --output-file-base zz_generated.defaults
+                --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha2" \
+                --output-file zz_generated.defaults.go \
+                $(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")

hack/update-gofmt.sh

@@ -20,13 +20,9 @@ set -o nounset
 set -o pipefail
 
 DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${DESCHEDULER_ROOT}/hack/lib/go.sh"
 
-GO_VERSION=($(go version))
-
-if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.18|go1.19|go1.20') ]]; then
-  echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
-  exit 1
-fi
+go::verify_version
 
 cd "${DESCHEDULER_ROOT}"
 

hack/verify-gofmt.sh

@@ -20,13 +20,9 @@ set -o nounset
 set -o pipefail
 
 DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${DESCHEDULER_ROOT}/hack/lib/go.sh"
 
-GO_VERSION=($(go version))
-
-if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.18|go1.19|go1.20') ]]; then
-  echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt."
-  exit 1
-fi
+go::verify_version
 
 cd "${DESCHEDULER_ROOT}"
 

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*" vendor "${_deschedulertmp}/vendor")"; then
+  if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" -x "README*" vendor "${_deschedulertmp}/vendor")"; then
     echo "Your vendored results are different:" >&2
     echo "${_out}" >&2
     echo "Vendor Verify failed." >&2

keps/1397-evictions-in-background/kep.yaml

@@ -0,0 +1,16 @@
+title: descheduler integration with evacuation API as an alternative to eviction API
+kep-number: 1397
+authors:
+  - "@ingvagabund"
+owning-sig: sig-scheduling
+participating-sigs:
+  - sig-apps
+status: provisional
+creation-date: 2024-04-14
+reviewers:
+  - atiratree
+approvers:
+  - TBD
+feature-gates:
+  - TBD
+stage: alpha

keps/753-descheduling-framework/kep.yaml

@@ -0,0 +1,29 @@
+title: Descheduling framework
+kep-number: 753
+authors:
+  - "@ingvagabund"
+  - "@damemi"
+owning-sig: sig-scheduling
+status: provisional
+creation-date: 2024-04-08
+reviewers:
+  - "@ingvagabund"
+  - "@damemi"
+  - "@a7i"
+  - "@knelasevero"
+approvers:
+  - "@ingvagabund"
+  - "@damemi"
+  - "@a7i"
+  - "@knelasevero"
+#replaces:
+
+# The target maturity stage in the current dev cycle for this KEP.
+stage: alpha
+
+# The most recent milestone for which work toward delivery of this KEP has been
+# done. This can be the current (upcoming) milestone, if it is being actively
+# worked on.
+# latest-milestone: "v1.19"
+
+# disable-supported: true

kubernetes/base/rbac.yaml

@@ -22,13 +22,31 @@ 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"]
+  verbs: ["create", "update"]
 - apiGroups: ["coordination.k8s.io"]
   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
@@ -48,3 +66,16 @@ 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.27.1
+            image: registry.k8s.io/descheduler/descheduler:v0.34.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.27.1
+          image: registry.k8s.io/descheduler/descheduler:v0.34.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.27.1
+          image: registry.k8s.io/descheduler/descheduler:v0.34.0
           volumeMounts:
           - mountPath: /policy-dir
             name: policy-volume

metrics/metrics.go

@@ -31,12 +31,20 @@ 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",
-			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",
+			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",
 			StabilityLevel: metrics.ALPHA,
-		}, []string{"result", "strategy", "namespace", "node"})
+		}, []string{"result", "strategy", "profile", "namespace", "node"})
 
 	buildInfo = metrics.NewGauge(
 		&metrics.GaugeOpts{
@@ -49,18 +57,36 @@ 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:           "descheduler_loop_duration_seconds",
+			Name:           "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:           "descheduler_strategy_duration_seconds",
+			Name:           "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},
@@ -68,9 +94,12 @@ var (
 
 	metricsList = []metrics.Registerable{
 		PodsEvicted,
+		PodsEvictedTotal,
 		buildInfo,
 		DeschedulerLoopDuration,
 		DeschedulerStrategyDuration,
+		LoopDuration,
+		StrategyDuration,
 	}
 )
 

pkg/api/types.go

@@ -18,6 +18,7 @@ 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"
 )
@@ -38,13 +39,39 @@ type DeschedulerPolicy struct {
 
 	// MaxNoOfPodsToEvictPerNamespace restricts maximum of pods to be evicted per namespace.
 	MaxNoOfPodsToEvictPerNamespace *uint
+
+	// 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
 }
 
 // Namespaces carries a list of included/excluded namespaces
 // for which a given strategy is applicable
 type Namespaces struct {
-	Include []string `json:"include"`
-	Exclude []string `json:"exclude"`
+	Include []string `json:"include,omitempty"`
+	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 (
@@ -81,3 +108,55 @@ type PluginSet struct {
 	Enabled  []string
 	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 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/v1alpha1/conversion.go

@@ -1,271 +0,0 @@
-/*
-Copyright 2023 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 v1alpha1
-
-import (
-	"context"
-	"fmt"
-
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/client-go/informers"
-	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/klog/v2"
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
-	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-)
-
-var (
-	// pluginArgConversionScheme is a scheme with internal and v1alpha2 registered,
-	// used for defaulting/converting typed PluginConfig Args.
-	// Access via getPluginArgConversionScheme()
-
-	Scheme = runtime.NewScheme()
-	Codecs = serializer.NewCodecFactory(Scheme, serializer.EnableStrict)
-)
-
-// evictorImpl implements the Evictor interface so plugins
-// can evict a pod without importing a specific pod evictor
-type evictorImpl struct {
-	podEvictor    *evictions.PodEvictor
-	evictorFilter frameworktypes.EvictorPlugin
-}
-
-var _ frameworktypes.Evictor = &evictorImpl{}
-
-// Filter checks if a pod can be evicted
-func (ei *evictorImpl) Filter(pod *v1.Pod) bool {
-	return ei.evictorFilter.Filter(pod)
-}
-
-// PreEvictionFilter checks if pod can be evicted right before eviction
-func (ei *evictorImpl) PreEvictionFilter(pod *v1.Pod) bool {
-	return ei.evictorFilter.PreEvictionFilter(pod)
-}
-
-// Evict evicts a pod (no pre-check performed)
-func (ei *evictorImpl) Evict(ctx context.Context, pod *v1.Pod, opts evictions.EvictOptions) bool {
-	return ei.podEvictor.EvictPod(ctx, pod, opts)
-}
-
-func (ei *evictorImpl) NodeLimitExceeded(node *v1.Node) bool {
-	return ei.podEvictor.NodeLimitExceeded(node)
-}
-
-// handleImpl implements the framework handle which gets passed to plugins
-type handleImpl struct {
-	clientSet                 clientset.Interface
-	getPodsAssignedToNodeFunc podutil.GetPodsAssignedToNodeFunc
-	sharedInformerFactory     informers.SharedInformerFactory
-	evictor                   *evictorImpl
-}
-
-var _ frameworktypes.Handle = &handleImpl{}
-
-// ClientSet retrieves kube client set
-func (hi *handleImpl) ClientSet() clientset.Interface {
-	return hi.clientSet
-}
-
-// GetPodsAssignedToNodeFunc retrieves GetPodsAssignedToNodeFunc implementation
-func (hi *handleImpl) GetPodsAssignedToNodeFunc() podutil.GetPodsAssignedToNodeFunc {
-	return hi.getPodsAssignedToNodeFunc
-}
-
-// SharedInformerFactory retrieves shared informer factory
-func (hi *handleImpl) SharedInformerFactory() informers.SharedInformerFactory {
-	return hi.sharedInformerFactory
-}
-
-// Evictor retrieves evictor so plugins can filter and evict pods
-func (hi *handleImpl) Evictor() frameworktypes.Evictor {
-	return hi.evictor
-}
-
-func Convert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
-	err := V1alpha1ToInternal(in, pluginregistry.PluginRegistry, out, s)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func V1alpha1ToInternal(
-	deschedulerPolicy *DeschedulerPolicy,
-	registry pluginregistry.Registry,
-	out *api.DeschedulerPolicy,
-	s conversion.Scope,
-) error {
-	var evictLocalStoragePods bool
-	if deschedulerPolicy.EvictLocalStoragePods != nil {
-		evictLocalStoragePods = *deschedulerPolicy.EvictLocalStoragePods
-	}
-
-	evictBarePods := false
-	if deschedulerPolicy.EvictFailedBarePods != nil {
-		evictBarePods = *deschedulerPolicy.EvictFailedBarePods
-		if evictBarePods {
-			klog.V(1).Info("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
-		}
-	}
-
-	evictSystemCriticalPods := false
-	if deschedulerPolicy.EvictSystemCriticalPods != nil {
-		evictSystemCriticalPods = *deschedulerPolicy.EvictSystemCriticalPods
-		if evictSystemCriticalPods {
-			klog.V(1).Info("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.")
-		}
-	}
-
-	ignorePvcPods := false
-	if deschedulerPolicy.IgnorePVCPods != nil {
-		ignorePvcPods = *deschedulerPolicy.IgnorePVCPods
-	}
-
-	var profiles []api.DeschedulerProfile
-
-	// Build profiles
-	for name, strategy := range deschedulerPolicy.Strategies {
-		if _, ok := pluginregistry.PluginRegistry[string(name)]; ok {
-			if strategy.Enabled {
-				params := strategy.Params
-				if params == nil {
-					params = &StrategyParameters{}
-				}
-
-				nodeFit := false
-				if name != "PodLifeTime" {
-					nodeFit = params.NodeFit
-				}
-
-				if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
-					klog.ErrorS(fmt.Errorf("priority threshold misconfigured"), "only one of priorityThreshold fields can be set", "pluginName", name)
-					return fmt.Errorf("priority threshold misconfigured for plugin %v", name)
-				}
-
-				var priorityThreshold *api.PriorityThreshold
-				if strategy.Params != nil {
-					priorityThreshold = &api.PriorityThreshold{
-						Value: strategy.Params.ThresholdPriority,
-						Name:  strategy.Params.ThresholdPriorityClassName,
-					}
-				}
-
-				var pluginConfig *api.PluginConfig
-				var err error
-				if pcFnc, exists := StrategyParamsToPluginArgs[string(name)]; exists {
-					pluginConfig, err = pcFnc(params)
-					if err != nil {
-						klog.ErrorS(err, "skipping strategy", "strategy", name)
-						return fmt.Errorf("failed to get plugin config for strategy %v: %v", name, err)
-					}
-				} else {
-					klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
-					return fmt.Errorf("unknown strategy name: %v", name)
-				}
-
-				profile := api.DeschedulerProfile{
-					Name: fmt.Sprintf("strategy-%v-profile", name),
-					PluginConfigs: []api.PluginConfig{
-						{
-							Name: defaultevictor.PluginName,
-							Args: &defaultevictor.DefaultEvictorArgs{
-								EvictLocalStoragePods:   evictLocalStoragePods,
-								EvictSystemCriticalPods: evictSystemCriticalPods,
-								IgnorePvcPods:           ignorePvcPods,
-								EvictFailedBarePods:     evictBarePods,
-								NodeFit:                 nodeFit,
-								PriorityThreshold:       priorityThreshold,
-							},
-						},
-						*pluginConfig,
-					},
-					Plugins: api.Plugins{
-						Filter: api.PluginSet{
-							Enabled: []string{defaultevictor.PluginName},
-						},
-						PreEvictionFilter: api.PluginSet{
-							Enabled: []string{defaultevictor.PluginName},
-						},
-					},
-				}
-
-				pluginArgs := registry[string(name)].PluginArgInstance
-				pluginInstance, err := registry[string(name)].PluginBuilder(pluginArgs, &handleImpl{})
-				if err != nil {
-					klog.ErrorS(fmt.Errorf("could not build plugin"), "plugin build error", "plugin", name)
-					return fmt.Errorf("could not build plugin: %v", name)
-				}
-
-				// pluginInstance can be of any of each type, or both
-				profilePlugins := profile.Plugins
-				profile.Plugins = enableProfilePluginsByType(profilePlugins, pluginInstance, pluginConfig)
-				profiles = append(profiles, profile)
-			}
-		} else {
-			klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
-			return fmt.Errorf("unknown strategy name: %v", name)
-		}
-	}
-
-	out.Profiles = profiles
-	out.NodeSelector = deschedulerPolicy.NodeSelector
-	out.MaxNoOfPodsToEvictPerNamespace = deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace
-	out.MaxNoOfPodsToEvictPerNode = deschedulerPolicy.MaxNoOfPodsToEvictPerNode
-
-	return nil
-}
-
-func enableProfilePluginsByType(profilePlugins api.Plugins, pluginInstance frameworktypes.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	profilePlugins = checkBalance(profilePlugins, pluginInstance, pluginConfig)
-	profilePlugins = checkDeschedule(profilePlugins, pluginInstance, pluginConfig)
-	return profilePlugins
-}
-
-func checkBalance(profilePlugins api.Plugins, pluginInstance frameworktypes.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	_, ok := pluginInstance.(frameworktypes.BalancePlugin)
-	if ok {
-		klog.V(3).Infof("converting Balance plugin: %s", pluginInstance.Name())
-		profilePlugins.Balance.Enabled = []string{pluginConfig.Name}
-	}
-	return profilePlugins
-}
-
-func checkDeschedule(profilePlugins api.Plugins, pluginInstance frameworktypes.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
-	_, ok := pluginInstance.(frameworktypes.DeschedulePlugin)
-	if ok {
-		klog.V(3).Infof("converting Deschedule plugin: %s", pluginInstance.Name())
-		profilePlugins.Deschedule.Enabled = []string{pluginConfig.Name}
-	}
-	return profilePlugins
-}
-
-// Register Conversions
-func RegisterConversions(s *runtime.Scheme) error {
-	if err := s.AddGeneratedConversionFunc((*DeschedulerPolicy)(nil), (*api.DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha1_DeschedulerPolicy_To_api_DeschedulerPolicy(a.(*DeschedulerPolicy), b.(*api.DeschedulerPolicy), scope)
-	}); err != nil {
-		return err
-	}
-	return nil
-}

pkg/api/v1alpha1/strategymigration.go

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

pkg/api/v1alpha1/strategymigration_test.go

@@ -1,859 +0,0 @@
-/*
-Copyright 2022 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	v1 "k8s.io/api/core/v1"
-	utilpointer "k8s.io/utils/pointer"
-	"sigs.k8s.io/descheduler/pkg/api"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodeaffinity"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint"
-)
-
-func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeTaints(t *testing.T) {
-	strategyName := "RemovePodsViolatingNodeTaints"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				ExcludedTaints: []string{
-					"dedicated=special-user",
-					"reserved",
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodsviolatingnodetaints.PluginName,
-				Args: &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-					ExcludedTaints: []string{"dedicated=special-user", "reserved"},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemoveFailedPods(t *testing.T) {
-	strategyName := "RemoveFailedPods"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				FailedPods: &FailedPods{
-					MinPodLifetimeSeconds:   utilpointer.Uint(3600),
-					ExcludeOwnerKinds:       []string{"Job"},
-					Reasons:                 []string{"NodeAffinity"},
-					IncludingInitContainers: true,
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removefailedpods.PluginName,
-				Args: &removefailedpods.RemoveFailedPodsArgs{
-					ExcludeOwnerKinds:       []string{"Job"},
-					MinPodLifetimeSeconds:   utilpointer.Uint(3600),
-					Reasons:                 []string{"NodeAffinity"},
-					IncludingInitContainers: true,
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeAffinity(t *testing.T) {
-	strategyName := "RemovePodsViolatingNodeAffinity"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				NodeAffinityType:  []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodsviolatingnodeaffinity.PluginName,
-				Args: &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{
-					NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params, not setting nodeaffinity type",
-			params:      &StrategyParameters{},
-			err:         fmt.Errorf("strategy \"%s\" param validation failed: nodeAffinityType needs to be set", strategyName),
-			result:      nil,
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemovePodsViolatingInterPodAntiAffinity(t *testing.T) {
-	strategyName := "RemovePodsViolatingInterPodAntiAffinity"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodsviolatinginterpodantiaffinity.PluginName,
-				Args: &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemovePodsHavingTooManyRestarts(t *testing.T) {
-	strategyName := "RemovePodsHavingTooManyRestarts"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				PodsHavingTooManyRestarts: &PodsHavingTooManyRestarts{
-					PodRestartThreshold:     100,
-					IncludingInitContainers: true,
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodshavingtoomanyrestarts.PluginName,
-				Args: &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
-					PodRestartThreshold:     100,
-					IncludingInitContainers: true,
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params restart threshold",
-			params: &StrategyParameters{
-				PodsHavingTooManyRestarts: &PodsHavingTooManyRestarts{
-					PodRestartThreshold: 0,
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: invalid PodsHavingTooManyRestarts threshold", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
-	strategyName := "PodLifeTime"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				PodLifeTime: &PodLifeTime{
-					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
-					States: []string{
-						"Pending",
-						"PodInitializing",
-					},
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: podlifetime.PluginName,
-				Args: &podlifetime.PodLifeTimeArgs{
-					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
-					States: []string{
-						"Pending",
-						"PodInitializing",
-					},
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				PodLifeTime: &PodLifeTime{
-					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
-				},
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params MaxPodLifeTimeSeconds not set",
-			params: &StrategyParameters{
-				PodLifeTime: &PodLifeTime{},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: MaxPodLifeTimeSeconds not set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemoveDuplicates(t *testing.T) {
-	strategyName := "RemoveDuplicates"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				RemoveDuplicates: &RemoveDuplicates{
-					ExcludeOwnerKinds: []string{"ReplicaSet"},
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removeduplicates.PluginName,
-				Args: &removeduplicates.RemoveDuplicatesArgs{
-					ExcludeOwnerKinds: []string{"ReplicaSet"},
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				PodLifeTime: &PodLifeTime{
-					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
-				},
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsRemovePodsViolatingTopologySpreadConstraint(t *testing.T) {
-	strategyName := "RemovePodsViolatingTopologySpreadConstraint"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				IncludeSoftConstraints: true,
-				ThresholdPriority:      utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-				Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-					Constraints:            []v1.UnsatisfiableConstraintAction{v1.DoNotSchedule, v1.ScheduleAnyway},
-					TopologyBalanceNodeFit: utilpointer.Bool(true),
-					Namespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "params without soft constraints",
-			params: &StrategyParameters{
-				IncludeSoftConstraints: false,
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-				Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-					Constraints:            []v1.UnsatisfiableConstraintAction{v1.DoNotSchedule},
-					TopologyBalanceNodeFit: utilpointer.Bool(true),
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only one of Include/Exclude namespaces can be set", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
-	strategyName := "HighNodeUtilization"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu":    Percentage(20),
-						"memory": Percentage(20),
-						"pods":   Percentage(20),
-					},
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: nodeutilization.HighNodeUtilizationPluginName,
-				Args: &nodeutilization.HighNodeUtilizationArgs{
-					Thresholds: api.ResourceThresholds{
-						"cpu":    api.Percentage(20),
-						"memory": api.Percentage(20),
-						"pods":   api.Percentage(20),
-					},
-					NumberOfNodes: 3,
-					EvictableNamespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu":    Percentage(20),
-						"memory": Percentage(20),
-						"pods":   Percentage(20),
-					},
-				},
-				Namespaces: &Namespaces{
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only Exclude namespaces can be set, inclusion is not supported", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params nil ResourceThresholds",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: no resource threshold is configured", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params out of bounds threshold",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu": Percentage(150),
-					},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: cpu threshold not in [0, 100] range", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}
-
-func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
-	strategyName := "LowNodeUtilization"
-	type testCase struct {
-		description string
-		params      *StrategyParameters
-		err         error
-		result      *api.PluginConfig
-	}
-	testCases := []testCase{
-		{
-			description: "wire in all valid parameters",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu":    Percentage(20),
-						"memory": Percentage(20),
-						"pods":   Percentage(20),
-					},
-					TargetThresholds: ResourceThresholds{
-						"cpu":    Percentage(50),
-						"memory": Percentage(50),
-						"pods":   Percentage(50),
-					},
-					UseDeviationThresholds: true,
-				},
-				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
-					Exclude: []string{"test1"},
-				},
-			},
-			err: nil,
-			result: &api.PluginConfig{
-				Name: nodeutilization.LowNodeUtilizationPluginName,
-				Args: &nodeutilization.LowNodeUtilizationArgs{
-					Thresholds: api.ResourceThresholds{
-						"cpu":    api.Percentage(20),
-						"memory": api.Percentage(20),
-						"pods":   api.Percentage(20),
-					},
-					TargetThresholds: api.ResourceThresholds{
-						"cpu":    api.Percentage(50),
-						"memory": api.Percentage(50),
-						"pods":   api.Percentage(50),
-					},
-					UseDeviationThresholds: true,
-					NumberOfNodes:          3,
-					EvictableNamespaces: &api.Namespaces{
-						Exclude: []string{"test1"},
-					},
-				},
-			},
-		},
-		{
-			description: "invalid params namespaces",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu":    Percentage(20),
-						"memory": Percentage(20),
-						"pods":   Percentage(20),
-					},
-					TargetThresholds: ResourceThresholds{
-						"cpu":    Percentage(50),
-						"memory": Percentage(50),
-						"pods":   Percentage(50),
-					},
-					UseDeviationThresholds: true,
-				},
-				Namespaces: &Namespaces{
-					Include: []string{"test2"},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: only Exclude namespaces can be set, inclusion is not supported", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params nil ResourceThresholds",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: thresholds config is not valid: no resource threshold is configured", strategyName),
-			result: nil,
-		},
-		{
-			description: "invalid params out of bounds threshold",
-			params: &StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
-					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
-						"cpu": Percentage(150),
-					},
-				},
-			},
-			err:    fmt.Errorf("strategy \"%s\" param validation failed: thresholds config is not valid: cpu threshold not in [0, 100] range", strategyName),
-			result: nil,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			var result *api.PluginConfig
-			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
-				result, err = pcFnc(tc.params)
-			}
-			if err != nil {
-				if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s", err.Error())
-				}
-			}
-			if err == nil {
-				// sort to easily compare deepequality
-				diff := cmp.Diff(tc.result, result)
-				if diff != "" {
-					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-				}
-			}
-		})
-	}
-}

pkg/api/v1alpha1/types.go

@@ -1,129 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type DeschedulerPolicy struct {
-	metav1.TypeMeta `json:",inline"`
-
-	// Strategies
-	Strategies StrategyList `json:"strategies,omitempty"`
-
-	// NodeSelector for a set of nodes to operate over
-	NodeSelector *string `json:"nodeSelector,omitempty"`
-
-	// EvictFailedBarePods allows pods without ownerReferences and in failed phase to be evicted.
-	EvictFailedBarePods *bool `json:"evictFailedBarePods,omitempty"`
-
-	// EvictLocalStoragePods allows pods using local storage to be evicted.
-	EvictLocalStoragePods *bool `json:"evictLocalStoragePods,omitempty"`
-
-	// EvictSystemCriticalPods allows eviction of pods of any priority (including Kubernetes system pods)
-	EvictSystemCriticalPods *bool `json:"evictSystemCriticalPods,omitempty"`
-
-	// IgnorePVCPods prevents pods with PVCs from being evicted.
-	IgnorePVCPods *bool `json:"ignorePvcPods,omitempty"`
-
-	// MaxNoOfPodsToEvictPerNode restricts maximum of pods to be evicted per node.
-	MaxNoOfPodsToEvictPerNode *uint `json:"maxNoOfPodsToEvictPerNode,omitempty"`
-
-	// MaxNoOfPodsToEvictPerNamespace restricts maximum of pods to be evicted per namespace.
-	MaxNoOfPodsToEvictPerNamespace *uint `json:"maxNoOfPodsToEvictPerNamespace,omitempty"`
-}
-
-type (
-	StrategyName string
-	StrategyList map[StrategyName]DeschedulerStrategy
-)
-
-type DeschedulerStrategy struct {
-	// Enabled or disabled
-	Enabled bool `json:"enabled,omitempty"`
-
-	// Weight
-	Weight int `json:"weight,omitempty"`
-
-	// Strategy parameters
-	Params *StrategyParameters `json:"params,omitempty"`
-}
-
-// Namespaces carries a list of included/excluded namespaces
-// for which a given strategy is applicable.
-type Namespaces struct {
-	Include []string `json:"include"`
-	Exclude []string `json:"exclude"`
-}
-
-// Besides Namespaces ThresholdPriority and ThresholdPriorityClassName only one of its members may be specified
-type StrategyParameters struct {
-	NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"`
-	NodeAffinityType                  []string                           `json:"nodeAffinityType,omitempty"`
-	PodsHavingTooManyRestarts         *PodsHavingTooManyRestarts         `json:"podsHavingTooManyRestarts,omitempty"`
-	PodLifeTime                       *PodLifeTime                       `json:"podLifeTime,omitempty"`
-	RemoveDuplicates                  *RemoveDuplicates                  `json:"removeDuplicates,omitempty"`
-	FailedPods                        *FailedPods                        `json:"failedPods,omitempty"`
-	IncludeSoftConstraints            bool                               `json:"includeSoftConstraints"`
-	Namespaces                        *Namespaces                        `json:"namespaces"`
-	ThresholdPriority                 *int32                             `json:"thresholdPriority"`
-	ThresholdPriorityClassName        string                             `json:"thresholdPriorityClassName"`
-	LabelSelector                     *metav1.LabelSelector              `json:"labelSelector"`
-	NodeFit                           bool                               `json:"nodeFit"`
-	IncludePreferNoSchedule           bool                               `json:"includePreferNoSchedule"`
-	ExcludedTaints                    []string                           `json:"excludedTaints,omitempty"`
-}
-
-type (
-	Percentage         float64
-	ResourceThresholds map[v1.ResourceName]Percentage
-)
-
-type NodeResourceUtilizationThresholds struct {
-	UseDeviationThresholds bool               `json:"useDeviationThresholds,omitempty"`
-	Thresholds             ResourceThresholds `json:"thresholds,omitempty"`
-	TargetThresholds       ResourceThresholds `json:"targetThresholds,omitempty"`
-	NumberOfNodes          int                `json:"numberOfNodes,omitempty"`
-}
-
-type PodsHavingTooManyRestarts struct {
-	PodRestartThreshold     int32 `json:"podRestartThreshold,omitempty"`
-	IncludingInitContainers bool  `json:"includingInitContainers,omitempty"`
-}
-
-type RemoveDuplicates struct {