Merge pull request #1273 from ingvagabund/CVE-2023-44487-fixes-1.26

[1.26] CVE-2023-44487 fixes

.gitattributes

@@ -1,6 +0,0 @@
-# Always check-out / check-in files with LF line endings.
-* text=auto eol=lf
-
-go.sum merge=union
-**/zz_generated.*.go linguist-generated=true
-vendor/** linguist-vendored

.github/workflows/helm.yaml

@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20.7'
+          go-version: '1.19.3'
 
       - name: Set up chart-testing
         uses: helm/chart-testing-action@v2.2.1
@@ -47,7 +47,7 @@ jobs:
         run: |
           changed=$(ct list-changed --config=.github/ci/ct.yaml)
           if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "::set-output name=changed::true"
           fi
 
       - name: Run chart-testing (lint)
@@ -60,3 +60,10 @@ jobs:
       # helm-extra-set-args only available after ct 3.6.0
       - name: Run chart-testing (install)
         run: ct install --config=.github/ci/ct.yaml --helm-extra-set-args='--set=kind=Deployment'
+
+      - name: E2E after chart install
+        env:
+          KUBERNETES_VERSION: "v1.26.0"
+          KIND_E2E: true
+          SKIP_INSTALL: true
+        run: make test-e2e

.github/workflows/manifests.yaml

@@ -1,38 +0,0 @@
-name: manifests
-
-on:
-  pull_request:
-
-jobs:
-  deploy:
-    strategy: 
-      matrix:
-        k8s-version: ["v1.28.0"]
-        descheduler-version: ["v0.28.1"]
-        descheduler-api: ["v1alpha1", "v1alpha2"]
-        manifest: ["deployment"]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
-        with:
-          node_image: kindest/node:${{ matrix.k8s-version }}
-          kubectl_version: ${{ matrix.k8s-version }}
-          config: test/kind-config.yaml
-      - name: Build image
-        run: |
-          VERSION="dev" make dev-image
-          docker tag descheduler:dev registry.k8s.io/descheduler/descheduler:${{ matrix.descheduler-version }}
-      - name: Kind load image
-        run: |
-          kind load docker-image registry.k8s.io/descheduler/descheduler:${{ matrix.descheduler-version }} --name chart-testing
-      - name: Create k8s manifests
-        run: |
-          kubectl create -f kubernetes/base/rbac.yaml
-          kubectl create -f test/manifests/${{ matrix.descheduler-api }}/configmap.yaml
-          kubectl create -f kubernetes/${{ matrix.manifest }}/${{ matrix.manifest }}.yaml
-      - name: Wait for ready condition
-        run: |
-          kubectl wait --for=condition=Available --timeout=60s ${{ matrix.manifest }} descheduler -n kube-system

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@v1
         with:
-          version: v3.7.0
+          version: v3.4.0
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.1.0

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  timeout: 2m
+  deadline: 2m
 
 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

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.19.3
 
 WORKDIR /go/src/sigs.k8s.io/descheduler
 COPY . .

Makefile

@@ -26,7 +26,7 @@ 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.49.0
 HAS_GOLANGCI := $(shell ls _output/bin/golangci-lint 2> /dev/null)
 
 GOFUMPT_VERSION := v0.4.0
@@ -43,10 +43,6 @@ IMAGE:=descheduler:$(VERSION)
 # IMAGE_GCLOUD is the image name of descheduler in the remote registry
 IMAGE_GCLOUD:=$(REGISTRY)/descheduler:$(VERSION)
 
-# CURRENT_DIR is the current dir where the Makefile exists
-CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-
-
 # TODO: upload binaries to GCS bucket
 #
 # In the future binaries can be uploaded to
@@ -104,7 +100,7 @@ clean:
 	rm -rf _output
 	rm -rf _tmp
 
-verify: verify-govet verify-spelling verify-gofmt verify-vendor lint lint-chart verify-gen
+verify: verify-govet verify-spelling verify-gofmt verify-vendor lint lint-chart verify-toc verify-gen
 
 verify-govet:
 	./hack/verify-govet.sh
@@ -118,8 +114,8 @@ verify-gofmt:
 verify-vendor:
 	./hack/verify-vendor.sh
 
-verify-docs:
+verify-toc:
-	./hack/verify-docs.sh
+	./hack/verify-toc.sh
 
 test-unit:
 	./test/run-unit-tests.sh
@@ -131,16 +127,12 @@ gen:
 	./hack/update-generated-conversions.sh
 	./hack/update-generated-deep-copies.sh
 	./hack/update-generated-defaulters.sh
-	./hack/update-docs.sh
+	./hack/update-toc.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
 
 verify-gen:
 	./hack/verify-conversions.sh
 	./hack/verify-deep-copies.sh
 	./hack/verify-defaulters.sh
-	./hack/verify-docs.sh
 
 lint:
 ifndef HAS_GOLANGCI

OWNERS

@@ -3,7 +3,6 @@ approvers:
 - ingvagabund
 - seanmalloy
 - a7i
-- knelasevero
 reviewers:
 - damemi
 - seanmalloy
@@ -12,7 +11,6 @@ reviewers:
 - a7i
 - janeliul
 - knelasevero
-- jklaw90
 emeritus_approvers:
 - aveshagarwal
 - k82cn

README.md

@@ -1,10 +1,6 @@
 [![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/descheduler)](https://goreportcard.com/report/sigs.k8s.io/descheduler)
 ![Release Charts](https://github.com/kubernetes-sigs/descheduler/workflows/Release%20Charts/badge.svg)
 
-<p align="left">
-	↖️ Click at the [bullet list icon] at the top left corner of the Readme visualization for the github generated table of contents.
-</p>
-
 <p align="center">
     <img src="assets/logo/descheduler-stacked-color.png" width="40%" align="center" alt="descheduler">
 </p>
@@ -30,24 +26,43 @@ Descheduler, based on its policy, finds pods that can be moved and evicts them.
 note, in current implementation, descheduler does not schedule replacement of evicted pods
 but relies on the default scheduler for that.
 
-## ⚠️  Documentation Versions by Release
+Table of Contents
-
+=================
-If you are using a published release of Descheduler (such as
+<!-- toc -->
-`registry.k8s.io/descheduler/descheduler:v0.26.1`), follow the documentation in
+- [Quick Start](#quick-start)
-that version's release branch, as listed below:
+  - [Run As A Job](#run-as-a-job)
-
+  - [Run As A CronJob](#run-as-a-cronjob)
-|Descheduler Version|Docs link|
+  - [Run As A Deployment](#run-as-a-deployment)
-|---|---|
+  - [Install Using Helm](#install-using-helm)
-|v0.28.x|[`release-1.28`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.28/README.md)|
+  - [Install Using Kustomize](#install-using-kustomize)
-|v0.27.x|[`release-1.27`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.27/README.md)|
+- [User Guide](#user-guide)
-|v0.26.x|[`release-1.26`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.26/README.md)|
+- [Policy and Strategies](#policy-and-strategies)
-|v0.25.x|[`release-1.25`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.25/README.md)|
+  - [RemoveDuplicates](#removeduplicates)
-|v0.24.x|[`release-1.24`](https://github.com/kubernetes-sigs/descheduler/blob/release-1.24/README.md)|
+  - [LowNodeUtilization](#lownodeutilization)
-
+  - [HighNodeUtilization](#highnodeutilization)
-The
+  - [RemovePodsViolatingInterPodAntiAffinity](#removepodsviolatinginterpodantiaffinity)
-[`master`](https://github.com/kubernetes-sigs/descheduler/blob/master/README.md)
+  - [RemovePodsViolatingNodeAffinity](#removepodsviolatingnodeaffinity)
-branch is considered in-development and the information presented in it may not
+  - [RemovePodsViolatingNodeTaints](#removepodsviolatingnodetaints)
-work for previous versions.
+  - [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
 
@@ -111,75 +126,37 @@ kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?re
 
 See the [user guide](docs/user-guide.md) in the `/docs` directory.
 
-## Policy, Default Evictor and Strategy plugins
+## Policy and Strategies
 
-**⚠️ 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) ⚠️**
+Descheduler's policy is configurable and includes strategies that can be enabled or disabled. By default, all strategies are enabled.
 
-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.
+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 |
 
-### Top Level configuration
+As part of the policy, the parameters associated with each strategy can be configured.
-
+See each strategy for details on available parameters.
-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) |
-
-### 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))|
-
-### Example policy
-
-As part of the policy, you will start deciding which top level configuration to use, then which Evictor plugin to use (if you have your own, the Default Evictor if not), followed by deciding the configuration passed to the Evictor Plugin. By default, the Default Evictor is enabled for both `filter` and `preEvictionFilter` extension points.  After that you will enable/disable eviction strategies plugins and configure them properly.
-
-See each strategy plugin section for details on available parameters.
 
 **Policy:**
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-nodeSelector: "node=node1" # you don't need to set this, if not set all will be processed
+nodeSelector: prod=dev
-maxNoOfPodsToEvictPerNode: 5000 # you don't need to set this, unlimited if not set
+evictFailedBarePods: false
-maxNoOfPodsToEvictPerNamespace: 5000 # you don't need to set this, unlimited if not set
+evictLocalStoragePods: true
-profiles:
+evictSystemCriticalPods: true
-  - name: ProfileName
+maxNoOfPodsToEvictPerNode: 40
-    pluginConfig:
+ignorePvcPods: false
-    - name: "DefaultEvictor"
+strategies:
-      args:
+  ...
-        evictSystemCriticalPods: true
-        evictFailedBarePods: true
-        evictLocalStoragePods: true
-        nodeFit: true
-    plugins:
-      # DefaultEvictor is enabled for both `filter` and `preEvictionFilter`
-      # filter:
-      #   enabled:
-      #     - "DefaultEvictor"
-      # preEvictionFilter:
-      #   enabled:
-      #     - "DefaultEvictor"
-      deschedule:
-        enabled:
-          - ...
-      balance:
-        enabled:
-          - ...
-      [...]
 ```
 
 The following diagram provides a visualization of most of the strategies to help
@@ -187,29 +164,9 @@ categorize how strategies fit together.
 
 ![Strategies diagram](strategies_diagram.png)
 
-The following sections provide an overview of the different strategy plugins available. These plugins are grouped based on their implementation of extension points: Deschedule or Balance.
-
-Deschedule Plugins: These plugins process pods one by one, and evict them in a sequential manner.
-
-Balance Plugins: These plugins process all pods, or groups of pods, and determine which pods to evict based on how the group was intended to be spread.
-
-|Name|Extension Point Implemented|Description|
-|----|-----------|-----------|
-| [RemoveDuplicates](#removeduplicates) |Balance|Spreads replicas|
-| [LowNodeUtilization](#lownodeutilization) |Balance|Spreads pods according to pods resource requests and node resources available|
-| [HighNodeUtilization](#highnodeutilization) |Balance|Spreads pods according to pods resource requests and node resources available|
-| [RemovePodsViolatingInterPodAntiAffinity](#removepodsviolatinginterpodantiaffinity) |Deschedule|Evicts pods violating pod anti affinity|
-| [RemovePodsViolatingNodeAffinity](#removepodsviolatingnodeaffinity) |Deschedule|Evicts pods violating node affinity|
-| [RemovePodsViolatingNodeTaints](#removepodsviolatingnodetaints) |Deschedule|Evicts pods violating node taints|
-| [RemovePodsViolatingTopologySpreadConstraint](#removepodsviolatingtopologyspreadconstraint) |Balance|Evicts pods violating TopologySpreadConstraints|
-| [RemovePodsHavingTooManyRestarts](#removepodshavingtoomanyrestarts) |Deschedule|Evicts pods having too many restarts|
-| [PodLifeTime](#podlifetime) |Deschedule|Evicts pods that have exceeded a specified age limit|
-| [RemoveFailedPods](#removefailedpods) |Deschedule|Evicts pods with certain failed reasons|
-
-
 ### RemoveDuplicates
 
-This strategy plugin makes sure that there is only one pod associated with a ReplicaSet (RS),
+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
@@ -227,22 +184,21 @@ should include `ReplicaSet` to have pods created by Deployments excluded.
 |---|---|
 |`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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemoveDuplicates":
-    pluginConfig:
+     enabled: true
-    - name: "RemoveDuplicates"
+     params:
-      args:
+       removeDuplicates:
-        excludeOwnerKinds:
+         excludeOwnerKinds:
-          - "ReplicaSet"
+         - "ReplicaSet"
-    plugins:
-      balance:
-        enabled:
-          - "RemoveDuplicates"
 ```
 
 ### LowNodeUtilization
@@ -284,34 +240,33 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 
 |Name|Type|
 |---|---|
-|`useDeviationThresholds`|bool|
 |`thresholds`|map(string:int)|
 |`targetThresholds`|map(string:int)|
 |`numberOfNodes`|int|
-|`evictableNamespaces`|(see [namespace filtering](#namespace-filtering))|
+|`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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "LowNodeUtilization":
-    pluginConfig:
+     enabled: true
-    - name: "LowNodeUtilization"
+     params:
-      args:
+       nodeResourceUtilizationThresholds:
-        thresholds:
+         thresholds:
-          "cpu" : 20
+           "cpu" : 20
-          "memory": 20
+           "memory": 20
-          "pods": 20
+           "pods": 20
-        targetThresholds:
+         targetThresholds:
-          "cpu" : 50
+           "cpu" : 50
-          "memory": 50
+           "memory": 50
-          "pods": 50
+           "pods": 50
-    plugins:
-      balance:
-        enabled:
-          - "LowNodeUtilization"
 ```
 
 Policy should pass the following validation checks:
@@ -336,8 +291,6 @@ 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`.
 
-> Note: On GKE, it is not possible to customize the default scheduler config. Instead, you can use the [`optimze-utilization` autoscaling strategy](https://cloud.google.com/kubernetes-engine/docs/concepts/cluster-autoscaler#:~:text=The%20optimize%2Dutilization%20autoscaling%20profile,custom%20scheduler%20are%20not%20affected), which has the same effect as enabling the `MostAllocated` scheduler plugin. Alternatively, you can deploy a second custom scheduler and edit that scheduler's config yourself.
-
 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).
@@ -364,30 +317,25 @@ actual usage metrics. Implementing metrics-based descheduling is currently TODO
 |---|---|
 |`thresholds`|map(string:int)|
 |`numberOfNodes`|int|
-|`evictableNamespaces`|(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))|
+|`Namespaces`|(see [namespace filtering](#namespace-filtering))|
 
 **Example:**
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "HighNodeUtilization":
-    pluginConfig:
+     enabled: true
-    - name: "HighNodeUtilization"
+     params:
-      args:
+       nodeResourceUtilizationThresholds:
-        thresholds:
+         thresholds:
-          "cpu" : 20
+           "cpu" : 20
-          "memory": 20
+           "memory": 20
-          "pods": 20
+           "pods": 20
-        evictableNamespaces:
-          exclude:
-          - "kube-system"
-          - "namespace1"
-    plugins:
-      balance:
-        enabled:
-          - "HighNodeUtilization"
 ```
 
 Policy should pass the following validation checks:
@@ -413,22 +361,20 @@ node.
 
 |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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingInterPodAntiAffinity":
-    pluginConfig:
+     enabled: true
-    - name: "RemovePodsViolatingInterPodAntiAffinity"
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsViolatingInterPodAntiAffinity"
 ```
 
 ### RemovePodsViolatingNodeAffinity
@@ -436,10 +382,7 @@ profiles:
 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` and/or
+`requiredDuringSchedulingIgnoredDuringExecution` type, which tells the scheduler
-`preferredDuringSchedulingIgnoredDuringExecution`.
-
-The `requiredDuringSchedulingIgnoredDuringExecution` type 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
@@ -452,38 +395,28 @@ 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.
 
-The `preferredDuringSchedulingIgnoredDuringExecution` type tells the scheduler
-to respect node affinity when scheduling if that's possible. If not, the pod
-gets scheduled anyway. It may happen that, over time, the state of the cluster
-changes and now the pod can be scheduled on a node that actually fits its
-preferred node affinity. When enabled, the strategy serves as a temporary
-implementation of `preferredDuringSchedulingPreferredDuringExecution`, so the
-pod will be evicted if it can be scheduled on a "better" node.
-
 **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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingNodeAffinity":
-    pluginConfig:
+    enabled: true
-    - name: "RemovePodsViolatingNodeAffinity"
+    params:
-      args:
+      nodeAffinityType:
-        nodeAffinityType:
+      - "requiredDuringSchedulingIgnoredDuringExecution"
-        - "requiredDuringSchedulingIgnoredDuringExecution"
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsViolatingNodeAffinity"
 ```
 
 ### RemovePodsViolatingNodeTaints
@@ -504,27 +437,24 @@ excludedTaints entry "dedicated=special-user" would match taints with key "dedic
 |Name|Type|
 |---|---|
 |`excludedTaints`|list(string)|
-|`includePreferNoSchedule`|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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingNodeTaints":
-    pluginConfig:
+    enabled: true
-    - name: "RemovePodsViolatingNodeTaints"
+    params:
-      args:
+      excludedTaints:
-        excludedTaints:
+      - dedicated=special-user # exclude taints with key "dedicated" and value "special-user"
-        - dedicated=special-user # exclude taints with key "dedicated" and value "special-user"
+      - reserved # exclude all taints with key "reserved"
-        - reserved # exclude all taints with key "reserved"
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsViolatingNodeTaints"
 ````
 
 ### RemovePodsViolatingTopologySpreadConstraint
@@ -533,58 +463,32 @@ This strategy makes sure that pods violating [topology spread constraints](https
 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 includes hard constraints, you can explicitly set `constraints` as shown below to include both:
+By default, this strategy only deals with hard constraints, setting parameter `includeSoftConstraints` to `true` will
-```yaml
+include soft constraints.
-constraints:
-- DoNotSchedule
-- ScheduleAnyway
-```
-
-The `topologyBalanceNodeFit` arg is used when balancing topology domains while the Default Evictor's `nodeFit` is used in pre-eviction to determine if a pod can be evicted.
-```yaml
-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|
 |---|---|
+|`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))|
-|`constraints`|(see [whenUnsatisfiable](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#topologyspreadconstraint-v1-core))||
+|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
-|`topologyBalanceNodeFit`|bool|default `true`. [node fit filtering](#node-fit-filtering) when balancing topology domains|
 
 **Example:**
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingTopologySpreadConstraint":
-    pluginConfig:
+     enabled: true
-    - name: "RemovePodsViolatingTopologySpreadConstraint"
+     params:
-      args:
+       includeSoftConstraints: false
-        constraints:
-          - DoNotSchedule
-    plugins:
-      balance:
-        enabled:
-          - "RemovePodsViolatingTopologySpreadConstraint"
 ```
 
 
@@ -596,39 +500,30 @@ include `podRestartThreshold`, which is the number of restarts (summed over all
 should be evicted, and `includingInitContainers`, which determines whether init container restarts should be factored
 into that calculation.
 
-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`
-- [Container State Waiting](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-waiting) of: `CrashLoopBackOff`
-
-If a value for `states` or `podStatusPhases` is not specified,
-Pods in any state (even `Running`) are considered for eviction.
-
 **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))|
-|`states`|list(string)|Only supported in v0.28+|
+|`nodeFit`|bool (see [node fit filtering](#node-fit-filtering))|
 
 **Example:**
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsHavingTooManyRestarts":
-    pluginConfig:
+     enabled: true
-    - name: "RemovePodsHavingTooManyRestarts"
+     params:
-      args:
+       podsHavingTooManyRestarts:
-        podRestartThreshold: 100
+         podRestartThreshold: 100
-        includingInitContainers: true
+         includingInitContainers: true
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"
 ```
 
 ### PodLifeTime
@@ -647,28 +542,27 @@ Pods in any state (even `Running`) are considered for eviction.
 |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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+     enabled: true
-    - name: "PodLifeTime"
+     params:
-      args:
+       podLifeTime:
-        maxPodLifeTimeSeconds: 86400
+         maxPodLifeTimeSeconds: 86400
-        states:
+         states:
-        - "Pending"
+         - "Pending"
-        - "PodInitializing"
+         - "PodInitializing"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
 ### RemoveFailedPods
@@ -688,29 +582,28 @@ has any of these `Kind`s listed as an `OwnerRef`, that pod will not be considere
 |`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/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemoveFailedPods":
-    pluginConfig:
+     enabled: true
-    - name: "RemoveFailedPods"
+     params:
-      args:
+       failedPods:
-        reasons:
+         reasons:
-        - "NodeAffinity"
+         - "NodeAffinity"
-        includingInitContainers: true
+         includingInitContainers: true
-        excludeOwnerKinds:
+         excludeOwnerKinds:
-        - "Job"
+         - "Job"
-        minPodLifetimeSeconds: 3600
+         minPodLifetimeSeconds: 3600
-    plugins:
-      deschedule:
-        enabled:
-          - "RemoveFailedPods"
 ```
 
 ## Filter Pods
@@ -726,52 +619,41 @@ The following strategies accept a `namespaces` parameter which allows to specify
 * `RemoveDuplicates`
 * `RemovePodsViolatingTopologySpreadConstraint`
 * `RemoveFailedPods`
-
-
-The following strategies accept a `evictableNamespaces` parameter which allows to specify a list of excluding namespaces:
 * `LowNodeUtilization` and `HighNodeUtilization` (Only filtered right before eviction)
 
-For example with PodLifeTime:
+For example:
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+     enabled: true
-    - name: "PodLifeTime"
+     params:
-      args:
+        podLifeTime:
-        maxPodLifeTimeSeconds: 86400
+          maxPodLifeTimeSeconds: 86400
         namespaces:
           include:
           - "namespace1"
           - "namespace2"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
-In the example `PodLifeTime` gets executed only over `namespace1` and `namespace2`.
+In the examples `PodLifeTime` gets executed only over `namespace1` and `namespace2`.
 The similar holds for `exclude` field:
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+     enabled: true
-    - name: "PodLifeTime"
+     params:
-      args:
+        podLifeTime:
-        maxPodLifeTimeSeconds: 86400
+          maxPodLifeTimeSeconds: 86400
         namespaces:
           exclude:
           - "namespace1"
           - "namespace2"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
 The strategy gets executed over all namespaces but `namespace1` and `namespace2`.
@@ -780,56 +662,42 @@ It's not allowed to compute `include` with `exclude` field.
 
 ### Priority filtering
 
-Priority threshold can be configured via the Default Evictor Filter, and, only pods under the threshold can be evicted. You can
+All strategies are able to configure a priority threshold, only pods under the threshold can be evicted. You can
-specify this threshold by setting `priorityThreshold.name`(setting the threshold to the value of the given
+specify this threshold by setting `thresholdPriorityClassName`(setting the threshold to the value of the given
-priority class) or `priorityThreshold.value`(directly setting the threshold) parameters. By default, this threshold
+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 `priorityThreshold value`
+Setting `thresholdPriority`
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+     enabled: true
-    - name: "DefaultEvictor"
+     params:
-      args:
+        podLifeTime:
-        priorityThreshold:
+          maxPodLifeTimeSeconds: 86400
-          value: 10000
+        thresholdPriority: 10000
-    - name: "PodLifeTime"
-      args:
-        maxPodLifeTimeSeconds: 86400
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
-Setting `Priority Threshold Class Name (priorityThreshold.name)`
+Setting `thresholdPriorityClassName`
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+     enabled: true
-    - name: "DefaultEvictor"
+     params:
-      args:
+        podLifeTime:
-        priorityThreshold:
+          maxPodLifeTimeSeconds: 86400
-          name: "priorityClassName1"
+        thresholdPriorityClassName: "priorityclass1"
-    - name: "PodLifeTime"
-      args:
-        maxPodLifeTimeSeconds: 86400
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
-Note that you can't configure both `priorityThreshold.name` and `priorityThreshold.value`, if the given priority class
+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
@@ -850,30 +718,37 @@ This allows running strategies among pods the descheduler is interested in.
 For example:
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+    enabled: true
-    - name: "PodLifeTime"
+    params:
-      args:
+      podLifeTime:
         maxPodLifeTimeSeconds: 86400
-        labelSelector:
+      labelSelector:
-          matchLabels:
+        matchLabels:
-            component: redis
+          component: redis
-          matchExpressions:
+        matchExpressions:
-            - {key: tier, operator: In, values: [cache]}
+          - {key: tier, operator: In, values: [cache]}
-            - {key: environment, operator: NotIn, values: [dev]}
+          - {key: environment, operator: NotIn, values: [dev]}
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
 
 ### Node Fit filtering
 
- NodeFit can be configured via the Default Evictor Filter. 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`:
+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
@@ -883,21 +758,22 @@ profiles:
 E.g.
 
 ```yaml
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "LowNodeUtilization":
-    pluginConfig:
+    enabled: true
-    - name: "DefaultEvictor"
+    params:
-      args:
+      nodeFit: true
-        nodeFit: true
+      nodeResourceUtilizationThresholds:
-    - name: "PodLifeTime"
+        thresholds:
-      args:
+          "cpu": 20
-        maxPodLifeTimeSeconds: 86400
+          "memory": 20
-    plugins:
+          "pods": 20
-      deschedule:
+        targetThresholds:
-        enabled:
+          "cpu": 50
-          - "PodLifeTime"
+          "memory": 50
+          "pods": 50
 ```
 
 Note that node fit filtering references the current pod spec, and not that of it's owner.
@@ -972,7 +848,6 @@ packages that it is compiled with.
 
 | Descheduler | Supported Kubernetes Version |
 |-------------|------------------------------|
-| v0.27       | v1.27                        |
 | v0.26       | v1.26                        |
 | v0.25       | v1.25                        |
 | v0.24       | v1.24                        |

charts/descheduler/Chart.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 name: descheduler
-version: 0.28.1
+version: 0.26.1
-appVersion: 0.28.1
+appVersion: 0.26.1
 description: Descheduler for Kubernetes is used to rebalance clusters by evicting pods that can potentially be scheduled on better nodes. In the current implementation, descheduler does not schedule replacement of evicted pods but relies on the default scheduler for that.
 keywords:
 - kubernetes
 - descheduler
 - kube-scheduler
 home: https://github.com/kubernetes-sigs/descheduler
-icon: https://raw.githubusercontent.com/kubernetes-sigs/descheduler/master/assets/logo/descheduler-stacked-color.png
+icon: https://kubernetes.io/images/favicon.png
 sources:
 - https://github.com/kubernetes-sigs/descheduler
 maintainers:

charts/descheduler/README.md

@@ -55,7 +55,6 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `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`                                     |
@@ -76,7 +75,6 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `service.enabled`                   | If `true`, create a service for deployment                                                                            | `false`                                   |
 | `serviceMonitor.enabled`            | If `true`, create a ServiceMonitor for deployment                                                                     | `false`                                   |
 | `serviceMonitor.namespace`          | The namespace where Prometheus expects to find service monitors                                                       | `nil`                                     |
-| `serviceMonitor.additionalLabels`   | Add custom labels to the ServiceMonitor resource                                                                      | `{}`                                      |
 | `serviceMonitor.interval`           | The scrape interval. If not set, the Prometheus default scrape interval is used                                       | `nil`                                     |
 | `serviceMonitor.honorLabels`        | Keeps the scraped data's labels when labels are on collisions with target labels.                                     | `true`                                    |
 | `serviceMonitor.insecureSkipVerify` | Skip TLS certificate validation when scraping                                                                         | `true`                                    |

charts/descheduler/templates/configmap.yaml

@@ -7,6 +7,6 @@ metadata:
     {{- include "descheduler.labels" . | nindent 4 }}
 data:
   policy.yaml: |
-    apiVersion: "{{ .Values.deschedulerPolicyAPIVersion }}"
+    apiVersion: "descheduler/v1alpha1"
     kind: "DeschedulerPolicy"
 {{ toYaml .Values.deschedulerPolicy | trim | indent 4 }}

charts/descheduler/templates/cronjob.yaml

@@ -21,9 +21,6 @@ spec:
   {{- if .Values.failedJobsHistoryLimit }}
   failedJobsHistoryLimit: {{ .Values.failedJobsHistoryLimit }}
   {{- end }}
-  {{- if .Values.timeZone }}
-  timeZone: {{ .Values.timeZone }}
-  {{- end }}
   jobTemplate:
     spec:
       {{- if .Values.ttlSecondsAfterFinished }}
@@ -51,10 +48,6 @@ spec:
           affinity:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- if .Values.dnsConfig }}
-          dnsConfig:
-            {{- .Values.dnsConfig | toYaml | nindent 12 }}
-          {{- end }}
           {{- with .Values.tolerations }}
           tolerations:
             {{- toYaml . | nindent 12 }}
@@ -73,18 +66,28 @@ spec:
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
               imagePullPolicy: {{ .Values.image.pullPolicy }}
               command:
-                {{- toYaml .Values.command | nindent 16 }}
+                - "/bin/descheduler"
               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 }}
+                - {{ printf "--%s" $key | quote }}
+                {{- if $value }}
+                - {{ $value | quote }}
+                {{- end }}
                 {{- end }}
               livenessProbe:
                 {{- toYaml .Values.livenessProbe | nindent 16 }}
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
               securityContext:
-                {{- toYaml .Values.securityContext | nindent 16 }}
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop:
+                    - ALL
+                privileged: false
+                readOnlyRootFilesystem: true
+                runAsNonRoot: true
               volumeMounts:
                 - mountPath: /policy-dir
                   name: policy-volume

charts/descheduler/templates/deployment.yaml

@@ -31,29 +31,30 @@ 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" . }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      {{- toYaml . | nindent 6 }}
+      {{- toYaml . | nindent 10 }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-            {{- toYaml .Values.command | nindent 12 }}
+            - "/bin/descheduler"
           args:
-            - --policy-config-file=/policy-dir/policy.yaml
+            - "--policy-config-file"
-            - --descheduling-interval={{ required "deschedulingInterval required for running as Deployment" .Values.deschedulingInterval }}
+            - "/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 }}
+            - {{ printf "--%s" $key | quote }}
+            {{- if $value }}
+            - {{ $value | quote }}
+            {{- end }}
             {{- end }}
             {{- include "descheduler.leaderElection" . | nindent 12 }}
           ports:
@@ -64,7 +65,13 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            privileged: false
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
           volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume

charts/descheduler/templates/servicemonitor.yaml

@@ -7,9 +7,6 @@ metadata:
   namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
   labels:
     {{- include "descheduler.labels" . | nindent 4 }}
-    {{- if .Values.serviceMonitor.additionalLabels }}
-    {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
-    {{- end }}
 spec:
   jobLabel: jobLabel
   namespaceSelector:

charts/descheduler/values.yaml

@@ -22,16 +22,6 @@ resources:
   #   cpu: 100m
   #   memory: 128Mi
 
-securityContext:
-  allowPrivilegeEscalation: false
-  capabilities:
-    drop:
-      - ALL
-  privileged: false
-  readOnlyRootFilesystem: true
-  runAsNonRoot: true
-  runAsUser: 1000
-
 nameOverride: ""
 fullnameOverride: ""
 
@@ -45,7 +35,6 @@ suspend: false
 # successfulJobsHistoryLimit: 3
 # failedJobsHistoryLimit: 1
 # ttlSecondsAfterFinished 600
-# timeZone: Etc/UTC
 
 # Required when running as a Deployment
 deschedulingInterval: 5m
@@ -68,28 +57,15 @@ leaderElection: {}
 #  resourceName: "descheduler"
 #  resourceNamescape: "kube-system"
 
-command:
-- "/bin/descheduler"
-
 cmdOptions:
   v: 3
 
-# Recommended to use the latest Policy API version supported by the Descheduler app version
-deschedulerPolicyAPIVersion: "descheduler/v1alpha1"
-
 deschedulerPolicy:
   # nodeSelector: "key1=value1,key2=value2"
   # maxNoOfPodsToEvictPerNode: 10
   # maxNoOfPodsToEvictPerNamespace: 10
   # ignorePvcPods: true
   # evictLocalStoragePods: true
-  # tracing:
-  #   collectorEndpoint: otel-collector.observability.svc.cluster.local:4317
-  #   transportCert: ""
-  #   serviceName: ""
-  #   serviceNamespace: ""
-  #   sampleRate: 1.0
-  #   fallbackToNoOpProviderOnError: true
   strategies:
     RemoveDuplicates:
       enabled: true
@@ -172,8 +148,6 @@ podAnnotations: {}
 
 podLabels: {}
 
-dnsConfig: {}
-
 livenessProbe:
   failureThreshold: 3
   httpGet:
@@ -190,9 +164,6 @@ serviceMonitor:
   enabled: false
   # The namespace where Prometheus expects to find service monitors.
   # namespace: ""
-  # Add custom labels to the ServiceMonitor resource
-  additionalLabels: {}
-    # prometheus: kube-prometheus-stack
   interval: ""
   # honorLabels: true
   insecureSkipVerify: true

cmd/descheduler/app/options/options.go

@@ -29,7 +29,6 @@ import (
 	"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/tracing"
 )
 
 const (
@@ -76,9 +75,7 @@ func newDefaultComponentConfig() (*componentconfig.DeschedulerConfiguration, err
 		},
 	}
 	deschedulerscheme.Scheme.Default(&versionedCfg)
-	cfg := componentconfig.DeschedulerConfiguration{
+	cfg := componentconfig.DeschedulerConfiguration{}
-		Tracing: componentconfig.TracingConfiguration{},
-	}
 	if err := deschedulerscheme.Scheme.Convert(&versionedCfg, &cfg, nil); err != nil {
 		return nil, err
 	}
@@ -87,20 +84,12 @@ 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.KubeconfigFile, "kubeconfig", rs.KubeconfigFile, "File with  kube configuration.")
-	fs.StringVar(&rs.ClientConnection.Kubeconfig, "client-connection-kubeconfig", rs.ClientConnection.Kubeconfig, "File path to kube configuration for interacting with kubernetes apiserver.")
-	fs.Float32Var(&rs.ClientConnection.QPS, "client-connection-qps", rs.ClientConnection.QPS, "QPS to use for interacting with kubernetes apiserver.")
-	fs.Int32Var(&rs.ClientConnection.Burst, "client-connection-burst", rs.ClientConnection.Burst, "Burst to use for interacting with kubernetes apiserver.")
 	fs.StringVar(&rs.PolicyConfigFile, "policy-config-file", rs.PolicyConfigFile, "File with descheduler policy configuration.")
-	fs.BoolVar(&rs.DryRun, "dry-run", rs.DryRun, "Execute descheduler in dry run mode.")
+	fs.BoolVar(&rs.DryRun, "dry-run", rs.DryRun, "execute descheduler in dry run mode.")
 	fs.BoolVar(&rs.DisableMetrics, "disable-metrics", rs.DisableMetrics, "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.")
-	fs.StringVar(&rs.Tracing.CollectorEndpoint, "otel-collector-endpoint", "", "Set this flag to the OpenTelemetry Collector Service Address")
-	fs.StringVar(&rs.Tracing.TransportCert, "otel-transport-ca-cert", "", "Path of the CA Cert that can be used to generate the client Certificate for establishing secure connection to the OTEL in gRPC mode")
-	fs.StringVar(&rs.Tracing.ServiceName, "otel-service-name", tracing.DefaultServiceName, "OTEL Trace name to be used with the resources")
-	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")
 
 	componentbaseoptions.BindLeaderElectionFlags(&rs.LeaderElection, fs)

cmd/descheduler/app/server.go

@@ -20,6 +20,7 @@ package app
 import (
 	"context"
 	"io"
+	"os"
 	"os/signal"
 	"syscall"
 
@@ -27,18 +28,14 @@ import (
 
 	"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/mux"
 	restclient "k8s.io/client-go/rest"
-	"k8s.io/component-base/featuregate"
+	registry "k8s.io/component-base/logs/api/v1"
-	"k8s.io/component-base/logs"
+	jsonLog "k8s.io/component-base/logs/json"
-	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"
@@ -51,31 +48,39 @@ 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",
+		Long:  `The descheduler evicts pods which may be bound to less desired nodes`,
-		PreRunE: func(cmd *cobra.Command, args []string) error {
+		Run: func(cmd *cobra.Command, args []string) {
-			logs.InitLogs()
+			// s.Logs.Config.Format = s.Logging.Format
-			if logsapi.ValidateAndApply(logConfig, featureGate); err != nil {
+
-				return err
+			// LoopbackClientConfig is a config for a privileged loopback connection
-			}
+			var LoopbackClientConfig *restclient.Config
-			descheduler.SetupPlugins()
+			var SecureServing *apiserver.SecureServingInfo
-			return nil
+			if err := s.SecureServing.ApplyTo(&SecureServing, &LoopbackClientConfig); err != nil {
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			// loopbackClientConfig is a config for a privileged loopback connection
-			var loopbackClientConfig *restclient.Config
-			var secureServing *apiserver.SecureServingInfo
-			if err := s.SecureServing.ApplyTo(&secureServing, &loopbackClientConfig); err != nil {
 				klog.ErrorS(err, "failed to apply secure server configuration")
-				return err
+				return
 			}
 
-			secureServing.DisableHTTP2 = !s.EnableHTTP2
+			SecureServing.DisableHTTP2 = !s.EnableHTTP2
+
+			var factory registry.LogFormatFactory
+
+			if s.Logging.Format == "json" {
+				factory = jsonLog.Factory{}
+			}
+
+			if factory == nil {
+				klog.ClearLogger()
+			} else {
+				log, logrFlush := factory.Create(registry.LoggingConfiguration{
+					Format:    s.Logging.Format,
+					Verbosity: s.Logging.Verbosity,
+				})
+				defer logrFlush()
+				klog.SetLogger(log)
+			}
 
 			ctx, done := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 
@@ -86,42 +91,33 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command {
 
 			healthz.InstallHandler(pathRecorderMux, healthz.NamedCheck("Descheduler", healthz.PingHealthz.Check))
 
-			stoppedCh, _, err := secureServing.Serve(pathRecorderMux, 0, ctx.Done())
+			stoppedCh, _, err := SecureServing.Serve(pathRecorderMux, 0, ctx.Done())
 			if err != nil {
 				klog.Fatalf("failed to start secure server: %v", err)
-				return err
+				return
 			}
 
-			if err = Run(ctx, s); err != nil {
+			err = Run(ctx, s)
+			if err != nil {
 				klog.ErrorS(err, "descheduler server")
-				return err
 			}
 
 			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
-	}
-	defer tracing.Shutdown(ctx)
-	// increase the fake watch channel so the dry-run mode can be run
-	// over a cluster with thousands of pods
-	watch.DefaultChanSize = 100000
 	return descheduler.Run(ctx, rs)
 }
+
+func SetupLogs() {
+	klog.SetOutput(os.Stdout)
+	klog.InitFlags(nil)
+}

cmd/descheduler/descheduler.go

@@ -21,8 +21,14 @@ 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

@@ -1,63 +0,0 @@
-## descheduler
-
-descheduler
-
-### Synopsis
-
-The descheduler evicts pods which may be bound to less desired nodes
-
-```
-descheduler [flags]
-```
-
-### Options
-
-```
-      --bind-address ip                          The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces and IP address families will be used. (default 0.0.0.0)
-      --cert-dir string                          The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "apiserver.local.config/certificates")
-      --client-connection-burst int32            Burst to use for interacting with kubernetes apiserver.
-      --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-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
-  -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-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)
-      --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.
-      --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)
-      --otel-service-name string                 OTEL Trace name to be used with the resources (default "descheduler")
-      --otel-trace-namespace string              OTEL Trace namespace to be used with the resources
-      --otel-transport-ca-cert string            Path of the CA Cert that can be used to generate the client Certificate for establishing secure connection to the OTEL in gRPC mode
-      --permit-address-sharing                   If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false]
-      --permit-port-sharing                      If true, SO_REUSEPORT will be used when binding the port, which allows more than one instance to bind on the same address and port. [default=false]
-      --policy-config-file string                File with descheduler policy configuration.
-      --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.
-      --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
-
-* [descheduler version](descheduler_version.md)	 - Version of descheduler
-

docs/cli/descheduler_version.md

@@ -1,22 +0,0 @@
-## descheduler version
-
-Version of descheduler
-
-### Synopsis
-
-Prints the version of descheduler.
-
-```
-descheduler version [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for version
-```
-
-### SEE ALSO
-
-* [descheduler](descheduler.md)	 - descheduler
-

docs/contributor-guide.md

@@ -20,7 +20,7 @@ make
 
 Run descheduler.
 ```sh
-./_output/bin/descheduler --client-connection-kubeconfig <path to kubeconfig> --policy-config-file <path-to-policy-file> --v 1
+./_output/bin/descheduler --kubeconfig <path to kubeconfig> --policy-config-file <path-to-policy-file> --v 1
 ```
 
 View all CLI options.

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.1' | kubectl apply -f -
-```
-
-Run As A CronJob
-```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/cronjob?ref=v0.28.1' | kubectl apply -f -
-```
-
-Run As A Deployment
-```
-kustomize build 'github.com/kubernetes-sigs/descheduler/kubernetes/deployment?ref=v0.28.1' | 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/user-guide.md

@@ -4,10 +4,6 @@ Starting with descheduler release v0.10.0 container images are available in the
 
 Descheduler Version | Container Image                                 | Architectures           |
 ------------------- |-------------------------------------------------|-------------------------|
-v0.28.1             | registry.k8s.io/descheduler/descheduler:v0.28.1 | AMD64<br>ARM64<br>ARMv7 |
-v0.28.0             | registry.k8s.io/descheduler/descheduler:v0.28.0 | AMD64<br>ARM64<br>ARMv7 |
-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 |
@@ -35,7 +31,65 @@ kind load docker-image registry.k8s.io/descheduler/descheduler:v0.20.0
 The [examples](https://github.com/kubernetes-sigs/descheduler/tree/master/examples) directory has descheduler policy configuration examples.
 
 ## CLI Options
-The descheduler has many CLI options that can be used to override its default behavior. Please check the [CLI Options](./cli/descheduler.md) documentation for details
+The descheduler has many CLI options that can be used to override its default behavior.
+```
+descheduler --help
+The descheduler evicts pods which may be bound to less desired nodes
+
+Usage:
+  descheduler [flags]
+  descheduler [command]
+
+Available Commands:
+  completion  generate the autocompletion script for the specified shell
+  help        Help about any command
+  version     Version of descheduler
+
+Flags:
+      --add-dir-header                           If true, adds the file directory to the header of the log messages (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --alsologtostderr                          log to standard error as well as files (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --bind-address ip                          The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank or an unspecified address (0.0.0.0 or ::), all interfaces will be used. (default 0.0.0.0)
+      --cert-dir string                          The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "apiserver.local.config/certificates")
+      --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-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.
+  -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.
+      --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 15s)
+      --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 or equal to the lease duration. This is only applicable if leader election is enabled. (default 10s)
+      --leader-elect-resource-lock string        The type of resource object that is used for locking during leader election. Supported options are 'endpoints', 'configmaps', 'leases', 'endpointsleases' and 'configmapsleases'. (default "leases")
+      --leader-elect-resource-name string        The name of resource object that is used for locking during leader election. (default "descheduler")
+      --leader-elect-resource-namespace string   The namespace of resource object that is used for locking during leader election. (default "kube-system")
+      --leader-elect-retry-period duration       The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s)
+      --log-backtrace-at traceLocation           when logging hits line file:N, emit a stack trace (default :0) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log_dir string                           If non-empty, write log files in this directory (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log_file string                          If non-empty, use this log file (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log_file_max_size uint                   Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --log-flush-frequency duration             Maximum number of seconds between log flushes (default 5s)
+      --logging-format string                    Sets the log format. Permitted formats: "text", "json". Non-default formats don't honor these flags: --add-dir-header, --alsologtostderr, --log-backtrace-at, --log_dir, --log_file, --log_file_max_size, --logtostderr, --skip-headers, --skip-log-headers, --stderrthreshold, --log-flush-frequency.\nNon-default choices are currently alpha and subject to change without warning. (default "text")
+      --logtostderr                              log to standard error instead of files (default true) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --one-output                               If true, only write logs to their native severity level (vs also writing to each lower severity level) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --permit-address-sharing                   If true, SO_REUSEADDR will be used when binding the port. This allows binding to wildcard IPs like 0.0.0.0 and specific IPs in parallel, and it avoids waiting for the kernel to release sockets in TIME_WAIT state. [default=false]
+      --permit-port-sharing                      If true, SO_REUSEPORT will be used when binding the port, which allows more than one instance to bind on the same address and port. [default=false]
+      --policy-config-file string                File with descheduler policy configuration.
+      --secure-port int                          The port on which to serve HTTPS with authentication and authorization. If 0, don't serve HTTPS at all. (default 10258)
+      --skip-headers                             If true, avoid header prefixes in the log messages (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --skip-log-headers                         If true, avoid headers when opening log files (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --stderrthreshold severity                 logs at or above this threshold go to stderr (default 2) (DEPRECATED: will be removed in a future release, see https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components)
+      --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.
+      --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 moduleSpec                       comma-separated list of pattern=N settings for file-filtered logging
+
+Use "descheduler [command] --help" for more information about a command.
+```
 
 ## Production Use Cases
 This section contains descriptions of real world production use cases.
@@ -57,23 +111,19 @@ descheduler -v=3 --evict-local-storage-pods --policy-config-file=pod-life-time.y
 This policy configuration file ensures that pods created more than 7 days ago are evicted.
 ```
 ---
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+    enabled: true
-    - name: "PodLifeTime"
+    params:
-      args:
+      podLifeTime:
-        maxPodLifeTimeSeconds: 604800
+        maxPodLifeTimeSeconds: 604800 # pods run for a maximum of 7 days
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"
 ```
 
 ### Balance Cluster By Node Memory Utilization
 If your cluster has been running for a long period of time, you may find that the resource utilization is not very
-balanced. The following two strategies can be used to rebalance your cluster based on `cpu`, `memory`
+balanced. The following two strategies can be used to rebalance your cluster based on `cpu`, `memory` 
 or `number of pods`.
 
 #### Balance high utilization nodes
@@ -81,21 +131,17 @@ Using `LowNodeUtilization`, descheduler will rebalance the cluster based on memo
 from nodes with memory utilization over 70% to nodes with memory utilization below 20%.
 
 ```
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "LowNodeUtilization":
-    pluginConfig:
+    enabled: true
-    - name: "LowNodeUtilization"
+    params:
-      args:
+      nodeResourceUtilizationThresholds:
         thresholds:
           "memory": 20
         targetThresholds:
           "memory": 70
-    plugins:
-      balance:
-        enabled:
-          - "LowNodeUtilization"
 ```
 
 #### Balance low utilization nodes
@@ -104,19 +150,15 @@ from nodes with memory utilization lower than 20%. This should be use `NodeResou
 The evicted pods will be compacted into minimal set of nodes.
 
 ```
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "HighNodeUtilization":
-    pluginConfig:
+    enabled: true
-    - name: "HighNodeUtilization"
+    params:
-      args:
+      nodeResourceUtilizationThresholds:
         thresholds:
           "memory": 20
-    plugins:
-      balance:
-        enabled:
-          - "HighNodeUtilization"
 ```
 
 ### Autoheal Node Problems

examples/failed-pods.yaml

@@ -1,18 +1,14 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemoveFailedPods":
-    pluginConfig:
+    enabled: true
-    - name: "RemoveFailedPods"
+    params:
-      args:
+      failedPods:
         reasons:
         - "OutOfcpu"
         - "CreateContainerConfigError"
         includingInitContainers: true
         excludeOwnerKinds:
         - "Job"
-        minPodLifetimeSeconds: 3600
+        minPodLifetimeSeconds: 3600 # 1 hour
-    plugins:
-      deschedule:
-        enabled:
-          - "RemoveFailedPods"

examples/high-node-utilization.yml

@@ -1,13 +1,9 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "HighNodeUtilization":
-    pluginConfig:
+    enabled: true
-    - name: "HighNodeUtilization"
+    params:
-      args:
+      nodeResourceUtilizationThresholds:
         thresholds:
           "memory": 20
-    plugins:
-      balance:
-        enabled:
-          - "HighNodeUtilization"

examples/low-node-utilization.yml

@@ -1,15 +1,11 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "LowNodeUtilization":
-    pluginConfig:
+    enabled: true
-    - name: "LowNodeUtilization"
+    params:
-      args:
+      nodeResourceUtilizationThresholds:
         thresholds:
           "memory": 20
         targetThresholds:
           "memory": 70
-    plugins:
-      balance:
-        enabled:
-          - "LowNodeUtilization"

examples/node-affinity.yml

@@ -1,13 +1,8 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingNodeAffinity":
-    pluginConfig:
+    enabled: true
-    - name: "RemovePodsViolatingNodeAffinity"
+    params:
-      args:
+      nodeAffinityType:
-        nodeAffinityType:
+      - "requiredDuringSchedulingIgnoredDuringExecution"
-        - "requiredDuringSchedulingIgnoredDuringExecution"
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsViolatingNodeAffinity"

examples/pod-life-time.yml

@@ -1,15 +1,11 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "PodLifeTime":
-    pluginConfig:
+    enabled: true
-    - name: "PodLifeTime"
+    params:
-      args:
+      podLifeTime:
         maxPodLifeTimeSeconds: 604800 # 7 days
         states:
         - "Pending"
         - "PodInitializing"
-    plugins:
-      deschedule:
-        enabled:
-          - "PodLifeTime"

examples/policy.yaml

@@ -1,36 +1,29 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemoveDuplicates":
-    pluginConfig:
+     enabled: true
-    - name: "RemoveDuplicates"
+  "RemovePodsViolatingInterPodAntiAffinity":
-    - name: "RemovePodsViolatingInterPodAntiAffinity"
+     enabled: true
-    - name: "LowNodeUtilization"
+  "LowNodeUtilization":
-      args:
+     enabled: true
-        thresholds:
+     params:
-          "cpu" : 20
+       nodeResourceUtilizationThresholds:
-          "memory": 20
+         thresholds:
-          "pods": 20
+           "cpu" : 20
-        targetThresholds:
+           "memory": 20
-          "cpu" : 50
+           "pods": 20
-          "memory": 50
+         targetThresholds:
-          "pods": 50
+           "cpu" : 50
-    - name: "RemovePodsHavingTooManyRestarts"
+           "memory": 50
-      args:
+           "pods": 50
-        podRestartThreshold: 100
+  "RemovePodsHavingTooManyRestarts":
-        includingInitContainers: true
+     enabled: true
-    - name: "RemovePodsViolatingTopologySpreadConstraint"
+     params:
-      args:
+       podsHavingTooManyRestarts:
-        constraints:
+         podRestartThreshold: 100
-          - DoNotSchedule
+         includingInitContainers: true
-          - ScheduleAnyway
+  "RemovePodsViolatingTopologySpreadConstraint":
-    plugins:
+     enabled: true
-      deschedule:
+     params:
-        enabled:
+       includeSoftConstraints: true
-          - "RemovePodsViolatingInterPodAntiAffinity"
-          - "RemovePodsHavingTooManyRestarts"
-      balance:
-        enabled:
-          - "RemoveDuplicates"
-          - "LowNodeUtilization"
-          - "RemovePodsViolatingTopologySpreadConstraint"

examples/too-many-restarts.yml

@@ -1,15 +0,0 @@
-apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "RemovePodsHavingTooManyRestarts"
-      args:
-        podRestartThreshold: 100
-        includingInitContainers: true
-        states:
-        - CrashLoopBackOff
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"

examples/topology-spread-constraint.yaml

@@ -1,14 +1,8 @@
-apiVersion: "descheduler/v1alpha2"
+apiVersion: "descheduler/v1alpha1"
 kind: "DeschedulerPolicy"
-profiles:
+strategies:
-  - name: ProfileName
+  "RemovePodsViolatingTopologySpreadConstraint":
-    pluginConfig:
+     enabled: true
-    - name: "RemovePodsViolatingTopologySpreadConstraint"
+     params:
-      args:
+       nodeFit: true
-        constraints:
+       includeSoftConstraints: true # Include 'ScheduleAnyways' constraints
-          - DoNotSchedule
-          - ScheduleAnyway
-    plugins:
-      balance:
-        enabled:
-          - "RemovePodsViolatingTopologySpreadConstraint"

go.mod

@@ -1,117 +1,110 @@
 module sigs.k8s.io/descheduler
 
-go 1.20
+go 1.19
 
 require (
 	github.com/client9/misspell v0.3.4
-	github.com/google/go-cmp v0.6.0
+	github.com/google/go-cmp v0.5.9
-	github.com/spf13/cobra v1.8.0
+	github.com/spf13/cobra v1.6.0
 	github.com/spf13/pflag v1.0.5
-	go.opentelemetry.io/otel v1.21.0
+	k8s.io/api v0.26.10
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
+	k8s.io/apimachinery v0.26.10
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
+	k8s.io/apiserver v0.26.10
-	go.opentelemetry.io/otel/sdk v1.21.0
+	k8s.io/client-go v0.26.10
-	go.opentelemetry.io/otel/trace v1.21.0
+	k8s.io/code-generator v0.26.10
-	google.golang.org/grpc v1.59.0
+	k8s.io/component-base v0.26.10
-	k8s.io/api v0.28.4
+	k8s.io/component-helpers v0.26.10
-	k8s.io/apimachinery v0.28.4
+	k8s.io/klog/v2 v2.80.1
-	k8s.io/apiserver v0.28.4
+	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
-	k8s.io/client-go v0.28.4
+	sigs.k8s.io/mdtoc v1.0.1
-	k8s.io/code-generator v0.28.4
-	k8s.io/component-base v0.28.4
-	k8s.io/component-helpers v0.28.4
-	k8s.io/klog/v2 v2.110.1
-	k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf
-	sigs.k8s.io/mdtoc v1.1.0
 )
 
 require (
 	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/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.3 // 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/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 // indirect
-	github.com/google/cel-go v0.16.1 // indirect
+	github.com/google/cel-go v0.12.7 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
 	github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/procfs v0.8.0 // 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/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel v1.10.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
+	go.opentelemetry.io/otel/metric v0.31.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.10.0 // indirect
+	go.opentelemetry.io/otel/trace v1.10.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/oauth2 v0.11.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.6.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-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.49.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kms v0.28.4 // indirect
+	k8s.io/kms v0.26.10 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
-
-replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1

go.sum

@@ -1,330 +1,765 @@
-cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.97.0 h1:3DXvAyifywvq64LfkKaMOmkWPS1CikIQdMe2lY9vxU8=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
-github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
+github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
-github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
 github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
 github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
+github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
+github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 h1:oKYOfNR7Hp6XpZ4JqolL5u642Js5Z0n7psPVl+S5heo=
+github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 h1:LP/6EfrZ/LyCc+SXvANDrIJ4sP9u2NAtqyv6QknetNQ=
-github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/cel-go v0.16.1 h1:3hZfSNiAU3KOiNtxuFXVp5WFy4hf/Ly3Sa4/7F8SXNo=
+github.com/google/cel-go v0.12.7 h1:jM6p55R0MKBg79hZjn1zs2OlrywZ1Vk00rxVvad1/O0=
-github.com/google/cel-go v0.16.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
+github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
-github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
+github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mmarkdown/mmark v2.0.40+incompatible h1:vMeUeDzBK3H+/mU0oMVfMuhSXJlIA+DE/DMPQNAj5C4=
 github.com/mmarkdown/mmark v2.0.40+incompatible/go.mod h1:Uvmoz7tvsWpr7bMVxIpqZPyN3FbOtzDmnsJDFp7ltJs=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
+github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
+github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
-go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k=
+go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE=
+go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4=
+go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8=
-go.etcd.io/etcd/client/v2 v2.305.9 h1:YZ2OLi0OvR0H75AcgSUajjd5uqKDKocQUqROTG11jIo=
+go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ=
-go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E=
+go.etcd.io/etcd/client/v2 v2.305.5 h1:DktRP60//JJpnPC0VBymAN/7V71GHMdjDCBt4ZPXDjI=
-go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA=
+go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI=
-go.etcd.io/etcd/pkg/v3 v3.5.9 h1:6R2jg/aWd/zB9+9JxmijDKStGJAPFsX3e6BeJkMi6eQ=
+go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c=
-go.etcd.io/etcd/raft/v3 v3.5.9 h1:ZZ1GIHoUlHsn0QVqiRysAm3/81Xx7+i2d7nSdWxlOiI=
+go.etcd.io/etcd/pkg/v3 v3.5.5 h1:Ablg7T7OkR+AeeeU32kdVhw/AGDsitkKPl7aW73ssjU=
-go.etcd.io/etcd/server/v3 v3.5.9 h1:vomEmmxeztLtS5OEH7d0hBAg4cjVIu9wXuNzUZx2ZA0=
+go.etcd.io/etcd/raft/v3 v3.5.5 h1:Ibz6XyZ60OYyRopu73lLM/P+qco3YtlZMOhnXNS051I=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.etcd.io/etcd/server/v3 v3.5.5 h1:jNjYm/9s+f9A9r6+SC4RvNaz6AqixpOvhrFdT0PvIj0=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 h1:sxoY9kG1s1WpSYNyzm24rlwH4lnRYFXUVVBmKMBfRgw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c=
-go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ=
-go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 h1:TaB+1rQhddO1sF71MpZOZAuSPW1klK2M8XxfrBMfK7Y=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY=
-go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 h1:pDDYmo0QadUPal5fwXoY1pmMpFcdyhXOmL5drCrI3vU=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0/go.mod h1:Krqnjl22jUJ0HgMzw5eveuCvFDXY4nSYb4F8t5gdrag=
-go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 h1:KtiUEhQmj/Pa874bVYKGNVdq8NPKiacPbaRRtgXi+t4=
-go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0/go.mod h1:OfUCyyIiDvNXHWpcWgbF+MWvqPZiNa3YDEnivcnYsV0=
+go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
+go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
+go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY=
+go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE=
+go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E=
+go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
+go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE=
 go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apiserver v0.28.4 h1:BJXlaQbAU/RXYX2lRz+E1oPe3G3TKlozMMCZWu5GMgg=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/apiserver v0.28.4/go.mod h1:Idq71oXugKZoVGUUL2wgBCTHbUR+FYTWa4rq9j4n23w=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/client-go v0.28.4 h1:Np5ocjlZcTrkyRJ3+T3PkXDpe4UpatQxj85+xjaD2wY=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4=
+k8s.io/api v0.26.10 h1:skTnrDR0r8dg4MMLf6YZIzugxNM0BjFsWKPkNc5kOvk=
-k8s.io/code-generator v0.28.4 h1:tcOSNIZQvuAvXhOwpbuJkKbAABJQeyCcQBCN/3uI18c=
+k8s.io/api v0.26.10/go.mod h1:ou/H3yviqrHtP/DSPVTfsc7qNfmU06OhajytJfYXkXw=
-k8s.io/code-generator v0.28.4/go.mod h1:OQAfl6bZikQ/tK6faJ18Vyzo54rUII2NmjurHyiN1g4=
+k8s.io/apimachinery v0.26.10 h1:aE+J2KIbjctFqPp3Y0q4Wh2PD+l1p2g3Zp4UYjSvtGU=
-k8s.io/component-base v0.28.4 h1:c/iQLWPdUgI90O+T9TeECg8o7N3YJTiuz2sKxILYcYo=
+k8s.io/apimachinery v0.26.10/go.mod h1:iT1ZP4JBP34wwM+ZQ8ByPEQ81u043iqAcsJYftX9amM=
-k8s.io/component-base v0.28.4/go.mod h1:m9hR0uvqXDybiGL2nf/3Lf0MerAfQXzkfWhUY58JUbU=
+k8s.io/apiserver v0.26.10 h1:gradpIHygzZN87yK+o6V3gpbCSF78HZ0hejLZQQwdDs=
-k8s.io/component-helpers v0.28.4 h1:+X9VXT5+jUsRdC26JyMZ8Fjfln7mSjgumafocE509C4=
+k8s.io/apiserver v0.26.10/go.mod h1:TGrQKQWUfQcotK3P4TtoVZxXOWklFF36QZlA5wufLs4=
-k8s.io/component-helpers v0.28.4/go.mod h1:8LzMalOQ0K10tkBJWBWq8h0HTI9HDPx4WT3QvTFn9Ro=
+k8s.io/client-go v0.26.10 h1:4mDzl+1IrfRxh4Ro0s65JRGJp14w77gSMUTjACYWVRo=
+k8s.io/client-go v0.26.10/go.mod h1:sh74ig838gCckU4ElYclWb24lTesPdEDPnlyg5vcbkA=
+k8s.io/code-generator v0.26.10 h1:YHyiMDqabyW+S4s6WglcfsUJMl5GlpNPoFEwrS7/tIY=
+k8s.io/code-generator v0.26.10/go.mod h1:+IHzChHYqL6v5M5KVRglocWMzdSzH3I2jRXZK05yZ9I=
+k8s.io/component-base v0.26.10 h1:vl3Gfe5aC09mNxfnQtTng7u3rnBVrShOK3MAkqEleb0=
+k8s.io/component-base v0.26.10/go.mod h1:/IDdENUHG5uGxqcofZajovYXE9KSPzJ4yQbkYQt7oN0=
+k8s.io/component-helpers v0.26.10 h1:KEwLNxzTE65R2kNz4UZ26h1G9O8xd6+iXVz7jkLgEYc=
+k8s.io/component-helpers v0.26.10/go.mod h1:HYtL0UXL9zrYuuAmweYvHX/iQ0d0MURnvTOL3emC/r0=
 k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
 k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
+k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
-k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
+k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kms v0.28.4 h1:PMgY/3CQTWP9eIKmNQiTgjLIZ0ns6O+voagzD2/4mSg=
+k8s.io/kms v0.26.10 h1:QFkYcCEonlYSZy6iUpZqSn9itsPwXbNgndkM4uAtgOk=
-k8s.io/kms v0.28.4/go.mod h1:HL4/lR/bhjAJPbqycKtfhWiKh1Sp21cpHOL8P4oo87w=
+k8s.io/kms v0.26.10/go.mod h1:3ZF23khJJAVfmT2K2kyiQN/kbqKpu2+ogecg9zY7Efk=
-k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf h1:iTzha1p7Fi83476ypNSz8nV9iR9932jIIs26F7gNLsU=
+k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
-k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 h1:fAPTNEpzQMOLMGwOHNbUkR2xXTQwMJOZYNx+/mLlOh0=
-sigs.k8s.io/mdtoc v1.1.0 h1:q3YtqYzmC2e0hgLXRIOm7/QLuPux1CX3ZHCwlbABxZo=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37/go.mod h1:vfnxT4FXNT8eGvO+xi/DsyC/qHmdujqwrUa1WSspCsk=
-sigs.k8s.io/mdtoc v1.1.0/go.mod h1:QZLVEdHH2iNIR4uHAZyvFRtjloHgVItk8lo/mzCtq3w=
+sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
+sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/mdtoc v1.0.1 h1:6ECKhQnbetwZBR6R2IeT2LH+1w+2Zsip0iXjikgaXIk=
+sigs.k8s.io/mdtoc v1.0.1/go.mod h1:COYBtOjsaCg7o7SC4eaLwEXPuVRSuiVuLLRrHd7kShw=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

hack/cherry_pick_pull.sh

@@ -1,257 +0,0 @@
-#!/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/doc-gen/main.go

@@ -1,20 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	"github.com/spf13/cobra/doc"
-	"sigs.k8s.io/descheduler/cmd/descheduler/app"
-)
-
-var docGenPath = "docs/cli"
-
-func main() {
-	cmd := app.NewDeschedulerCommand(os.Stdout)
-	cmd.AddCommand(app.NewVersionCommand())
-	cmd.DisableAutoGenTag = true // Disable this so that the diff wont track it
-	if err := doc.GenMarkdownTree(cmd, docGenPath); err != nil {
-		log.Fatal(err)
-	}
-}

hack/kind_config.yaml

@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-featureGates:
-  # beta as of 1.27 but we currently run e2e on 1.26
-  # this flag should be removed as part of Descheduler 0.29 release
-  MatchLabelKeysInPodTopologySpread: true
 nodes:
 - role: control-plane
 - role: worker

hack/update-gofmt.sh

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

hack/update-toc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2023 The Kubernetes Authors.
+# Copyright 2021 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-go run ${SCRIPT_DIR}/doc-gen
+go build -o "${OS_OUTPUT_BINPATH}/mdtoc" "sigs.k8s.io/mdtoc"
+
+${OS_OUTPUT_BINPATH}/mdtoc --inplace README.md

hack/verify-gofmt.sh

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

hack/verify-toc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2023 The Kubernetes Authors.
+# Copyright 2021 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,18 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
-temp_dir=$(mktemp -d)
+go build -o "${OS_OUTPUT_BINPATH}/mdtoc" "sigs.k8s.io/mdtoc"
 
-go run -ldflags "-X main.docGenPath=${temp_dir}" ${SCRIPT_DIR}/doc-gen
+if ! ${OS_OUTPUT_BINPATH}/mdtoc --inplace --dryrun README.md
-
+then
-if ! _out="$(diff -Naupr ${SCRIPT_DIR}/../docs/cli "${temp_dir}")"; then
+  echo "ERROR: Changes detected to table of contents. Run ./hack/update-toc.sh" >&2
-    echo "Generated output differs:" >&2
+  exit 1
-    echo "${_out}" >&2
-    echo "Generated conversions verify failed. Please run ./hack/update-docs.sh"
-    rm -rf ${temp_dir}
-    exit 1
 fi
-
-rm -rf ${temp_dir}

kubernetes/base/configmap.yaml

@@ -6,29 +6,23 @@ metadata:
   namespace: kube-system
 data:
   policy.yaml: |
-    apiVersion: "descheduler/v1alpha2"
+    apiVersion: "descheduler/v1alpha1"
     kind: "DeschedulerPolicy"
-    profiles:
+    strategies:
-      - name: ProfileName
+      "RemoveDuplicates":
-        pluginConfig:
+         enabled: true
-        - name: "DefaultEvictor"
+      "RemovePodsViolatingInterPodAntiAffinity":
-        - name: "RemovePodsViolatingInterPodAntiAffinity"
+         enabled: true
-        - name: "RemoveDuplicates"
+      "LowNodeUtilization":
-        - name: "LowNodeUtilization"
+         enabled: true
-          args:
+         params:
-            thresholds:
+           nodeResourceUtilizationThresholds:
-              "cpu" : 20
+             thresholds:
-              "memory": 20
+               "cpu" : 20
-              "pods": 20
+               "memory": 20
-            targetThresholds:
+               "pods": 20
-              "cpu" : 50
+             targetThresholds:
-              "memory": 50
+               "cpu" : 50
-              "pods": 50
+               "memory": 50
-        plugins:
+               "pods": 50
-          balance:
+
-            enabled:
-              - "LowNodeUtilization"
-              - "RemoveDuplicates"
-          deschedule:
-            enabled:
-              - "RemovePodsViolatingInterPodAntiAffinity"

kubernetes/cronjob/cronjob.yaml

@@ -16,7 +16,7 @@ spec:
           priorityClassName: system-cluster-critical
           containers:
           - name: descheduler
-            image: registry.k8s.io/descheduler/descheduler:v0.28.1
+            image: registry.k8s.io/descheduler/descheduler:v0.26.1
             volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume

kubernetes/deployment/deployment.yaml

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

kubernetes/job/job.yaml

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

metrics/metrics.go

@@ -48,29 +48,9 @@ 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,
-			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,
-			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"})
-
 	metricsList = []metrics.Registerable{
 		PodsEvicted,
 		buildInfo,
-		DeschedulerLoopDuration,
-		DeschedulerStrategyDuration,
 	}
 )
 

pkg/api/conversion.go

@@ -1,17 +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 api

pkg/api/sort.go

@@ -15,7 +15,7 @@ package api
 
 import "sort"
 
-func SortDeschedulerProfileByName(profiles []DeschedulerProfile) []DeschedulerProfile {
+func SortProfilesByName(profiles []Profile) []Profile {
 	sort.Slice(profiles, func(i, j int) bool {
 		return profiles[i].Name < profiles[j].Name
 	})

pkg/api/types.go

@@ -28,7 +28,7 @@ type DeschedulerPolicy struct {
 	metav1.TypeMeta
 
 	// Profiles
-	Profiles []DeschedulerProfile
+	Profiles []Profile
 
 	// NodeSelector for a set of nodes to operate over
 	NodeSelector *string
@@ -43,8 +43,8 @@ type DeschedulerPolicy struct {
 // Namespaces carries a list of included/excluded namespaces
 // for which a given strategy is applicable
 type Namespaces struct {
-	Include []string `json:"include"`
+	Include []string
-	Exclude []string `json:"exclude"`
+	Exclude []string
 }
 
 type (
@@ -53,11 +53,11 @@ type (
 )
 
 type PriorityThreshold struct {
-	Value *int32 `json:"value"`
+	Value *int32
-	Name  string `json:"name"`
+	Name  string
 }
 
-type DeschedulerProfile struct {
+type Profile struct {
 	Name          string
 	PluginConfigs []PluginConfig
 	Plugins       Plugins
@@ -73,6 +73,7 @@ type Plugins struct {
 	Sort              PluginSet
 	Deschedule        PluginSet
 	Balance           PluginSet
+	Evict             PluginSet
 	Filter            PluginSet
 	PreEvictionFilter PluginSet
 }

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/register.go

@@ -50,7 +50,7 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addKnownTypes, addDefaultingFuncs, RegisterConversions)
+	localSchemeBuilder.Register(addKnownTypes, addDefaultingFuncs)
 }
 
 func addKnownTypes(scheme *runtime.Scheme) error {

pkg/api/v1alpha2/conversion.go

@@ -1,136 +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 v1alpha2
-
-import (
-	"fmt"
-	"sync"
-
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	api "sigs.k8s.io/descheduler/pkg/api"
-
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
-)
-
-var (
-	// pluginArgConversionScheme is a scheme with internal and v1alpha2 registered,
-	// used for defaulting/converting typed PluginConfig Args.
-	// Access via getPluginArgConversionScheme()
-	pluginArgConversionScheme     *runtime.Scheme
-	initPluginArgConversionScheme sync.Once
-
-	Scheme = runtime.NewScheme()
-	Codecs = serializer.NewCodecFactory(Scheme, serializer.EnableStrict)
-)
-
-func GetPluginArgConversionScheme() *runtime.Scheme {
-	initPluginArgConversionScheme.Do(func() {
-		// set up the scheme used for plugin arg conversion
-		pluginArgConversionScheme = runtime.NewScheme()
-		utilruntime.Must(AddToScheme(pluginArgConversionScheme))
-		utilruntime.Must(api.AddToScheme(pluginArgConversionScheme))
-	})
-	return pluginArgConversionScheme
-}
-
-func Convert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
-	if err := autoConvert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in, out, s); err != nil {
-		return err
-	}
-	return convertToInternalPluginConfigArgs(out)
-}
-
-// convertToInternalPluginConfigArgs converts PluginConfig#Args into internal
-// types using a scheme, after applying defaults.
-func convertToInternalPluginConfigArgs(out *api.DeschedulerPolicy) error {
-	scheme := GetPluginArgConversionScheme()
-	for i := range out.Profiles {
-		prof := &out.Profiles[i]
-		for j := range prof.PluginConfigs {
-			args := prof.PluginConfigs[j].Args
-			if args == nil {
-				continue
-			}
-			if _, isUnknown := args.(*runtime.Unknown); isUnknown {
-				continue
-			}
-			internalArgs, err := scheme.ConvertToVersion(args, api.SchemeGroupVersion)
-			if err != nil {
-				err = nil
-				internalArgs = args
-				if err != nil {
-					return fmt.Errorf("converting .Profiles[%d].PluginConfigs[%d].Args into internal type: %w", i, j, err)
-				}
-			}
-			prof.PluginConfigs[j].Args = internalArgs
-		}
-	}
-	return nil
-}
-
-func Convert_v1alpha2_PluginConfig_To_api_PluginConfig(in *PluginConfig, out *api.PluginConfig, s conversion.Scope) error {
-	out.Name = in.Name
-	if _, ok := pluginregistry.PluginRegistry[in.Name]; ok {
-		out.Args = pluginregistry.PluginRegistry[in.Name].PluginArgInstance.DeepCopyObject()
-		if in.Args.Raw != nil {
-			_, _, err := Codecs.UniversalDecoder().Decode(in.Args.Raw, nil, out.Args)
-			if err != nil {
-				return err
-			}
-		} else if in.Args.Object != nil {
-			out.Args = in.Args.Object
-		}
-	} else {
-		if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Args, &out.Args, s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Convert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in *api.DeschedulerPolicy, out *DeschedulerPolicy, s conversion.Scope) error {
-	if err := autoConvert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in, out, s); err != nil {
-		return err
-	}
-	return convertToExternalPluginConfigArgs(out)
-}
-
-// convertToExternalPluginConfigArgs converts PluginConfig#Args into
-// external (versioned) types using a scheme.
-func convertToExternalPluginConfigArgs(out *DeschedulerPolicy) error {
-	scheme := GetPluginArgConversionScheme()
-	for i := range out.Profiles {
-		for j := range out.Profiles[i].PluginConfigs {
-			args := out.Profiles[i].PluginConfigs[j].Args
-			if args.Object == nil {
-				continue
-			}
-			if _, isUnknown := args.Object.(*runtime.Unknown); isUnknown {
-				continue
-			}
-			externalArgs, err := scheme.ConvertToVersion(args.Object, SchemeGroupVersion)
-			if err != nil {
-				return err
-			}
-			out.Profiles[i].PluginConfigs[j].Args.Object = externalArgs
-		}
-	}
-	return nil
-}

pkg/api/v1alpha2/defaults.go

@@ -1,23 +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 v1alpha2
-
-import "k8s.io/apimachinery/pkg/runtime"
-
-func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return RegisterDefaults(scheme)
-}

pkg/api/v1alpha2/doc.go

@@ -1,24 +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.
-*/
-
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=sigs.k8s.io/descheduler/pkg/api
-// +k8s:defaulter-gen=TypeMeta
-
-// Package v1alpha2 is the v1alpha2 version of the descheduler API
-// +groupName=descheduler
-
-package v1alpha2 // import "sigs.k8s.io/descheduler/pkg/api/v1alpha2"

pkg/api/v1alpha2/register.go

@@ -1,63 +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 v1alpha2
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-var (
-	SchemeBuilder      = runtime.NewSchemeBuilder(addKnownTypes)
-	localSchemeBuilder = &SchemeBuilder
-	AddToScheme        = SchemeBuilder.AddToScheme
-)
-
-// GroupName is the group name used in this package
-const (
-	GroupName    = "descheduler"
-	GroupVersion = "v1alpha2"
-)
-
-// SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion}
-
-// Kind takes an unqualified kind and returns a Group qualified GroupKind
-func Kind(kind string) schema.GroupKind {
-	return SchemeGroupVersion.WithKind(kind).GroupKind()
-}
-
-// Resource takes an unqualified resource and returns a Group qualified GroupResource
-func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
-}
-
-func init() {
-	// We only register manually written functions here. The registration of the
-	// generated functions takes place in the generated files. The separation
-	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addKnownTypes, addDefaultingFuncs)
-}
-
-func addKnownTypes(scheme *runtime.Scheme) error {
-	// TODO this will get cleaned up with the scheme types are fixed
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&DeschedulerPolicy{},
-	)
-
-	return nil
-}

pkg/api/v1alpha2/sort.go

@@ -1,26 +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 v1alpha2
-
-import "sort"
-
-func SortDeschedulerProfileByName(profiles []DeschedulerProfile) []DeschedulerProfile {
-	sort.Slice(profiles, func(i, j int) bool {
-		return profiles[i].Name < profiles[j].Name
-	})
-	return profiles
-}

pkg/api/v1alpha2/types.go

@@ -1,65 +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 v1alpha2
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-)
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type DeschedulerPolicy struct {
-	metav1.TypeMeta `json:",inline"`
-
-	// Profiles
-	Profiles []DeschedulerProfile `json:"profiles,omitempty"`
-
-	// NodeSelector for a set of nodes to operate over
-	NodeSelector *string `json:"nodeSelector,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 DeschedulerProfile struct {
-	Name          string         `json:"name"`
-	PluginConfigs []PluginConfig `json:"pluginConfig"`
-	Plugins       Plugins        `json:"plugins"`
-}
-
-type Plugins struct {
-	PreSort           PluginSet `json:"presort"`
-	Sort              PluginSet `json:"sort"`
-	Deschedule        PluginSet `json:"deschedule"`
-	Balance           PluginSet `json:"balance"`
-	Filter            PluginSet `json:"filter"`
-	PreEvictionFilter PluginSet `json:"preevictionfilter"`
-}
-
-type PluginConfig struct {
-	Name string               `json:"name"`
-	Args runtime.RawExtension `json:"args"`
-}
-
-type PluginSet struct {
-	Enabled  []string `json:"enabled"`
-	Disabled []string `json:"disabled"`
-}

pkg/api/v1alpha2/zz_generated.conversion.go

@@ -1,271 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-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.
-*/
-
-// Code generated by conversion-gen. DO NOT EDIT.
-
-package v1alpha2
-
-import (
-	unsafe "unsafe"
-
-	conversion "k8s.io/apimachinery/pkg/conversion"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-	api "sigs.k8s.io/descheduler/pkg/api"
-)
-
-func init() {
-	localSchemeBuilder.Register(RegisterConversions)
-}
-
-// RegisterConversions adds conversion functions to the given scheme.
-// Public to allow building arbitrary schemes.
-func RegisterConversions(s *runtime.Scheme) error {
-	if err := s.AddGeneratedConversionFunc((*DeschedulerProfile)(nil), (*api.DeschedulerProfile)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(a.(*DeschedulerProfile), b.(*api.DeschedulerProfile), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.DeschedulerProfile)(nil), (*DeschedulerProfile)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(a.(*api.DeschedulerProfile), b.(*DeschedulerProfile), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.PluginConfig)(nil), (*PluginConfig)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_PluginConfig_To_v1alpha2_PluginConfig(a.(*api.PluginConfig), b.(*PluginConfig), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*PluginSet)(nil), (*api.PluginSet)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_PluginSet_To_api_PluginSet(a.(*PluginSet), b.(*api.PluginSet), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.PluginSet)(nil), (*PluginSet)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_PluginSet_To_v1alpha2_PluginSet(a.(*api.PluginSet), b.(*PluginSet), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*Plugins)(nil), (*api.Plugins)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_Plugins_To_api_Plugins(a.(*Plugins), b.(*api.Plugins), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*api.Plugins)(nil), (*Plugins)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_Plugins_To_v1alpha2_Plugins(a.(*api.Plugins), b.(*Plugins), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddConversionFunc((*api.DeschedulerPolicy)(nil), (*DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(a.(*api.DeschedulerPolicy), b.(*DeschedulerPolicy), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddConversionFunc((*DeschedulerPolicy)(nil), (*api.DeschedulerPolicy)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(a.(*DeschedulerPolicy), b.(*api.DeschedulerPolicy), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddConversionFunc((*PluginConfig)(nil), (*api.PluginConfig)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha2_PluginConfig_To_api_PluginConfig(a.(*PluginConfig), b.(*api.PluginConfig), scope)
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-func autoConvert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
-	if in.Profiles != nil {
-		in, out := &in.Profiles, &out.Profiles
-		*out = make([]api.DeschedulerProfile, len(*in))
-		for i := range *in {
-			if err := Convert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(&(*in)[i], &(*out)[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Profiles = nil
-	}
-	out.NodeSelector = (*string)(unsafe.Pointer(in.NodeSelector))
-	out.MaxNoOfPodsToEvictPerNode = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNode))
-	out.MaxNoOfPodsToEvictPerNamespace = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNamespace))
-	return nil
-}
-
-func autoConvert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in *api.DeschedulerPolicy, out *DeschedulerPolicy, s conversion.Scope) error {
-	if in.Profiles != nil {
-		in, out := &in.Profiles, &out.Profiles
-		*out = make([]DeschedulerProfile, len(*in))
-		for i := range *in {
-			if err := Convert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(&(*in)[i], &(*out)[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.Profiles = nil
-	}
-	out.NodeSelector = (*string)(unsafe.Pointer(in.NodeSelector))
-	out.MaxNoOfPodsToEvictPerNode = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNode))
-	out.MaxNoOfPodsToEvictPerNamespace = (*uint)(unsafe.Pointer(in.MaxNoOfPodsToEvictPerNamespace))
-	return nil
-}
-
-func autoConvert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(in *DeschedulerProfile, out *api.DeschedulerProfile, s conversion.Scope) error {
-	out.Name = in.Name
-	if in.PluginConfigs != nil {
-		in, out := &in.PluginConfigs, &out.PluginConfigs
-		*out = make([]api.PluginConfig, len(*in))
-		for i := range *in {
-			if err := Convert_v1alpha2_PluginConfig_To_api_PluginConfig(&(*in)[i], &(*out)[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.PluginConfigs = nil
-	}
-	if err := Convert_v1alpha2_Plugins_To_api_Plugins(&in.Plugins, &out.Plugins, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile is an autogenerated conversion function.
-func Convert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(in *DeschedulerProfile, out *api.DeschedulerProfile, s conversion.Scope) error {
-	return autoConvert_v1alpha2_DeschedulerProfile_To_api_DeschedulerProfile(in, out, s)
-}
-
-func autoConvert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(in *api.DeschedulerProfile, out *DeschedulerProfile, s conversion.Scope) error {
-	out.Name = in.Name
-	if in.PluginConfigs != nil {
-		in, out := &in.PluginConfigs, &out.PluginConfigs
-		*out = make([]PluginConfig, len(*in))
-		for i := range *in {
-			if err := Convert_api_PluginConfig_To_v1alpha2_PluginConfig(&(*in)[i], &(*out)[i], s); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.PluginConfigs = nil
-	}
-	if err := Convert_api_Plugins_To_v1alpha2_Plugins(&in.Plugins, &out.Plugins, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile is an autogenerated conversion function.
-func Convert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(in *api.DeschedulerProfile, out *DeschedulerProfile, s conversion.Scope) error {
-	return autoConvert_api_DeschedulerProfile_To_v1alpha2_DeschedulerProfile(in, out, s)
-}
-
-func autoConvert_v1alpha2_PluginConfig_To_api_PluginConfig(in *PluginConfig, out *api.PluginConfig, s conversion.Scope) error {
-	out.Name = in.Name
-	if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Args, &out.Args, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-func autoConvert_api_PluginConfig_To_v1alpha2_PluginConfig(in *api.PluginConfig, out *PluginConfig, s conversion.Scope) error {
-	out.Name = in.Name
-	if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&in.Args, &out.Args, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_api_PluginConfig_To_v1alpha2_PluginConfig is an autogenerated conversion function.
-func Convert_api_PluginConfig_To_v1alpha2_PluginConfig(in *api.PluginConfig, out *PluginConfig, s conversion.Scope) error {
-	return autoConvert_api_PluginConfig_To_v1alpha2_PluginConfig(in, out, s)
-}
-
-func autoConvert_v1alpha2_PluginSet_To_api_PluginSet(in *PluginSet, out *api.PluginSet, s conversion.Scope) error {
-	out.Enabled = *(*[]string)(unsafe.Pointer(&in.Enabled))
-	out.Disabled = *(*[]string)(unsafe.Pointer(&in.Disabled))
-	return nil
-}
-
-// Convert_v1alpha2_PluginSet_To_api_PluginSet is an autogenerated conversion function.
-func Convert_v1alpha2_PluginSet_To_api_PluginSet(in *PluginSet, out *api.PluginSet, s conversion.Scope) error {
-	return autoConvert_v1alpha2_PluginSet_To_api_PluginSet(in, out, s)
-}
-
-func autoConvert_api_PluginSet_To_v1alpha2_PluginSet(in *api.PluginSet, out *PluginSet, s conversion.Scope) error {
-	out.Enabled = *(*[]string)(unsafe.Pointer(&in.Enabled))
-	out.Disabled = *(*[]string)(unsafe.Pointer(&in.Disabled))
-	return nil
-}
-
-// Convert_api_PluginSet_To_v1alpha2_PluginSet is an autogenerated conversion function.
-func Convert_api_PluginSet_To_v1alpha2_PluginSet(in *api.PluginSet, out *PluginSet, s conversion.Scope) error {
-	return autoConvert_api_PluginSet_To_v1alpha2_PluginSet(in, out, s)
-}
-
-func autoConvert_v1alpha2_Plugins_To_api_Plugins(in *Plugins, out *api.Plugins, s conversion.Scope) error {
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.PreSort, &out.PreSort, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.Sort, &out.Sort, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.Deschedule, &out.Deschedule, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.Balance, &out.Balance, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.Filter, &out.Filter, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha2_PluginSet_To_api_PluginSet(&in.PreEvictionFilter, &out.PreEvictionFilter, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_v1alpha2_Plugins_To_api_Plugins is an autogenerated conversion function.
-func Convert_v1alpha2_Plugins_To_api_Plugins(in *Plugins, out *api.Plugins, s conversion.Scope) error {
-	return autoConvert_v1alpha2_Plugins_To_api_Plugins(in, out, s)
-}
-
-func autoConvert_api_Plugins_To_v1alpha2_Plugins(in *api.Plugins, out *Plugins, s conversion.Scope) error {
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.PreSort, &out.PreSort, s); err != nil {
-		return err
-	}
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.Sort, &out.Sort, s); err != nil {
-		return err
-	}
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.Deschedule, &out.Deschedule, s); err != nil {
-		return err
-	}
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.Balance, &out.Balance, s); err != nil {
-		return err
-	}
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.Filter, &out.Filter, s); err != nil {
-		return err
-	}
-	if err := Convert_api_PluginSet_To_v1alpha2_PluginSet(&in.PreEvictionFilter, &out.PreEvictionFilter, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_api_Plugins_To_v1alpha2_Plugins is an autogenerated conversion function.
-func Convert_api_Plugins_To_v1alpha2_Plugins(in *api.Plugins, out *Plugins, s conversion.Scope) error {
-	return autoConvert_api_Plugins_To_v1alpha2_Plugins(in, out, s)
-}

pkg/api/v1alpha2/zz_generated.deepcopy.go

@@ -1,162 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-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.
-*/
-
-// Code generated by deepcopy-gen. DO NOT EDIT.
-
-package v1alpha2
-
-import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	if in.Profiles != nil {
-		in, out := &in.Profiles, &out.Profiles
-		*out = make([]DeschedulerProfile, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.NodeSelector != nil {
-		in, out := &in.NodeSelector, &out.NodeSelector
-		*out = new(string)
-		**out = **in
-	}
-	if in.MaxNoOfPodsToEvictPerNode != nil {
-		in, out := &in.MaxNoOfPodsToEvictPerNode, &out.MaxNoOfPodsToEvictPerNode
-		*out = new(uint)
-		**out = **in
-	}
-	if in.MaxNoOfPodsToEvictPerNamespace != nil {
-		in, out := &in.MaxNoOfPodsToEvictPerNamespace, &out.MaxNoOfPodsToEvictPerNamespace
-		*out = new(uint)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeschedulerPolicy.
-func (in *DeschedulerPolicy) DeepCopy() *DeschedulerPolicy {
-	if in == nil {
-		return nil
-	}
-	out := new(DeschedulerPolicy)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *DeschedulerPolicy) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeschedulerProfile) DeepCopyInto(out *DeschedulerProfile) {
-	*out = *in
-	if in.PluginConfigs != nil {
-		in, out := &in.PluginConfigs, &out.PluginConfigs
-		*out = make([]PluginConfig, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	in.Plugins.DeepCopyInto(&out.Plugins)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeschedulerProfile.
-func (in *DeschedulerProfile) DeepCopy() *DeschedulerProfile {
-	if in == nil {
-		return nil
-	}
-	out := new(DeschedulerProfile)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PluginConfig) DeepCopyInto(out *PluginConfig) {
-	*out = *in
-	in.Args.DeepCopyInto(&out.Args)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PluginConfig.
-func (in *PluginConfig) DeepCopy() *PluginConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(PluginConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PluginSet) DeepCopyInto(out *PluginSet) {
-	*out = *in
-	if in.Enabled != nil {
-		in, out := &in.Enabled, &out.Enabled
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Disabled != nil {
-		in, out := &in.Disabled, &out.Disabled
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PluginSet.
-func (in *PluginSet) DeepCopy() *PluginSet {
-	if in == nil {
-		return nil
-	}
-	out := new(PluginSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Plugins) DeepCopyInto(out *Plugins) {
-	*out = *in
-	in.PreSort.DeepCopyInto(&out.PreSort)
-	in.Sort.DeepCopyInto(&out.Sort)
-	in.Deschedule.DeepCopyInto(&out.Deschedule)
-	in.Balance.DeepCopyInto(&out.Balance)
-	in.Filter.DeepCopyInto(&out.Filter)
-	in.PreEvictionFilter.DeepCopyInto(&out.PreEvictionFilter)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Plugins.
-func (in *Plugins) DeepCopy() *Plugins {
-	if in == nil {
-		return nil
-	}
-	out := new(Plugins)
-	in.DeepCopyInto(out)
-	return out
-}

pkg/api/v1alpha2/zz_generated.defaults.go

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

pkg/api/zz_generated.deepcopy.go

@@ -31,7 +31,7 @@ func (in *DeschedulerPolicy) DeepCopyInto(out *DeschedulerPolicy) {
 	out.TypeMeta = in.TypeMeta
 	if in.Profiles != nil {
 		in, out := &in.Profiles, &out.Profiles
-		*out = make([]DeschedulerProfile, len(*in))
+		*out = make([]Profile, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -72,30 +72,6 @@ func (in *DeschedulerPolicy) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DeschedulerProfile) DeepCopyInto(out *DeschedulerProfile) {
-	*out = *in
-	if in.PluginConfigs != nil {
-		in, out := &in.PluginConfigs, &out.PluginConfigs
-		*out = make([]PluginConfig, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	in.Plugins.DeepCopyInto(&out.Plugins)
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeschedulerProfile.
-func (in *DeschedulerProfile) DeepCopy() *DeschedulerProfile {
-	if in == nil {
-		return nil
-	}
-	out := new(DeschedulerProfile)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Namespaces) DeepCopyInto(out *Namespaces) {
 	*out = *in
@@ -174,6 +150,7 @@ func (in *Plugins) DeepCopyInto(out *Plugins) {
 	in.Sort.DeepCopyInto(&out.Sort)
 	in.Deschedule.DeepCopyInto(&out.Deschedule)
 	in.Balance.DeepCopyInto(&out.Balance)
+	in.Evict.DeepCopyInto(&out.Evict)
 	in.Filter.DeepCopyInto(&out.Filter)
 	in.PreEvictionFilter.DeepCopyInto(&out.PreEvictionFilter)
 	return
@@ -210,6 +187,30 @@ func (in *PriorityThreshold) DeepCopy() *PriorityThreshold {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Profile) DeepCopyInto(out *Profile) {
+	*out = *in
+	if in.PluginConfigs != nil {
+		in, out := &in.PluginConfigs, &out.PluginConfigs
+		*out = make([]PluginConfig, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	in.Plugins.DeepCopyInto(&out.Plugins)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Profile.
+func (in *Profile) DeepCopy() *Profile {
+	if in == nil {
+		return nil
+	}
+	out := new(Profile)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in ResourceThresholds) DeepCopyInto(out *ResourceThresholds) {
 	{

pkg/apis/componentconfig/types.go

@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	componentbaseconfig "k8s.io/component-base/config"
+	registry "k8s.io/component-base/logs/api/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -33,7 +34,6 @@ type DeschedulerConfiguration struct {
 
 	// KubeconfigFile is path to kubeconfig file with authorization and master
 	// location information.
-	// Deprecated: Use clientConnection.kubeConfig instead.
 	KubeconfigFile string
 
 	// PolicyConfigFile is the filepath to the descheduler policy configuration.
@@ -54,35 +54,10 @@ type DeschedulerConfiguration struct {
 	// IgnorePVCPods sets whether PVC pods should be allowed to be evicted
 	IgnorePVCPods bool
 
-	// Tracing specifies the options for tracing.
-	Tracing TracingConfiguration
-
 	// LeaderElection starts Deployment using leader election loop
 	LeaderElection componentbaseconfig.LeaderElectionConfiguration
 
-	// ClientConnection specifies the kubeconfig file and client connection settings to use when communicating with the apiserver.
+	// Logging specifies the options of logging.
-	// Refer to [ClientConnection](https://pkg.go.dev/k8s.io/kubernetes/pkg/apis/componentconfig#ClientConnectionConfiguration) for more information.
+	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/api/v1/options.go) for more information.
-	ClientConnection componentbaseconfig.ClientConnectionConfiguration
+	Logging registry.LoggingConfiguration
-}
-
-type TracingConfiguration struct {
-	// CollectorEndpoint is the address of the OpenTelemetry collector.
-	// If not specified, tracing will be used NoopTraceProvider.
-	CollectorEndpoint string
-	// TransportCert is the path to the certificate file for the OpenTelemetry collector.
-	// If not specified, provider will start in insecure mode.
-	TransportCert string
-	// ServiceName is the name of the service to be used in the OpenTelemetry collector.
-	// If not specified, the default value is "descheduler".
-	ServiceName string
-	// ServiceNamespace is the namespace of the service to be used in the OpenTelemetry collector.
-	// If not specified, tracing will be used default namespace.
-	ServiceNamespace string
-	// SampleRate is used to configure the sample rate of the OTEL trace collection. This value will
-	// be used as the Base value with sample ratio. A value >= 1.0 will sample everything and < 0 will
-	// not sample anything. Everything else is a percentage value.
-	SampleRate float64
-	// FallbackToNoOpProviderOnError can be set in case if you want your trace provider to fallback to
-	// no op provider in case if the configured end point based provider can't be setup.
-	FallbackToNoOpProviderOnError bool
 }

pkg/apis/componentconfig/v1alpha1/types.go

@@ -21,6 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	componentbaseconfig "k8s.io/component-base/config"
+	registry "k8s.io/component-base/logs/api/v1"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -33,7 +34,6 @@ type DeschedulerConfiguration struct {
 
 	// KubeconfigFile is path to kubeconfig file with authorization and master
 	// location information.
-	// Deprecated: Use clientConnection.kubeConfig instead.
 	KubeconfigFile string `json:"kubeconfigFile"`
 
 	// PolicyConfigFile is the filepath to the descheduler policy configuration.
@@ -54,35 +54,10 @@ type DeschedulerConfiguration struct {
 	// IgnorePVCPods sets whether PVC pods should be allowed to be evicted
 	IgnorePVCPods bool `json:"ignorePvcPods,omitempty"`
 
-	// Tracing is used to setup the required OTEL tracing configuration
-	Tracing TracingConfiguration `json:"tracing,omitempty"`
-
 	// LeaderElection starts Deployment using leader election loop
 	LeaderElection componentbaseconfig.LeaderElectionConfiguration `json:"leaderElection,omitempty"`
 
-	// ClientConnection specifies the kubeconfig file and client connection settings to use when communicating with the apiserver.
+	// Logging specifies the options of logging.
-	// Refer to [ClientConnection](https://pkg.go.dev/k8s.io/kubernetes/pkg/apis/componentconfig#ClientConnectionConfiguration) for more information.
+	// Refer [Logs Options](https://github.com/kubernetes/component-base/blob/master/logs/api/v1/options.go) for more information.
-	ClientConnection componentbaseconfig.ClientConnectionConfiguration `json:"clientConnection,omitempty"`
+	Logging registry.LoggingConfiguration `json:"logging,omitempty"`
-}
-
-type TracingConfiguration struct {
-	// CollectorEndpoint is the address of the OpenTelemetry collector.
-	// If not specified, tracing will be used NoopTraceProvider.
-	CollectorEndpoint string `json:"collectorEndpoint"`
-	// TransportCert is the path to the certificate file for the OpenTelemetry collector.
-	// If not specified, provider will start in insecure mode.
-	TransportCert string `json:"transportCert,omitempty"`
-	// ServiceName is the name of the service to be used in the OpenTelemetry collector.
-	// If not specified, the default value is "descheduler".
-	ServiceName string `json:"serviceName,omitempty"`
-	// ServiceNamespace is the namespace of the service to be used in the OpenTelemetry collector.
-	// If not specified, tracing will be used default namespace.
-	ServiceNamespace string `json:"serviceNamespace,omitempty"`
-	// SampleRate is used to configure the sample rate of the OTEL trace collection. This value will
-	// be used as the Base value with sample ratio. A value >= 1.0 will sample everything and < 0 will
-	// not sample anything. Everything else is a percentage value.
-	SampleRate float64 `json:"sampleRate"`
-	// FallbackToNoOpProviderOnError can be set in case if you want your trace provider to fallback to
-	// no op provider in case if the configured end point based provider can't be setup.
-	FallbackToNoOpProviderOnError bool `json:"fallbackToNoOpProviderOnError"`
 }

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

@@ -46,16 +46,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*TracingConfiguration)(nil), (*componentconfig.TracingConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration(a.(*TracingConfiguration), b.(*componentconfig.TracingConfiguration), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*componentconfig.TracingConfiguration)(nil), (*TracingConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration(a.(*componentconfig.TracingConfiguration), b.(*TracingConfiguration), scope)
-	}); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -68,11 +58,8 @@ func autoConvert_v1alpha1_DeschedulerConfiguration_To_componentconfig_Deschedule
 	out.MaxNoOfPodsToEvictPerNode = in.MaxNoOfPodsToEvictPerNode
 	out.EvictLocalStoragePods = in.EvictLocalStoragePods
 	out.IgnorePVCPods = in.IgnorePVCPods
-	if err := Convert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration(&in.Tracing, &out.Tracing, s); err != nil {
-		return err
-	}
 	out.LeaderElection = in.LeaderElection
-	out.ClientConnection = in.ClientConnection
+	out.Logging = in.Logging
 	return nil
 }
 
@@ -90,11 +77,8 @@ func autoConvert_componentconfig_DeschedulerConfiguration_To_v1alpha1_Deschedule
 	out.MaxNoOfPodsToEvictPerNode = in.MaxNoOfPodsToEvictPerNode
 	out.EvictLocalStoragePods = in.EvictLocalStoragePods
 	out.IgnorePVCPods = in.IgnorePVCPods
-	if err := Convert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration(&in.Tracing, &out.Tracing, s); err != nil {
-		return err
-	}
 	out.LeaderElection = in.LeaderElection
-	out.ClientConnection = in.ClientConnection
+	out.Logging = in.Logging
 	return nil
 }
 
@@ -102,33 +86,3 @@ func autoConvert_componentconfig_DeschedulerConfiguration_To_v1alpha1_Deschedule
 func Convert_componentconfig_DeschedulerConfiguration_To_v1alpha1_DeschedulerConfiguration(in *componentconfig.DeschedulerConfiguration, out *DeschedulerConfiguration, s conversion.Scope) error {
 	return autoConvert_componentconfig_DeschedulerConfiguration_To_v1alpha1_DeschedulerConfiguration(in, out, s)
 }
-
-func autoConvert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration(in *TracingConfiguration, out *componentconfig.TracingConfiguration, s conversion.Scope) error {
-	out.CollectorEndpoint = in.CollectorEndpoint
-	out.TransportCert = in.TransportCert
-	out.ServiceName = in.ServiceName
-	out.ServiceNamespace = in.ServiceNamespace
-	out.SampleRate = in.SampleRate
-	out.FallbackToNoOpProviderOnError = in.FallbackToNoOpProviderOnError
-	return nil
-}
-
-// Convert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration is an autogenerated conversion function.
-func Convert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration(in *TracingConfiguration, out *componentconfig.TracingConfiguration, s conversion.Scope) error {
-	return autoConvert_v1alpha1_TracingConfiguration_To_componentconfig_TracingConfiguration(in, out, s)
-}
-
-func autoConvert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration(in *componentconfig.TracingConfiguration, out *TracingConfiguration, s conversion.Scope) error {
-	out.CollectorEndpoint = in.CollectorEndpoint
-	out.TransportCert = in.TransportCert
-	out.ServiceName = in.ServiceName
-	out.ServiceNamespace = in.ServiceNamespace
-	out.SampleRate = in.SampleRate
-	out.FallbackToNoOpProviderOnError = in.FallbackToNoOpProviderOnError
-	return nil
-}
-
-// Convert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration is an autogenerated conversion function.
-func Convert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration(in *componentconfig.TracingConfiguration, out *TracingConfiguration, s conversion.Scope) error {
-	return autoConvert_componentconfig_TracingConfiguration_To_v1alpha1_TracingConfiguration(in, out, s)
-}

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

@@ -29,9 +29,8 @@ import (
 func (in *DeschedulerConfiguration) DeepCopyInto(out *DeschedulerConfiguration) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.Tracing = in.Tracing
 	out.LeaderElection = in.LeaderElection
-	out.ClientConnection = in.ClientConnection
+	in.Logging.DeepCopyInto(&out.Logging)
 	return
 }
 
@@ -52,19 +51,3 @@ func (in *DeschedulerConfiguration) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TracingConfiguration) DeepCopyInto(out *TracingConfiguration) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TracingConfiguration.
-func (in *TracingConfiguration) DeepCopy() *TracingConfiguration {
-	if in == nil {
-		return nil
-	}
-	out := new(TracingConfiguration)
-	in.DeepCopyInto(out)
-	return out
-}

pkg/apis/componentconfig/zz_generated.deepcopy.go

@@ -29,9 +29,8 @@ import (
 func (in *DeschedulerConfiguration) DeepCopyInto(out *DeschedulerConfiguration) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.Tracing = in.Tracing
 	out.LeaderElection = in.LeaderElection
-	out.ClientConnection = in.ClientConnection
+	in.Logging.DeepCopyInto(&out.Logging)
 	return
 }
 
@@ -52,19 +51,3 @@ func (in *DeschedulerConfiguration) DeepCopyObject() runtime.Object {
 	}
 	return nil
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TracingConfiguration) DeepCopyInto(out *TracingConfiguration) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TracingConfiguration.
-func (in *TracingConfiguration) DeepCopy() *TracingConfiguration {
-	if in == nil {
-		return nil
-	}
-	out := new(TracingConfiguration)
-	in.DeepCopyInto(out)
-	return out
-}

pkg/descheduler/client/client.go

@@ -20,43 +20,38 @@ import (
 	"fmt"
 
 	clientset "k8s.io/client-go/kubernetes"
-	componentbaseconfig "k8s.io/component-base/config"
-
 	// Ensure to load all auth plugins.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-func CreateClient(clientConnection componentbaseconfig.ClientConnectionConfiguration, userAgt string) (clientset.Interface, error) {
+func CreateClient(kubeconfig, userAgt string) (clientset.Interface, error) {
 	var cfg *rest.Config
-	if len(clientConnection.Kubeconfig) != 0 {
+	if len(kubeconfig) != 0 {
-		master, err := GetMasterFromKubeconfig(clientConnection.Kubeconfig)
+		master, err := GetMasterFromKubeconfig(kubeconfig)
 		if err != nil {
-			return nil, fmt.Errorf("failed to parse kubeconfig file: %v ", err)
+			return nil, fmt.Errorf("Failed to parse kubeconfig file: %v ", err)
 		}
 
-		cfg, err = clientcmd.BuildConfigFromFlags(master, clientConnection.Kubeconfig)
+		cfg, err = clientcmd.BuildConfigFromFlags(master, kubeconfig)
 		if err != nil {
-			return nil, fmt.Errorf("unable to build config: %v", err)
+			return nil, fmt.Errorf("Unable to build config: %v", err)
 		}
 
 	} else {
 		var err error
 		cfg, err = rest.InClusterConfig()
 		if err != nil {
-			return nil, fmt.Errorf("unable to build in cluster config: %v", err)
+			return nil, fmt.Errorf("Unable to build in cluster config: %v", err)
 		}
 	}
 
-	cfg.Burst = int(clientConnection.Burst)
-	cfg.QPS = clientConnection.QPS
-
 	if len(userAgt) != 0 {
-		cfg = rest.AddUserAgent(cfg, userAgt)
+		return clientset.NewForConfig(rest.AddUserAgent(cfg, userAgt))
+	} else {
+		return clientset.NewForConfig(cfg)
 	}
-
-	return clientset.NewForConfig(cfg)
 }
 
 func GetMasterFromKubeconfig(filename string) (string, error) {
@@ -67,11 +62,11 @@ func GetMasterFromKubeconfig(filename string) (string, error) {
 
 	context, ok := config.Contexts[config.CurrentContext]
 	if !ok {
-		return "", fmt.Errorf("failed to get master address from kubeconfig")
+		return "", fmt.Errorf("Failed to get master address from kubeconfig")
 	}
 
 	if val, ok := config.Clusters[context.Cluster]; ok {
 		return val.Server, nil
 	}
-	return "", fmt.Errorf("failed to get master address from kubeconfig")
+	return "", fmt.Errorf("Failed to get master address from kubeconfig")
 }

pkg/descheduler/descheduler.go

@@ -18,17 +18,8 @@ package descheduler
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"math"
-	"time"
 
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
-	"k8s.io/client-go/discovery"
-	"k8s.io/client-go/informers"
-	"k8s.io/client-go/tools/events"
-	componentbaseconfig "k8s.io/component-base/config"
 	"k8s.io/klog/v2"
 
 	v1 "k8s.io/api/core/v1"
@@ -36,204 +27,39 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
-	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	listersv1 "k8s.io/client-go/listers/core/v1"
 	schedulingv1 "k8s.io/client-go/listers/scheduling/v1"
 	core "k8s.io/client-go/testing"
 
-	"sigs.k8s.io/descheduler/pkg/descheduler/client"
-	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
-	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
-	"sigs.k8s.io/descheduler/pkg/tracing"
-	"sigs.k8s.io/descheduler/pkg/utils"
-	"sigs.k8s.io/descheduler/pkg/version"
-
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/metrics"
 	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/descheduler/client"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
+	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
+	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
+	"sigs.k8s.io/descheduler/pkg/framework"
-	frameworkprofile "sigs.k8s.io/descheduler/pkg/framework/profile"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
+	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
-type eprunner func(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status
-
-type profileRunner struct {
-	name                      string
-	descheduleEPs, balanceEPs eprunner
-}
-
-type descheduler struct {
-	rs                         *options.DeschedulerServer
-	podLister                  listersv1.PodLister
-	nodeLister                 listersv1.NodeLister
-	namespaceLister            listersv1.NamespaceLister
-	priorityClassLister        schedulingv1.PriorityClassLister
-	getPodsAssignedToNode      podutil.GetPodsAssignedToNodeFunc
-	sharedInformerFactory      informers.SharedInformerFactory
-	evictionPolicyGroupVersion string
-	deschedulerPolicy          *api.DeschedulerPolicy
-	eventRecorder              events.EventRecorder
-}
-
-func newDescheduler(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string, eventRecorder events.EventRecorder, sharedInformerFactory informers.SharedInformerFactory) (*descheduler, error) {
-	podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
-	podLister := sharedInformerFactory.Core().V1().Pods().Lister()
-	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
-	namespaceLister := sharedInformerFactory.Core().V1().Namespaces().Lister()
-	priorityClassLister := sharedInformerFactory.Scheduling().V1().PriorityClasses().Lister()
-
-	getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
-	if err != nil {
-		return nil, fmt.Errorf("build get pods assigned to node function error: %v", err)
-	}
-
-	return &descheduler{
-		rs:                         rs,
-		podLister:                  podLister,
-		nodeLister:                 nodeLister,
-		namespaceLister:            namespaceLister,
-		priorityClassLister:        priorityClassLister,
-		getPodsAssignedToNode:      getPodsAssignedToNode,
-		sharedInformerFactory:      sharedInformerFactory,
-		evictionPolicyGroupVersion: evictionPolicyGroupVersion,
-		deschedulerPolicy:          deschedulerPolicy,
-		eventRecorder:              eventRecorder,
-	}, nil
-}
-
-func (d *descheduler) runDeschedulerLoop(ctx context.Context, nodes []*v1.Node) error {
-	var span trace.Span
-	ctx, span = tracing.Tracer().Start(ctx, "runDeschedulerLoop")
-	defer span.End()
-	defer func(loopStartDuration time.Time) {
-		metrics.DeschedulerLoopDuration.With(map[string]string{}).Observe(time.Since(loopStartDuration).Seconds())
-	}(time.Now())
-
-	// if len is still <= 1 error out
-	if len(nodes) <= 1 {
-		klog.V(1).InfoS("The cluster size is 0 or 1 meaning eviction causes service disruption or degradation. So aborting..")
-		return fmt.Errorf("the cluster size is 0 or 1")
-	}
-
-	var client clientset.Interface
-	// When the dry mode is enable, collect all the relevant objects (mostly pods) under a fake client.
-	// So when evicting pods while running multiple strategies in a row have the cummulative effect
-	// as is when evicting pods for real.
-	if d.rs.DryRun {
-		klog.V(3).Infof("Building a cached client from the cluster for the dry run")
-		// Create a new cache so we start from scratch without any leftovers
-		fakeClient, err := cachedClient(d.rs.Client, d.podLister, d.nodeLister, d.namespaceLister, d.priorityClassLister)
-		if err != nil {
-			return err
-		}
-
-		// create a new instance of the shared informer factor from the cached client
-		fakeSharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-		// register the pod informer, otherwise it will not get running
-		d.getPodsAssignedToNode, err = podutil.BuildGetPodsAssignedToNodeFunc(fakeSharedInformerFactory.Core().V1().Pods().Informer())
-		if err != nil {
-			return fmt.Errorf("build get pods assigned to node function error: %v", err)
-		}
-
-		fakeCtx, cncl := context.WithCancel(context.TODO())
-		defer cncl()
-		fakeSharedInformerFactory.Start(fakeCtx.Done())
-		fakeSharedInformerFactory.WaitForCacheSync(fakeCtx.Done())
-
-		client = fakeClient
-		d.sharedInformerFactory = fakeSharedInformerFactory
-	} else {
-		client = d.rs.Client
-	}
-
-	klog.V(3).Infof("Building a pod evictor")
-	podEvictor := evictions.NewPodEvictor(
-		client,
-		d.evictionPolicyGroupVersion,
-		d.rs.DryRun,
-		d.deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
-		d.deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
-		nodes,
-		!d.rs.DisableMetrics,
-		d.eventRecorder,
-	)
-
-	d.runProfiles(ctx, client, nodes, podEvictor)
-
-	klog.V(1).InfoS("Number of evicted pods", "totalEvicted", podEvictor.TotalEvicted())
-
-	return nil
-}
-
-// runProfiles runs all the deschedule plugins of all profiles and
-// later runs through all balance plugins of all profiles. (All Balance plugins should come after all Deschedule plugins)
-// see https://github.com/kubernetes-sigs/descheduler/issues/979
-func (d *descheduler) runProfiles(ctx context.Context, client clientset.Interface, nodes []*v1.Node, podEvictor *evictions.PodEvictor) {
-	var span trace.Span
-	ctx, span = tracing.Tracer().Start(ctx, "runProfiles")
-	defer span.End()
-	var profileRunners []profileRunner
-	for _, profile := range d.deschedulerPolicy.Profiles {
-		currProfile, err := frameworkprofile.NewProfile(
-			profile,
-			pluginregistry.PluginRegistry,
-			frameworkprofile.WithClientSet(client),
-			frameworkprofile.WithSharedInformerFactory(d.sharedInformerFactory),
-			frameworkprofile.WithPodEvictor(podEvictor),
-			frameworkprofile.WithGetPodsAssignedToNodeFnc(d.getPodsAssignedToNode),
-		)
-		if err != nil {
-			klog.ErrorS(err, "unable to create a profile", "profile", profile.Name)
-			continue
-		}
-		profileRunners = append(profileRunners, profileRunner{profile.Name, currProfile.RunDeschedulePlugins, currProfile.RunBalancePlugins})
-	}
-
-	for _, profileR := range profileRunners {
-		// First deschedule
-		status := profileR.descheduleEPs(ctx, nodes)
-		if status != nil && status.Err != nil {
-			span.AddEvent("failed to perform deschedule operations", trace.WithAttributes(attribute.String("err", status.Err.Error()), attribute.String("profile", profileR.name), attribute.String("operation", tracing.DescheduleOperation)))
-			klog.ErrorS(status.Err, "running deschedule extension point failed with error", "profile", profileR.name)
-			continue
-		}
-	}
-
-	for _, profileR := range profileRunners {
-		// Balance Later
-		status := profileR.balanceEPs(ctx, nodes)
-		if status != nil && status.Err != nil {
-			span.AddEvent("failed to perform balance operations", trace.WithAttributes(attribute.String("err", status.Err.Error()), attribute.String("profile", profileR.name), attribute.String("operation", tracing.BalanceOperation)))
-			klog.ErrorS(status.Err, "running balance extension point failed with error", "profile", profileR.name)
-			continue
-		}
-	}
-}
-
 func Run(ctx context.Context, rs *options.DeschedulerServer) error {
-	var span trace.Span
-	ctx, span = tracing.Tracer().Start(ctx, "Run")
-	defer span.End()
 	metrics.Register()
 
-	clientConnection := rs.ClientConnection
+	rsclient, eventClient, err := createClients(rs.KubeconfigFile)
-	if rs.KubeconfigFile != "" && clientConnection.Kubeconfig == "" {
-		clientConnection.Kubeconfig = rs.KubeconfigFile
-	}
-	rsclient, eventClient, err := createClients(clientConnection)
 	if err != nil {
 		return err
 	}
 	rs.Client = rsclient
 	rs.EventClient = eventClient
 
-	deschedulerPolicy, err := LoadPolicyConfig(rs.PolicyConfigFile, rs.Client, pluginregistry.PluginRegistry)
+	deschedulerPolicy, err := LoadPolicyConfig(rs.PolicyConfigFile, rs.Client, pluginbuilder.PluginRegistry)
 	if err != nil {
 		return err
 	}
@@ -241,11 +67,6 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 		return fmt.Errorf("deschedulerPolicy is nil")
 	}
 
-	// Add k8s compatibility warnings to logs
-	if err := validateVersionCompatibility(rs.Client.Discovery(), version.Get()); err != nil {
-		klog.Warning(err.Error())
-	}
-
 	evictionPolicyGroupVersion, err := eutils.SupportEviction(rs.Client)
 	if err != nil || len(evictionPolicyGroupVersion) == 0 {
 		return err
@@ -256,17 +77,15 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 	}
 
 	if rs.LeaderElection.LeaderElect && rs.DeschedulingInterval.Seconds() == 0 {
-		span.AddEvent("Validation Failure", trace.WithAttributes(attribute.String("err", "leaderElection must be used with deschedulingInterval")))
 		return fmt.Errorf("leaderElection must be used with deschedulingInterval")
 	}
 
 	if rs.LeaderElection.LeaderElect && rs.DryRun {
-		klog.V(1).Info("Warning: DryRun is set to True. You need to disable it to use Leader Election.")
+		klog.V(1).InfoS("Warning: DryRun is set to True. You need to disable it to use Leader Election.")
 	}
 
 	if rs.LeaderElection.LeaderElect && !rs.DryRun {
 		if err := NewLeaderElection(runFn, rsclient, &rs.LeaderElection, ctx); err != nil {
-			span.AddEvent("Leader Election Failure", trace.WithAttributes(attribute.String("err", err.Error())))
 			return fmt.Errorf("leaderElection: %w", err)
 		}
 		return nil
@@ -275,36 +94,6 @@ func Run(ctx context.Context, rs *options.DeschedulerServer) error {
 	return runFn()
 }
 
-func validateVersionCompatibility(discovery discovery.DiscoveryInterface, versionInfo version.Info) error {
-	serverVersionInfo, err := discovery.ServerVersion()
-	if err != nil {
-		return errors.New("failed to discover Kubernetes server version")
-	}
-
-	serverVersion, err := utilversion.ParseSemantic(serverVersionInfo.String())
-	if err != nil {
-		return errors.New("failed to parse Kubernetes server version")
-	}
-
-	deschedulerVersion, err := utilversion.ParseGeneric(versionInfo.GitVersion)
-	if err != nil {
-		return errors.New("failed to convert Descheduler minor version to float")
-	}
-
-	deschedulerMinor := float64(deschedulerVersion.Minor())
-	serverMinor := float64(serverVersion.Minor())
-	if math.Abs(deschedulerMinor-serverMinor) > 3 {
-		return fmt.Errorf(
-			"descheduler version %v may not be supported on your version of Kubernetes %v."+
-				"See compatibility docs for more info: https://github.com/kubernetes-sigs/descheduler#compatibility-matrix",
-			deschedulerVersion.String(),
-			serverVersionInfo.String(),
-		)
-	}
-
-	return nil
-}
-
 func cachedClient(
 	realClient clientset.Interface,
 	podLister listersv1.PodLister,
@@ -363,7 +152,7 @@ func cachedClient(
 
 	for _, item := range namespaces {
 		if _, err := fakeClient.CoreV1().Namespaces().Create(context.TODO(), item, metav1.CreateOptions{}); err != nil {
-			return nil, fmt.Errorf("unable to copy namespace: %v", err)
+			return nil, fmt.Errorf("unable to copy node: %v", err)
 		}
 	}
 
@@ -381,12 +170,82 @@ func cachedClient(
 	return fakeClient, nil
 }
 
+// evictorImpl implements the Evictor interface so plugins
+// can evict a pod without importing a specific pod evictor
+type evictorImpl struct {
+	podEvictor    *evictions.PodEvictor
+	evictorFilter framework.EvictorPlugin
+}
+
+var _ framework.Evictor = &evictorImpl{}
+
+// Filter checks if a pod can be evicted
+func (ei *evictorImpl) Filter(pod *v1.Pod) bool {
+	return ei.evictorFilter.Filter(pod)
+}
+
+// PreEvictionFilter checks if pod can be evicted right before eviction
+func (ei *evictorImpl) PreEvictionFilter(pod *v1.Pod) bool {
+	return ei.evictorFilter.PreEvictionFilter(pod)
+}
+
+// Evict evicts a pod (no pre-check performed)
+func (ei *evictorImpl) Evict(ctx context.Context, pod *v1.Pod, opts evictions.EvictOptions) bool {
+	return ei.podEvictor.EvictPod(ctx, pod, opts)
+}
+
+func (ei *evictorImpl) NodeLimitExceeded(node *v1.Node) bool {
+	return ei.podEvictor.NodeLimitExceeded(node)
+}
+
+// handleImpl implements the framework handle which gets passed to plugins
+type handleImpl struct {
+	clientSet                 clientset.Interface
+	getPodsAssignedToNodeFunc podutil.GetPodsAssignedToNodeFunc
+	sharedInformerFactory     informers.SharedInformerFactory
+	evictor                   *evictorImpl
+}
+
+var _ framework.Handle = &handleImpl{}
+
+// ClientSet retrieves kube client set
+func (hi *handleImpl) ClientSet() clientset.Interface {
+	return hi.clientSet
+}
+
+// GetPodsAssignedToNodeFunc retrieves GetPodsAssignedToNodeFunc implementation
+func (hi *handleImpl) GetPodsAssignedToNodeFunc() podutil.GetPodsAssignedToNodeFunc {
+	return hi.getPodsAssignedToNodeFunc
+}
+
+// SharedInformerFactory retrieves shared informer factory
+func (hi *handleImpl) SharedInformerFactory() informers.SharedInformerFactory {
+	return hi.sharedInformerFactory
+}
+
+// Evictor retrieves evictor so plugins can filter and evict pods
+func (hi *handleImpl) Evictor() framework.Evictor {
+	return hi.evictor
+}
+
 func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer, deschedulerPolicy *api.DeschedulerPolicy, evictionPolicyGroupVersion string) error {
-	var span trace.Span
-	ctx, span = tracing.Tracer().Start(ctx, "RunDeschedulerStrategies")
-	defer span.End()
 	sharedInformerFactory := informers.NewSharedInformerFactory(rs.Client, 0)
+	podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
+	podLister := sharedInformerFactory.Core().V1().Pods().Lister()
 	nodeLister := sharedInformerFactory.Core().V1().Nodes().Lister()
+	namespaceLister := sharedInformerFactory.Core().V1().Namespaces().Lister()
+	priorityClassLister := sharedInformerFactory.Scheduling().V1().PriorityClasses().Lister()
+
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
+	if err != nil {
+		return fmt.Errorf("build get pods assigned to node function error: %v", err)
+	}
+
+	sharedInformerFactory.Start(ctx.Done())
+	sharedInformerFactory.WaitForCacheSync(ctx.Done())
 
 	var nodeSelector string
 	if deschedulerPolicy.NodeSelector != nil {
@@ -399,38 +258,155 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	} else {
 		eventClient = rs.Client
 	}
+
 	eventBroadcaster, eventRecorder := utils.GetRecorderAndBroadcaster(ctx, eventClient)
 	defer eventBroadcaster.Shutdown()
 
-	descheduler, err := newDescheduler(ctx, rs, deschedulerPolicy, evictionPolicyGroupVersion, eventRecorder, sharedInformerFactory)
-	if err != nil {
-		span.AddEvent("Failed to create new descheduler", trace.WithAttributes(attribute.String("err", err.Error())))
-		return err
-	}
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	sharedInformerFactory.Start(ctx.Done())
-	sharedInformerFactory.WaitForCacheSync(ctx.Done())
-
 	wait.NonSlidingUntil(func() {
-		// A next context is created here intentionally to avoid nesting the spans via context.
+		nodes, err := nodeutil.ReadyNodes(ctx, rs.Client, nodeLister, nodeSelector)
-		sCtx, sSpan := tracing.Tracer().Start(ctx, "NonSlidingUntil")
-		defer sSpan.End()
-		nodes, err := nodeutil.ReadyNodes(sCtx, rs.Client, nodeLister, nodeSelector)
 		if err != nil {
-			sSpan.AddEvent("Failed to detect ready nodes", trace.WithAttributes(attribute.String("err", err.Error())))
+			klog.V(1).InfoS("Unable to get ready nodes", "err", err)
-			klog.Error(err)
 			cancel()
 			return
 		}
-		err = descheduler.runDeschedulerLoop(sCtx, nodes)
+
-		if err != nil {
+		if len(nodes) <= 1 {
-			sSpan.AddEvent("Failed to run descheduler loop", trace.WithAttributes(attribute.String("err", err.Error())))
+			klog.V(1).InfoS("The cluster size is 0 or 1 meaning eviction causes service disruption or degradation. So aborting..")
-			klog.Error(err)
 			cancel()
 			return
 		}
+
+		var podEvictorClient clientset.Interface
+		// When the dry mode is enable, collect all the relevant objects (mostly pods) under a fake client.
+		// So when evicting pods while running multiple strategies in a row have the cummulative effect
+		// as is when evicting pods for real.
+		if rs.DryRun {
+			klog.V(3).Infof("Building a cached client from the cluster for the dry run")
+			// Create a new cache so we start from scratch without any leftovers
+			fakeClient, err := cachedClient(rs.Client, podLister, nodeLister, namespaceLister, priorityClassLister)
+			if err != nil {
+				klog.Error(err)
+				return
+			}
+
+			fakeSharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
+			getPodsAssignedToNode, err = podutil.BuildGetPodsAssignedToNodeFunc(fakeSharedInformerFactory.Core().V1().Pods().Informer())
+			if err != nil {
+				klog.Errorf("build get pods assigned to node function error: %v", err)
+				return
+			}
+
+			fakeCtx, cncl := context.WithCancel(context.TODO())
+			defer cncl()
+			fakeSharedInformerFactory.Start(fakeCtx.Done())
+			fakeSharedInformerFactory.WaitForCacheSync(fakeCtx.Done())
+
+			podEvictorClient = fakeClient
+		} else {
+			podEvictorClient = rs.Client
+		}
+
+		klog.V(3).Infof("Building a pod evictor")
+		podEvictor := evictions.NewPodEvictor(
+			podEvictorClient,
+			evictionPolicyGroupVersion,
+			rs.DryRun,
+			deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
+			deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
+			nodes,
+			!rs.DisableMetrics,
+			eventRecorder,
+		)
+
+		var enabledDeschedulePlugins []framework.DeschedulePlugin
+		var enabledBalancePlugins []framework.BalancePlugin
+
+		// Build plugins
+		for _, profile := range deschedulerPolicy.Profiles {
+			pc := getPluginConfig(defaultevictor.PluginName, profile.PluginConfigs)
+			if pc == nil {
+				klog.ErrorS(fmt.Errorf("unable to get plugin config"), "skipping plugin", "plugin", defaultevictor.PluginName, "profile", profile.Name)
+				continue
+			}
+			evictorFilter, err := defaultevictor.New(
+				pc.Args,
+				&handleImpl{
+					clientSet:                 rs.Client,
+					getPodsAssignedToNodeFunc: getPodsAssignedToNode,
+					sharedInformerFactory:     sharedInformerFactory,
+				},
+			)
+			if err != nil {
+				klog.ErrorS(fmt.Errorf("unable to construct a plugin"), "skipping plugin", "plugin", defaultevictor.PluginName)
+				continue
+			}
+			handle := &handleImpl{
+				clientSet:                 rs.Client,
+				getPodsAssignedToNodeFunc: getPodsAssignedToNode,
+				sharedInformerFactory:     sharedInformerFactory,
+				evictor: &evictorImpl{
+					podEvictor:    podEvictor,
+					evictorFilter: evictorFilter.(framework.EvictorPlugin),
+				},
+			}
+			// Assuming only a list of enabled extension points.
+			// Later, when a default list of plugins and their extension points is established,
+			// compute the list of enabled extension points as (DefaultEnabled + Enabled - Disabled)
+			for _, plugin := range append(profile.Plugins.Deschedule.Enabled, profile.Plugins.Balance.Enabled...) {
+				pc := getPluginConfig(plugin, profile.PluginConfigs)
+				if pc == nil {
+					klog.ErrorS(fmt.Errorf("unable to get plugin config"), "skipping plugin", "plugin", plugin)
+					continue
+				}
+				registryPlugin, ok := pluginbuilder.PluginRegistry[plugin]
+				pgFnc := registryPlugin.PluginBuilder
+				if !ok {
+					klog.ErrorS(fmt.Errorf("unable to find plugin in the pluginsMap"), "skipping plugin", "plugin", plugin)
+				}
+				pg, err := pgFnc(pc.Args, handle)
+				if err != nil {
+					klog.ErrorS(err, "unable to initialize a plugin", "pluginName", plugin)
+				}
+				if pg != nil {
+					switch v := pg.(type) {
+					case framework.DeschedulePlugin:
+						enabledDeschedulePlugins = append(enabledDeschedulePlugins, v)
+					case framework.BalancePlugin:
+						enabledBalancePlugins = append(enabledBalancePlugins, v)
+					default:
+						klog.ErrorS(fmt.Errorf("unknown plugin extension point"), "skipping plugin", "plugin", plugin)
+					}
+				}
+			}
+		}
+
+		// Execute extension points
+		for _, pg := range enabledDeschedulePlugins {
+			// TODO: strategyName should be accessible from within the strategy using a framework
+			// handle or function which the Evictor has access to. For migration/in-progress framework
+			// work, we are currently passing this via context. To be removed
+			// (See discussion thread https://github.com/kubernetes-sigs/descheduler/pull/885#discussion_r919962292)
+			childCtx := context.WithValue(ctx, "strategyName", pg.Name())
+			status := pg.Deschedule(childCtx, nodes)
+			if status != nil && status.Err != nil {
+				klog.ErrorS(status.Err, "plugin finished with error", "pluginName", pg.Name())
+			}
+		}
+
+		for _, pg := range enabledBalancePlugins {
+			// TODO: strategyName should be accessible from within the strategy using a framework
+			// handle or function which the Evictor has access to. For migration/in-progress framework
+			// work, we are currently passing this via context. To be removed
+			// (See discussion thread https://github.com/kubernetes-sigs/descheduler/pull/885#discussion_r919962292)
+			childCtx := context.WithValue(ctx, "strategyName", pg.Name())
+			status := pg.Balance(childCtx, nodes)
+			if status != nil && status.Err != nil {
+				klog.ErrorS(status.Err, "plugin finished with error", "pluginName", pg.Name())
+			}
+		}
+
+		klog.V(1).InfoS("Number of evicted pods", "totalEvicted", podEvictor.TotalEvicted())
+
 		// If there was no interval specified, send a signal to the stopChannel to end the wait.Until loop after 1 iteration
 		if rs.DeschedulingInterval.Seconds() == 0 {
 			cancel()
@@ -440,22 +416,22 @@ func RunDeschedulerStrategies(ctx context.Context, rs *options.DeschedulerServer
 	return nil
 }
 
-func GetPluginConfig(pluginName string, pluginConfigs []api.PluginConfig) (*api.PluginConfig, int) {
+func getPluginConfig(pluginName string, pluginConfigs []api.PluginConfig) *api.PluginConfig {
-	for idx, pluginConfig := range pluginConfigs {
+	for _, pluginConfig := range pluginConfigs {
 		if pluginConfig.Name == pluginName {
-			return &pluginConfig, idx
+			return &pluginConfig
 		}
 	}
-	return nil, 0
+	return nil
 }
 
-func createClients(clientConnection componentbaseconfig.ClientConnectionConfiguration) (clientset.Interface, clientset.Interface, error) {
+func createClients(kubeconfig string) (clientset.Interface, clientset.Interface, error) {
-	kClient, err := client.CreateClient(clientConnection, "descheduler")
+	kClient, err := client.CreateClient(kubeconfig, "descheduler")
 	if err != nil {
 		return nil, nil, err
 	}
 
-	eventClient, err := client.CreateClient(clientConnection, "")
+	eventClient, err := client.CreateClient(kubeconfig, "")
 	if err != nil {
 		return nil, nil, err
 	}

pkg/descheduler/descheduler_test.go

@@ -9,44 +9,21 @@ import (
 	v1 "k8s.io/api/core/v1"
 	policy "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
-	apiversion "k8s.io/apimachinery/pkg/version"
-	fakediscovery "k8s.io/client-go/discovery/fake"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	"sigs.k8s.io/descheduler/cmd/descheduler/app/options"
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodsviolatingnodetaints"
-	deschedulerversion "sigs.k8s.io/descheduler/pkg/version"
 	"sigs.k8s.io/descheduler/test"
 )
 
-// scope contains information about an ongoing conversion.
-type scope struct {
-	converter *conversion.Converter
-	meta      *conversion.Meta
-}
-
-// Convert continues a conversion.
-func (s scope) Convert(src, dest interface{}) error {
-	return s.converter.Convert(src, dest, s.meta)
-}
-
-// Meta returns the meta object that was originally passed to Convert.
-func (s scope) Meta() *conversion.Meta {
-	return s.meta
-}
-
 func TestTaintsUpdated(t *testing.T) {
-	pluginregistry.PluginRegistry = pluginregistry.NewRegistry()
+	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	pluginregistry.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaints{}, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, removepodsviolatingnodetaints.ValidateRemovePodsViolatingNodeTaintsArgs, removepodsviolatingnodetaints.SetDefaults_RemovePodsViolatingNodeTaintsArgs, pluginregistry.PluginRegistry)
+	pluginbuilder.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, pluginbuilder.PluginRegistry)
-	pluginregistry.Register(defaultevictor.PluginName, defaultevictor.New, &defaultevictor.DefaultEvictor{}, &defaultevictor.DefaultEvictorArgs{}, defaultevictor.ValidateDefaultEvictorArgs, defaultevictor.SetDefaults_DefaultEvictorArgs, pluginregistry.PluginRegistry)
-
 	ctx := context.Background()
 	n1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	n2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
@@ -97,9 +74,7 @@ func TestTaintsUpdated(t *testing.T) {
 	var evictedPods []string
 	client.PrependReactor("create", "pods", podEvictionReactionFuc(&evictedPods))
 
-	internalDeschedulerPolicy := &api.DeschedulerPolicy{}
+	internalDeschedulerPolicy, err := V1alpha1ToInternal(client, dp, pluginbuilder.PluginRegistry)
-	scope := scope{}
-	err = v1alpha1.V1alpha1ToInternal(dp, pluginregistry.PluginRegistry, internalDeschedulerPolicy, scope)
 	if err != nil {
 		t.Fatalf("Unable to convert v1alpha1 to v1alpha2: %v", err)
 	}
@@ -114,10 +89,8 @@ func TestTaintsUpdated(t *testing.T) {
 }
 
 func TestDuplicate(t *testing.T) {
-	pluginregistry.PluginRegistry = pluginregistry.NewRegistry()
+	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	pluginregistry.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicates{}, &removeduplicates.RemoveDuplicatesArgs{}, removeduplicates.ValidateRemoveDuplicatesArgs, removeduplicates.SetDefaults_RemoveDuplicatesArgs, pluginregistry.PluginRegistry)
+	pluginbuilder.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicatesArgs{}, pluginbuilder.PluginRegistry)
-	pluginregistry.Register(defaultevictor.PluginName, defaultevictor.New, &defaultevictor.DefaultEvictor{}, &defaultevictor.DefaultEvictorArgs{}, defaultevictor.ValidateDefaultEvictorArgs, defaultevictor.SetDefaults_DefaultEvictorArgs, pluginregistry.PluginRegistry)
-
 	ctx := context.Background()
 	node1 := test.BuildTestNode("n1", 2000, 3000, 10, nil)
 	node2 := test.BuildTestNode("n2", 2000, 3000, 10, nil)
@@ -163,9 +136,7 @@ func TestDuplicate(t *testing.T) {
 	var evictedPods []string
 	client.PrependReactor("create", "pods", podEvictionReactionFuc(&evictedPods))
 
-	internalDeschedulerPolicy := &api.DeschedulerPolicy{}
+	internalDeschedulerPolicy, err := V1alpha1ToInternal(client, dp, pluginbuilder.PluginRegistry)
-	scope := scope{}
-	err = v1alpha1.V1alpha1ToInternal(dp, pluginregistry.PluginRegistry, internalDeschedulerPolicy, scope)
 	if err != nil {
 		t.Fatalf("Unable to convert v1alpha1 to v1alpha2: %v", err)
 	}
@@ -185,7 +156,7 @@ func TestRootCancel(t *testing.T) {
 	client := fakeclientset.NewSimpleClientset(n1, n2)
 	eventClient := fakeclientset.NewSimpleClientset(n1, n2)
 	dp := &api.DeschedulerPolicy{
-		Profiles: []api.DeschedulerProfile{}, // no strategies needed for this test
+		Profiles: []api.Profile{}, // no strategies needed for this test
 	}
 
 	rs, err := options.NewDeschedulerServer()
@@ -220,7 +191,7 @@ func TestRootCancelWithNoInterval(t *testing.T) {
 	client := fakeclientset.NewSimpleClientset(n1, n2)
 	eventClient := fakeclientset.NewSimpleClientset(n1, n2)
 	dp := &api.DeschedulerPolicy{
-		Profiles: []api.DeschedulerProfile{}, // no strategies needed for this test
+		Profiles: []api.Profile{}, // no strategies needed for this test
 	}
 
 	rs, err := options.NewDeschedulerServer()
@@ -248,67 +219,6 @@ func TestRootCancelWithNoInterval(t *testing.T) {
 	}
 }
 
-func TestValidateVersionCompatibility(t *testing.T) {
-	type testCase struct {
-		name               string
-		deschedulerVersion string
-		serverVersion      string
-		expectError        bool
-	}
-	testCases := []testCase{
-		{
-			name:               "no error when descheduler minor equals to server minor",
-			deschedulerVersion: "v0.26",
-			serverVersion:      "v1.26.1",
-			expectError:        false,
-		},
-		{
-			name:               "no error when descheduler minor is 3 behind server minor",
-			deschedulerVersion: "0.23",
-			serverVersion:      "v1.26.1",
-			expectError:        false,
-		},
-		{
-			name:               "no error when descheduler minor is 3 ahead of server minor",
-			deschedulerVersion: "v0.26",
-			serverVersion:      "v1.26.1",
-			expectError:        false,
-		},
-		{
-			name:               "error when descheduler minor is 4 behind server minor",
-			deschedulerVersion: "v0.22",
-			serverVersion:      "v1.26.1",
-			expectError:        true,
-		},
-		{
-			name:               "error when descheduler minor is 4 ahead of server minor",
-			deschedulerVersion: "v0.27",
-			serverVersion:      "v1.23.1",
-			expectError:        true,
-		},
-		{
-			name:               "no error when using managed provider version",
-			deschedulerVersion: "v0.25",
-			serverVersion:      "v1.25.12-eks-2d98532",
-			expectError:        false,
-		},
-	}
-	client := fakeclientset.NewSimpleClientset()
-	fakeDiscovery, _ := client.Discovery().(*fakediscovery.FakeDiscovery)
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			fakeDiscovery.FakedServerVersion = &apiversion.Info{GitVersion: tc.serverVersion}
-			deschedulerVersion := deschedulerversion.Info{GitVersion: tc.deschedulerVersion}
-			err := validateVersionCompatibility(fakeDiscovery, deschedulerVersion)
-
-			hasError := err != nil
-			if tc.expectError != hasError {
-				t.Error("unexpected version compatibility behavior")
-			}
-		})
-	}
-}
-
 func podEvictionReactionFuc(evictedPods *[]string) func(action core.Action) (bool, runtime.Object, error) {
 	return func(action core.Action) (bool, runtime.Object, error) {
 		if action.GetSubresource() == "eviction" {

pkg/descheduler/evictions/evictions.go

@@ -20,8 +20,6 @@ import (
 	"context"
 	"fmt"
 
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
 	v1 "k8s.io/api/core/v1"
 	policy "k8s.io/api/policy/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -32,7 +30,6 @@ import (
 	"sigs.k8s.io/descheduler/metrics"
 
 	eutils "sigs.k8s.io/descheduler/pkg/descheduler/evictions/utils"
-	"sigs.k8s.io/descheduler/pkg/tracing"
 )
 
 // nodePodEvictedCount keeps count of pods evicted on node
@@ -116,9 +113,6 @@ type EvictOptions struct {
 // EvictPod evicts a pod while exercising eviction limits.
 // Returns true when the pod is evicted on the server side.
 func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptions) bool {
-	var span trace.Span
-	ctx, span = tracing.Tracer().Start(ctx, "EvictPod", trace.WithAttributes(attribute.String("podName", pod.Name), attribute.String("podNamespace", pod.Namespace), attribute.String("reason", opts.Reason), attribute.String("operation", tracing.EvictOperation)))
-	defer span.End()
 	// TODO: Replace context-propagated Strategy name with a defined framework handle for accessing Strategy info
 	strategy := ""
 	if ctx.Value("strategyName") != nil {
@@ -130,8 +124,7 @@ func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptio
 			if pe.metricsEnabled {
 				metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per node reached", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
 			}
-			span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", "Maximum number of evicted pods per node reached")))
+			klog.ErrorS(fmt.Errorf("Maximum number of evicted pods per node reached"), "limit", *pe.maxPodsToEvictPerNode, "node", pod.Spec.NodeName)
-			klog.ErrorS(fmt.Errorf("maximum number of evicted pods per node reached"), "Error evicting pod", "limit", *pe.maxPodsToEvictPerNode, "node", pod.Spec.NodeName)
 			return false
 		}
 	}
@@ -140,15 +133,13 @@ func (pe *PodEvictor) EvictPod(ctx context.Context, pod *v1.Pod, opts EvictOptio
 		if pe.metricsEnabled {
 			metrics.PodsEvicted.With(map[string]string{"result": "maximum number of pods per namespace reached", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()
 		}
-		span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", "Maximum number of evicted pods per namespace reached")))
+		klog.ErrorS(fmt.Errorf("Maximum number of evicted pods per namespace reached"), "limit", *pe.maxPodsToEvictPerNamespace, "namespace", pod.Namespace)
-		klog.ErrorS(fmt.Errorf("maximum number of evicted pods per namespace reached"), "Error evicting pod", "limit", *pe.maxPodsToEvictPerNamespace, "namespace", pod.Namespace)
 		return false
 	}
 
 	err := evictPod(ctx, pe.client, pod, pe.policyGroupVersion)
 	if err != nil {
 		// err is used only for logging purposes
-		span.AddEvent("Eviction Failed", trace.WithAttributes(attribute.String("node", pod.Spec.NodeName), attribute.String("err", err.Error())))
 		klog.ErrorS(err, "Error evicting pod", "pod", klog.KObj(pod), "reason", opts.Reason)
 		if pe.metricsEnabled {
 			metrics.PodsEvicted.With(map[string]string{"result": "error", "strategy": strategy, "namespace": pod.Namespace, "node": pod.Spec.NodeName}).Inc()

pkg/descheduler/node/node.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	clientset "k8s.io/client-go/kubernetes"
 	listersv1 "k8s.io/client-go/listers/core/v1"
 	"k8s.io/klog/v2"
@@ -121,7 +120,8 @@ func NodeFit(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, node *v
 	}
 	// Check if the pod can fit on a node based off it's requests
 	if pod.Spec.NodeName == "" || pod.Spec.NodeName != node.Name {
-		if ok, reqErrors := fitsRequest(nodeIndexer, pod, node); !ok {
+		ok, reqErrors := fitsRequest(nodeIndexer, pod, node)
+		if !ok {
 			errors = append(errors, reqErrors...)
 		}
 	}
@@ -146,11 +146,13 @@ func PodFitsAnyOtherNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.
 		if len(errors) == 0 {
 			klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 			return true
+		} else {
+			klog.V(4).InfoS("Pod does not fit on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
+			for _, err := range errors {
+				klog.V(4).InfoS(err.Error())
+			}
 		}
-		klog.V(4).InfoS("Pod does not fit on node",
-			"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
 	}
-
 	return false
 }
 
@@ -162,11 +164,13 @@ func PodFitsAnyNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod,
 		if len(errors) == 0 {
 			klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 			return true
+		} else {
+			klog.V(4).InfoS("Pod does not fit on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
+			for _, err := range errors {
+				klog.V(4).InfoS(err.Error())
+			}
 		}
-		klog.V(4).InfoS("Pod does not fit on node",
-			"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
 	}
-
 	return false
 }
 
@@ -177,11 +181,12 @@ func PodFitsCurrentNode(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.P
 	if len(errors) == 0 {
 		klog.V(4).InfoS("Pod fits on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
 		return true
+	} else {
+		klog.V(4).InfoS("Pod does not fit on node", "pod", klog.KObj(pod), "node", klog.KObj(node))
+		for _, err := range errors {
+			klog.V(4).InfoS(err.Error())
+		}
 	}
-
-	klog.V(4).InfoS("Pod does not fit on node",
-		"pod:", klog.KObj(pod), "node:", klog.KObj(node), "error:", utilerrors.NewAggregate(errors).Error())
-
 	return false
 }
 
@@ -217,12 +222,6 @@ func fitsRequest(nodeIndexer podutil.GetPodsAssignedToNodeFunc, pod *v1.Pod, nod
 			podFitsOnNode = false
 		}
 	}
-	// check pod num, at least one pod number is avaibalbe
-	if availableResources[v1.ResourcePods].MilliValue() <= 0 {
-		insufficientResources = append(insufficientResources, fmt.Errorf("insufficient %v", v1.ResourcePods))
-		podFitsOnNode = false
-	}
-
 	return podFitsOnNode, insufficientResources
 }
 
@@ -289,37 +288,3 @@ func IsBasicResource(name v1.ResourceName) bool {
 		return false
 	}
 }
-
-// GetNodeWeightGivenPodPreferredAffinity returns the weight
-// that the pod gives to a node by analyzing the soft node affinity of that pod
-// (nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution)
-func GetNodeWeightGivenPodPreferredAffinity(pod *v1.Pod, node *v1.Node) int32 {
-	totalWeight, err := utils.GetNodeWeightGivenPodPreferredAffinity(pod, node)
-	if err != nil {
-		return 0
-	}
-	return totalWeight
-}
-
-// GetBestNodeWeightGivenPodPreferredAffinity returns the best weight
-// (maximum one) that the pod gives to the best node by analyzing the soft node affinity
-// of that pod (nodeAffinity.preferredDuringSchedulingIgnoredDuringExecution)
-func GetBestNodeWeightGivenPodPreferredAffinity(pod *v1.Pod, nodes []*v1.Node) int32 {
-	var bestWeight int32 = 0
-	for _, node := range nodes {
-		weight := GetNodeWeightGivenPodPreferredAffinity(pod, node)
-		if weight > bestWeight {
-			bestWeight = weight
-		}
-	}
-	return bestWeight
-}
-
-// PodMatchNodeSelector checks if a pod node selector matches the node label.
-func PodMatchNodeSelector(pod *v1.Pod, node *v1.Node) bool {
-	matches, err := utils.PodMatchNodeSelector(pod, node)
-	if err != nil {
-		return false
-	}
-	return matches
-}

pkg/descheduler/node/node_test.go

@@ -18,7 +18,6 @@ package node
 
 import (
 	"context"
-	"errors"
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
@@ -753,136 +752,6 @@ func TestPodFitsAnyOtherNode(t *testing.T) {
 	}
 }
 
-func TestNodeFit(t *testing.T) {
-	node := test.BuildTestNode("node", 64000, 128*1000*1000*1000, 2, nil)
-	tests := []struct {
-		description string
-		pod         *v1.Pod
-		node        *v1.Node
-		podsOnNode  []*v1.Pod
-		err         error
-	}{
-		{
-			description: "insufficient cpu",
-			pod:         test.BuildTestPod("p1", 10000, 2*1000*1000*1000, "", nil),
-			node:        node,
-			podsOnNode: []*v1.Pod{
-				test.BuildTestPod("p2", 60000, 60*1000*1000*1000, "node", nil),
-			},
-			err: errors.New("insufficient cpu"),
-		},
-		{
-			description: "insufficient pod num",
-			pod:         test.BuildTestPod("p1", 1000, 2*1000*1000*1000, "", nil),
-			node:        node,
-			podsOnNode: []*v1.Pod{
-				test.BuildTestPod("p2", 1000, 2*1000*1000*1000, "node", nil),
-				test.BuildTestPod("p3", 1000, 2*1000*1000*1000, "node", nil),
-			},
-			err: errors.New("insufficient pods"),
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.description, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-			objs := []runtime.Object{tc.node, tc.pod}
-			for _, pod := range tc.podsOnNode {
-				objs = append(objs, pod)
-			}
-
-			fakeClient := fake.NewSimpleClientset(objs...)
-
-			sharedInformerFactory := informers.NewSharedInformerFactory(fakeClient, 0)
-			podInformer := sharedInformerFactory.Core().V1().Pods().Informer()
-
-			getPodsAssignedToNode, err := podutil.BuildGetPodsAssignedToNodeFunc(podInformer)
-			if err != nil {
-				t.Errorf("Build get pods assigned to node function error: %v", err)
-			}
-
-			sharedInformerFactory.Start(ctx.Done())
-			sharedInformerFactory.WaitForCacheSync(ctx.Done())
-			if errs := NodeFit(getPodsAssignedToNode, tc.pod, tc.node); (len(errs) == 0 && tc.err != nil) || errs[0].Error() != tc.err.Error() {
-				t.Errorf("Test %#v failed, got %v, expect %v", tc.description, errs, tc.err)
-			}
-		})
-	}
-}
-
-func TestBestPodNodeAffinityWeight(t *testing.T) {
-	defaultPod := test.BuildTestPod("p1", 0, 0, "node1", func(p *v1.Pod) {
-		p.Spec.Affinity = &v1.Affinity{
-			NodeAffinity: &v1.NodeAffinity{
-				PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
-					{
-						Weight: 10,
-						Preference: v1.NodeSelectorTerm{
-							MatchExpressions: []v1.NodeSelectorRequirement{
-								{
-									Key:      "key1",
-									Operator: "In",
-									Values:   []string{"value1"},
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-	})
-	tests := []struct {
-		description    string
-		pod            *v1.Pod
-		nodes          []*v1.Node
-		expectedWeight int32
-	}{
-		{
-			description: "No node matches the preferred affinity",
-			pod:         defaultPod,
-			nodes: []*v1.Node{
-				test.BuildTestNode("node2", 64000, 128*1000*1000*1000, 200, func(node *v1.Node) {
-					node.ObjectMeta.Labels = map[string]string{
-						"key2": "value2",
-					}
-				}),
-				test.BuildTestNode("node3", 64000, 128*1000*1000*1000, 200, func(node *v1.Node) {
-					node.ObjectMeta.Labels = map[string]string{
-						"key3": "value3",
-					}
-				}),
-			},
-			expectedWeight: 0,
-		},
-		{
-			description: "A single node matches the preferred affinity",
-			pod:         defaultPod,
-			nodes: []*v1.Node{
-				test.BuildTestNode("node1", 64000, 128*1000*1000*1000, 200, func(node *v1.Node) {
-					node.ObjectMeta.Labels = map[string]string{
-						"key1": "value1",
-					}
-				}),
-				test.BuildTestNode("node2", 64000, 128*1000*1000*1000, 200, func(node *v1.Node) {
-					node.ObjectMeta.Labels = map[string]string{
-						"key2": "value2",
-					}
-				}),
-			},
-			expectedWeight: 10,
-		},
-	}
-	for _, tc := range tests {
-		t.Run(tc.description, func(t *testing.T) {
-			bestWeight := GetBestNodeWeightGivenPodPreferredAffinity(tc.pod, tc.nodes)
-			if bestWeight != tc.expectedWeight {
-				t.Errorf("Test %#v failed", tc.description)
-			}
-		})
-	}
-}
-
 // createResourceList builds a small resource list of core resources
 func createResourceList(cpu, memory, ephemeralStorage int64) v1.ResourceList {
 	resourceList := make(map[v1.ResourceName]resource.Quantity)

pkg/descheduler/pod/pods.go

@@ -53,8 +53,8 @@ func WrapFilterFuncs(filters ...FilterFunc) FilterFunc {
 
 type Options struct {
 	filter             FilterFunc
-	includedNamespaces sets.Set[string]
+	includedNamespaces sets.String
-	excludedNamespaces sets.Set[string]
+	excludedNamespaces sets.String
 	labelSelector      *metav1.LabelSelector
 }
 
@@ -71,13 +71,13 @@ func (o *Options) WithFilter(filter FilterFunc) *Options {
 }
 
 // WithNamespaces sets included namespaces
-func (o *Options) WithNamespaces(namespaces sets.Set[string]) *Options {
+func (o *Options) WithNamespaces(namespaces sets.String) *Options {
 	o.includedNamespaces = namespaces
 	return o
 }
 
 // WithoutNamespaces sets excluded namespaces
-func (o *Options) WithoutNamespaces(namespaces sets.Set[string]) *Options {
+func (o *Options) WithoutNamespaces(namespaces sets.String) *Options {
 	o.excludedNamespaces = namespaces
 	return o
 }
@@ -157,20 +157,6 @@ func BuildGetPodsAssignedToNodeFunc(podInformer cache.SharedIndexInformer) (GetP
 	return getPodsAssignedToNode, nil
 }
 
-// ListPodsOnNodes returns all pods on given nodes.
-func ListPodsOnNodes(nodes []*v1.Node, getPodsAssignedToNode GetPodsAssignedToNodeFunc, filter FilterFunc) ([]*v1.Pod, error) {
-	pods := make([]*v1.Pod, 0)
-	for _, node := range nodes {
-		podsOnNode, err := ListPodsOnANode(node.Name, getPodsAssignedToNode, filter)
-		if err != nil {
-			return nil, err
-		}
-
-		pods = append(pods, podsOnNode...)
-	}
-	return pods, nil
-}
-
 // ListPodsOnANode lists all pods on a node.
 // It also accepts a "filter" function which can be used to further limit the pods that are returned.
 // (Usually this is podEvictor.Evictable().IsEvictable, in order to only list the evictable pods on a node, but can
@@ -201,15 +187,6 @@ func ListAllPodsOnANode(
 	return pods, nil
 }
 
-func GroupByNamespace(pods []*v1.Pod) map[string][]*v1.Pod {
-	m := make(map[string][]*v1.Pod)
-	for i := 0; i < len(pods); i++ {
-		pod := pods[i]
-		m[pod.Namespace] = append(m[pod.Namespace], pod)
-	}
-	return m
-}
-
 // OwnerRef returns the ownerRefList for the pod.
 func OwnerRef(pod *v1.Pod) []metav1.OwnerReference {
 	return pod.ObjectMeta.GetOwnerReferences()

pkg/descheduler/policyconfig.go

@@ -21,22 +21,20 @@ import (
 	"fmt"
 	"os"
 
-	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
 
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/api/v1alpha2"
 	"sigs.k8s.io/descheduler/pkg/descheduler/scheme"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
-func LoadPolicyConfig(policyConfigFile string, client clientset.Interface, registry pluginregistry.Registry) (*api.DeschedulerPolicy, error) {
+func LoadPolicyConfig(policyConfigFile string, client clientset.Interface, registry pluginbuilder.Registry) (*api.DeschedulerPolicy, error) {
 	if policyConfigFile == "" {
 		klog.V(1).InfoS("Policy config file not specified")
 		return nil, nil
@@ -47,110 +45,171 @@ func LoadPolicyConfig(policyConfigFile string, client clientset.Interface, regis
 		return nil, fmt.Errorf("failed to read policy config file %q: %+v", policyConfigFile, err)
 	}
 
-	return decode(policyConfigFile, policy, client, registry)
+	versionedPolicy := &v1alpha1.DeschedulerPolicy{}
-}
 
-func decode(policyConfigFile string, policy []byte, client clientset.Interface, registry pluginregistry.Registry) (*api.DeschedulerPolicy, error) {
+	decoder := scheme.Codecs.UniversalDecoder(v1alpha1.SchemeGroupVersion)
-	internalPolicy := &api.DeschedulerPolicy{}
+	if err := runtime.DecodeInto(decoder, policy, versionedPolicy); err != nil {
-	var err error
-
-	decoder := scheme.Codecs.UniversalDecoder(v1alpha1.SchemeGroupVersion, v1alpha2.SchemeGroupVersion, api.SchemeGroupVersion)
-	if err := runtime.DecodeInto(decoder, policy, internalPolicy); err != nil {
 		return nil, fmt.Errorf("failed decoding descheduler's policy config %q: %v", policyConfigFile, err)
 	}
 
-	err = validateDeschedulerConfiguration(*internalPolicy, registry)
+	// Build profiles
+	internalPolicy, err := V1alpha1ToInternal(client, versionedPolicy, registry)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed converting versioned policy to internal policy version: %v", err)
 	}
 
-	setDefaults(*internalPolicy, registry, client)
-
 	return internalPolicy, nil
 }
 
-func setDefaults(in api.DeschedulerPolicy, registry pluginregistry.Registry, client clientset.Interface) *api.DeschedulerPolicy {
+func V1alpha1ToInternal(
-	for idx, profile := range in.Profiles {
+	client clientset.Interface,
-		// If we need to set defaults coming from loadtime in each profile we do it here
+	deschedulerPolicy *v1alpha1.DeschedulerPolicy,
-		in.Profiles[idx] = setDefaultEvictor(profile, client)
+	registry pluginbuilder.Registry,
-		for _, pluginConfig := range profile.PluginConfigs {
+) (*api.DeschedulerPolicy, error) {
-			setDefaultsPluginConfig(&pluginConfig, registry)
+	var evictLocalStoragePods bool
+	if deschedulerPolicy.EvictLocalStoragePods != nil {
+		evictLocalStoragePods = *deschedulerPolicy.EvictLocalStoragePods
+	}
+
+	evictBarePods := false
+	if deschedulerPolicy.EvictFailedBarePods != nil {
+		evictBarePods = *deschedulerPolicy.EvictFailedBarePods
+		if evictBarePods {
+			klog.V(1).InfoS("Warning: EvictFailedBarePods is set to True. This could cause eviction of pods without ownerReferences.")
 		}
 	}
-	return &in
-}
 
-func setDefaultsPluginConfig(pluginConfig *api.PluginConfig, registry pluginregistry.Registry) {
+	evictSystemCriticalPods := false
-	if _, ok := registry[pluginConfig.Name]; ok {
+	if deschedulerPolicy.EvictSystemCriticalPods != nil {
-		pluginUtilities := registry[pluginConfig.Name]
+		evictSystemCriticalPods = *deschedulerPolicy.EvictSystemCriticalPods
-		if pluginUtilities.PluginArgDefaulter != nil {
+		if evictSystemCriticalPods {
-			pluginUtilities.PluginArgDefaulter(pluginConfig.Args)
+			klog.V(1).InfoS("Warning: EvictSystemCriticalPods is set to True. This could cause eviction of Kubernetes system pods.")
 		}
 	}
-}
 
-func findPluginName(names []string, key string) bool {
+	ignorePvcPods := false
-	for _, name := range names {
+	if deschedulerPolicy.IgnorePVCPods != nil {
-		if name == key {
+		ignorePvcPods = *deschedulerPolicy.IgnorePVCPods
-			return true
-		}
-	}
-	return false
-}
-
-func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interface) api.DeschedulerProfile {
-	newPluginConfig := api.PluginConfig{
-		Name: defaultevictor.PluginName,
-		Args: &defaultevictor.DefaultEvictorArgs{
-			EvictLocalStoragePods:   false,
-			EvictSystemCriticalPods: false,
-			IgnorePvcPods:           false,
-			EvictFailedBarePods:     false,
-		},
 	}
 
-	// Always enable DefaultEvictor plugin for filter/preEvictionFilter extension points
+	var profiles []api.Profile
-	if !findPluginName(profile.Plugins.Filter.Enabled, defaultevictor.PluginName) {
-		profile.Plugins.Filter.Enabled = append([]string{defaultevictor.PluginName}, profile.Plugins.Filter.Enabled...)
-	}
 
-	if !findPluginName(profile.Plugins.PreEvictionFilter.Enabled, defaultevictor.PluginName) {
+	// Build profiles
-		profile.Plugins.PreEvictionFilter.Enabled = append([]string{defaultevictor.PluginName}, profile.Plugins.PreEvictionFilter.Enabled...)
+	for name, strategy := range deschedulerPolicy.Strategies {
-	}
+		if _, ok := pluginbuilder.PluginRegistry[string(name)]; ok {
+			if strategy.Enabled {
+				params := strategy.Params
+				if params == nil {
+					params = &v1alpha1.StrategyParameters{}
+				}
 
-	defaultevictorPluginConfig, idx := GetPluginConfig(defaultevictor.PluginName, profile.PluginConfigs)
+				nodeFit := false
-	if defaultevictorPluginConfig == nil {
+				if name != "PodLifeTime" {
-		profile.PluginConfigs = append([]api.PluginConfig{newPluginConfig}, profile.PluginConfigs...)
+					nodeFit = params.NodeFit
-		defaultevictorPluginConfig = &newPluginConfig
+				}
-		idx = 0
-	}
 
-	thresholdPriority, err := utils.GetPriorityValueFromPriorityThreshold(context.TODO(), client, defaultevictorPluginConfig.Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold)
+				// TODO(jchaloup): once all strategies are migrated move this check under
-	if err != nil {
+				// the default evictor args validation
-		klog.Error(err, "Failed to get threshold priority from args")
+				if params.ThresholdPriority != nil && params.ThresholdPriorityClassName != "" {
-	}
+					klog.ErrorS(fmt.Errorf("priority threshold misconfigured"), "only one of priorityThreshold fields can be set", "pluginName", name)
-	profile.PluginConfigs[idx].Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold = &api.PriorityThreshold{}
+					return nil, fmt.Errorf("priority threshold misconfigured for plugin %v", name)
-	profile.PluginConfigs[idx].Args.(*defaultevictor.DefaultEvictorArgs).PriorityThreshold.Value = &thresholdPriority
+				}
-	return profile
+				var priorityThreshold *api.PriorityThreshold
-}
+				if strategy.Params != nil {
+					priorityThreshold = &api.PriorityThreshold{
+						Value: strategy.Params.ThresholdPriority,
+						Name:  strategy.Params.ThresholdPriorityClassName,
+					}
+				}
+				thresholdPriority, err := utils.GetPriorityFromStrategyParams(context.TODO(), client, priorityThreshold)
+				if err != nil {
+					klog.ErrorS(err, "Failed to get threshold priority from strategy's params")
+					return nil, fmt.Errorf("failed to get threshold priority from strategy's params: %v", err)
+				}
 
-func validateDeschedulerConfiguration(in api.DeschedulerPolicy, registry pluginregistry.Registry) error {
+				var pluginConfig *api.PluginConfig
-	var errorsInProfiles []error
+				if pcFnc, exists := strategyParamsToPluginArgs[string(name)]; exists {
-	for _, profile := range in.Profiles {
+					pluginConfig, err = pcFnc(params)
-		for _, pluginConfig := range profile.PluginConfigs {
+					if err != nil {
-			if _, ok := registry[pluginConfig.Name]; !ok {
+						klog.ErrorS(err, "skipping strategy", "strategy", name)
-				errorsInProfiles = append(errorsInProfiles, fmt.Errorf("in profile %s: plugin %s in pluginConfig not registered", profile.Name, pluginConfig.Name))
+						return nil, fmt.Errorf("failed to get plugin config for strategy %v: %v", name, err)
-				continue
+					}
-			}
+				} else {
-
+					klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
-			pluginUtilities := registry[pluginConfig.Name]
+					return nil, fmt.Errorf("unknown strategy name: %v", name)
-			if pluginUtilities.PluginArgValidator == nil {
+				}
-				continue
+
-			}
+				profile := api.Profile{
-			if err := pluginUtilities.PluginArgValidator(pluginConfig.Args); err != nil {
+					Name: fmt.Sprintf("strategy-%v-profile", name),
-				errorsInProfiles = append(errorsInProfiles, fmt.Errorf("in profile %s: %s", profile.Name, err.Error()))
+					PluginConfigs: []api.PluginConfig{
+						{
+							Name: defaultevictor.PluginName,
+							Args: &defaultevictor.DefaultEvictorArgs{
+								EvictLocalStoragePods:   evictLocalStoragePods,
+								EvictSystemCriticalPods: evictSystemCriticalPods,
+								IgnorePvcPods:           ignorePvcPods,
+								EvictFailedBarePods:     evictBarePods,
+								NodeFit:                 nodeFit,
+								PriorityThreshold: &api.PriorityThreshold{
+									Value: &thresholdPriority,
+								},
+							},
+						},
+						*pluginConfig,
+					},
+					Plugins: api.Plugins{
+						Evict: api.PluginSet{
+							Enabled: []string{defaultevictor.PluginName},
+						},
+					},
+				}
+
+				pluginArgs := registry[string(name)].PluginArgInstance
+				pluginInstance, err := registry[string(name)].PluginBuilder(pluginArgs, &handleImpl{})
+				if err != nil {
+					klog.ErrorS(fmt.Errorf("could not build plugin"), "plugin build error", "plugin", name)
+					return nil, fmt.Errorf("could not build plugin: %v", name)
+				}
+
+				// pluginInstance can be of any of each type, or both
+				profilePlugins := profile.Plugins
+				profile.Plugins = enableProfilePluginsByType(profilePlugins, pluginInstance, pluginConfig)
+				profiles = append(profiles, profile)
 			}
+		} else {
+			klog.ErrorS(fmt.Errorf("unknown strategy name"), "skipping strategy", "strategy", name)
+			return nil, fmt.Errorf("unknown strategy name: %v", name)
 		}
 	}
-	return utilerrors.NewAggregate(errorsInProfiles)
+
+	return &api.DeschedulerPolicy{
+		Profiles:                       profiles,
+		NodeSelector:                   deschedulerPolicy.NodeSelector,
+		MaxNoOfPodsToEvictPerNode:      deschedulerPolicy.MaxNoOfPodsToEvictPerNode,
+		MaxNoOfPodsToEvictPerNamespace: deschedulerPolicy.MaxNoOfPodsToEvictPerNamespace,
+	}, nil
+}
+
+func enableProfilePluginsByType(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
+	profilePlugins = checkBalance(profilePlugins, pluginInstance, pluginConfig)
+	profilePlugins = checkDeschedule(profilePlugins, pluginInstance, pluginConfig)
+	return profilePlugins
+}
+
+func checkBalance(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
+	switch p := pluginInstance.(type) {
+	case framework.BalancePlugin:
+		klog.V(3).Info("converting Balance plugin: %s", p.Name())
+		profilePlugins.Balance.Enabled = []string{pluginConfig.Name}
+	}
+	return profilePlugins
+}
+
+func checkDeschedule(profilePlugins api.Plugins, pluginInstance framework.Plugin, pluginConfig *api.PluginConfig) api.Plugins {
+	switch p := pluginInstance.(type) {
+	case framework.DeschedulePlugin:
+		klog.V(3).Info("converting Deschedule plugin: %s", p.Name())
+		profilePlugins.Deschedule.Enabled = []string{pluginConfig.Name}
+	}
+	return profilePlugins
 }

pkg/descheduler/policyconfig_test.go

@@ -21,15 +21,13 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	v1 "k8s.io/api/core/v1"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	utilpointer "k8s.io/utils/pointer"
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
@@ -46,10 +44,13 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 		Name: defaultevictor.PluginName,
 		Args: &defaultevictor.DefaultEvictorArgs{
 			PriorityThreshold: &api.PriorityThreshold{
-				Value: nil,
+				Value: utilpointer.Int32(utils.SystemCriticalPriority),
 			},
 		},
 	}
+	defaultEvictorPluginSet := api.PluginSet{
+		Enabled: []string{defaultevictor.PluginName},
+	}
 	type testCase struct {
 		description string
 		policy      *v1alpha1.DeschedulerPolicy
@@ -91,7 +92,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 				},
 			},
 			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
+				Profiles: []api.Profile{
 					{
 						Name: fmt.Sprintf("strategy-%s-profile", removeduplicates.PluginName),
 						PluginConfigs: []api.PluginConfig{
@@ -111,12 +112,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{removeduplicates.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					// Disabled strategy is not generating internal plugin since it is not being used internally currently
@@ -204,7 +200,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 				},
 			},
 			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
+				Profiles: []api.Profile{
 					{
 						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.HighNodeUtilizationPluginName),
 						PluginConfigs: []api.PluginConfig{
@@ -224,12 +220,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{nodeutilization.HighNodeUtilizationPluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -256,12 +247,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{nodeutilization.LowNodeUtilizationPluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -277,12 +263,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{removeduplicates.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -298,12 +279,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removefailedpods.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -321,12 +297,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -342,12 +313,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatinginterpodantiaffinity.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -365,12 +331,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatingnodeaffinity.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -386,12 +347,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatingnodetaints.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -400,22 +356,14 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							defaultEvictorPluginConfig,
 							{
 								Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
+								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{},
-									Constraints:            []v1.UnsatisfiableConstraintAction{v1.DoNotSchedule},
-									TopologyBalanceNodeFit: utilpointer.Bool(true),
-								},
 							},
 						},
 						Plugins: api.Plugins{
 							Balance: api.PluginSet{
 								Enabled: []string{removepodsviolatingtopologyspreadconstraint.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 				},
@@ -509,7 +457,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 				},
 			},
 			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
+				Profiles: []api.Profile{
 					{
 						Name: fmt.Sprintf("strategy-%s-profile", nodeutilization.HighNodeUtilizationPluginName),
 						PluginConfigs: []api.PluginConfig{
@@ -529,12 +477,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{nodeutilization.HighNodeUtilizationPluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -563,12 +506,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{nodeutilization.LowNodeUtilizationPluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -586,12 +524,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{removeduplicates.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -612,12 +545,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removefailedpods.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -636,12 +564,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -657,12 +580,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatinginterpodantiaffinity.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -680,12 +598,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatingnodeaffinity.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -703,12 +616,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Deschedule: api.PluginSet{
 								Enabled: []string{removepodsviolatingnodetaints.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 					{
@@ -718,8 +626,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							{
 								Name: removepodsviolatingtopologyspreadconstraint.PluginName,
 								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-									Constraints:            []v1.UnsatisfiableConstraintAction{v1.DoNotSchedule, v1.ScheduleAnyway},
+									IncludeSoftConstraints: true,
-									TopologyBalanceNodeFit: utilpointer.Bool(true),
 								},
 							},
 						},
@@ -727,12 +634,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 							Balance: api.PluginSet{
 								Enabled: []string{removepodsviolatingtopologyspreadconstraint.PluginName},
 							},
-							Filter: api.PluginSet{
+							Evict: defaultEvictorPluginSet,
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
 						},
 					},
 				},
@@ -779,9 +681,8 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			result := &api.DeschedulerPolicy{}
+			client := fakeclientset.NewSimpleClientset()
-			scope := scope{}
+			result, err := V1alpha1ToInternal(client, tc.policy, pluginbuilder.PluginRegistry)
-			err := v1alpha1.V1alpha1ToInternal(tc.policy, pluginregistry.PluginRegistry, result, scope)
 			if err != nil {
 				if err.Error() != tc.err.Error() {
 					t.Errorf("unexpected error: %s", err.Error())
@@ -789,7 +690,7 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 			}
 			if err == nil {
 				// sort to easily compare deepequality
-				result.Profiles = api.SortDeschedulerProfileByName(result.Profiles)
+				result.Profiles = api.SortProfilesByName(result.Profiles)
 				diff := cmp.Diff(tc.result, result)
 				if diff != "" {
 					t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
@@ -798,429 +699,3 @@ func TestV1alpha1ToV1alpha2(t *testing.T) {
 		})
 	}
 }
-
-func TestDecodeVersionedPolicy(t *testing.T) {
-	client := fakeclientset.NewSimpleClientset()
-	SetupPlugins()
-	defaultEvictorPluginConfig := api.PluginConfig{
-		Name: defaultevictor.PluginName,
-		Args: &defaultevictor.DefaultEvictorArgs{
-			PriorityThreshold: &api.PriorityThreshold{
-				Value: utilpointer.Int32(utils.SystemCriticalPriority),
-			},
-		},
-	}
-	type testCase struct {
-		description string
-		policy      []byte
-		err         error
-		result      *api.DeschedulerPolicy
-	}
-	testCases := []testCase{
-		{
-			description: "v1alpha1 to internal",
-			policy: []byte(`apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-    enabled: true
-    params:
-      podLifeTime:
-        maxPodLifeTimeSeconds: 5
-      namespaces:
-        include:
-          - "testleaderelection-a"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", podlifetime.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							defaultEvictorPluginConfig,
-							{
-								Name: podlifetime.PluginName,
-								Args: &podlifetime.PodLifeTimeArgs{
-									Namespaces: &api.Namespaces{
-										Include: []string{"testleaderelection-a"},
-									},
-									MaxPodLifeTimeSeconds: utilpointer.Uint(5),
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							Deschedule: api.PluginSet{
-								Enabled: []string{podlifetime.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "v1alpha1 to internal with priorityThreshold",
-			policy: []byte(`apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-    enabled: true
-    params:
-      podLifeTime:
-        maxPodLifeTimeSeconds: 5
-      namespaces:
-        include:
-          - "testleaderelection-a"
-      thresholdPriority: null
-      thresholdPriorityClassName: prioritym
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: fmt.Sprintf("strategy-%s-profile", podlifetime.PluginName),
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: "DefaultEvictor",
-								Args: &defaultevictor.DefaultEvictorArgs{
-									PriorityThreshold: &api.PriorityThreshold{
-										Value: utilpointer.Int32(0),
-									},
-								},
-							},
-							{
-								Name: podlifetime.PluginName,
-								Args: &podlifetime.PodLifeTimeArgs{
-									Namespaces: &api.Namespaces{
-										Include: []string{"testleaderelection-a"},
-									},
-									MaxPodLifeTimeSeconds: utilpointer.Uint(5),
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							Deschedule: api.PluginSet{
-								Enabled: []string{podlifetime.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "v1alpha1 to internal with priorityThreshold value and name should return error",
-			policy: []byte(`apiVersion: "descheduler/v1alpha1"
-kind: "DeschedulerPolicy"
-strategies:
-  "PodLifeTime":
-    enabled: true
-    params:
-      podLifeTime:
-        maxPodLifeTimeSeconds: 5
-      namespaces:
-        include:
-          - "testleaderelection-a"
-      thresholdPriority: 222
-      thresholdPriorityClassName: prioritym
-`),
-			result: nil,
-			err:    fmt.Errorf("failed decoding descheduler's policy config \"filename\": priority threshold misconfigured for plugin PodLifeTime"),
-		},
-		{
-			description: "v1alpha2 to internal",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        evictSystemCriticalPods: true
-        evictFailedBarePods: true
-        evictLocalStoragePods: true
-        nodeFit: true
-    - name: "RemovePodsHavingTooManyRestarts"
-      args:
-        podRestartThreshold: 100
-        includingInitContainers: true
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									EvictSystemCriticalPods: true,
-									EvictFailedBarePods:     true,
-									EvictLocalStoragePods:   true,
-									PriorityThreshold:       &api.PriorityThreshold{Value: utilpointer.Int32(2000000000)},
-									NodeFit:                 true,
-								},
-							},
-							{
-								Name: removepodshavingtoomanyrestarts.PluginName,
-								Args: &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
-									PodRestartThreshold:     100,
-									IncludingInitContainers: true,
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			result, err := decode("filename", tc.policy, client, pluginregistry.PluginRegistry)
-			if err != nil {
-				if tc.err == nil {
-					t.Errorf("unexpected error: %s.", err.Error())
-				} else if err.Error() != tc.err.Error() {
-					t.Errorf("unexpected error: %s. Was expecting %s", err.Error(), tc.err.Error())
-				}
-			}
-			diff := cmp.Diff(tc.result, result)
-			if diff != "" && err == nil {
-				t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-			}
-		})
-	}
-}
-
-func TestValidateDeschedulerConfiguration(t *testing.T) {
-	SetupPlugins()
-	type testCase struct {
-		description       string
-		deschedulerPolicy api.DeschedulerPolicy
-		result            error
-	}
-	testCases := []testCase{
-		{
-			description: "multiple errors",
-			deschedulerPolicy: api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: removefailedpods.PluginName,
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{Enabled: []string{removefailedpods.PluginName}},
-						},
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: removefailedpods.PluginName,
-								Args: &removefailedpods.RemoveFailedPodsArgs{
-									Namespaces: &api.Namespaces{
-										Include: []string{"test1"},
-										Exclude: []string{"test1"},
-									},
-								},
-							},
-						},
-					},
-					{
-						Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-						Plugins: api.Plugins{
-							Deschedule: api.PluginSet{Enabled: []string{removepodsviolatingtopologyspreadconstraint.PluginName}},
-						},
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: removepodsviolatingtopologyspreadconstraint.PluginName,
-								Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-									Namespaces: &api.Namespaces{
-										Include: []string{"test1"},
-										Exclude: []string{"test1"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			result: fmt.Errorf("[in profile RemoveFailedPods: only one of Include/Exclude namespaces can be set, in profile RemovePodsViolatingTopologySpreadConstraint: only one of Include/Exclude namespaces can be set]"),
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			result := validateDeschedulerConfiguration(tc.deschedulerPolicy, pluginregistry.PluginRegistry)
-			if result.Error() != tc.result.Error() {
-				t.Errorf("test '%s' failed. expected \n'%s', got \n'%s'", tc.description, tc.result, result)
-			}
-		})
-	}
-}
-
-func TestDecodeDefaults(t *testing.T) {
-	client := fakeclientset.NewSimpleClientset()
-	SetupPlugins()
-	type testCase struct {
-		description string
-		policy      []byte
-		err         error
-		result      *api.DeschedulerPolicy
-	}
-	testCases := []testCase{
-		{
-			description: "use empty RemoveFailedPods, check MinPodLifetimeSeconds default",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        evictSystemCriticalPods: true
-        evictFailedBarePods: true
-        evictLocalStoragePods: true
-        nodeFit: true
-    - name: "RemoveFailedPods"
-    plugins:
-      filter:
-        enabled:
-          - "DefaultEvictor"
-      preEvictionFilter:
-        enabled:
-          - "DefaultEvictor"
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									EvictSystemCriticalPods: true,
-									EvictFailedBarePods:     true,
-									EvictLocalStoragePods:   true,
-									PriorityThreshold:       &api.PriorityThreshold{Value: utilpointer.Int32(2000000000)},
-									NodeFit:                 true,
-								},
-							},
-							{
-								Name: removefailedpods.PluginName,
-								Args: &removefailedpods.RemoveFailedPodsArgs{
-									MinPodLifetimeSeconds: utilpointer.Uint(3600),
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			description: "omit default evictor extension point with their enablement",
-			policy: []byte(`apiVersion: "descheduler/v1alpha2"
-kind: "DeschedulerPolicy"
-profiles:
-  - name: ProfileName
-    pluginConfig:
-    - name: "DefaultEvictor"
-      args:
-        evictSystemCriticalPods: true
-        evictFailedBarePods: true
-        evictLocalStoragePods: true
-        nodeFit: true
-    - name: "RemoveFailedPods"
-    plugins:
-      deschedule:
-        enabled:
-          - "RemovePodsHavingTooManyRestarts"
-`),
-			result: &api.DeschedulerPolicy{
-				Profiles: []api.DeschedulerProfile{
-					{
-						Name: "ProfileName",
-						PluginConfigs: []api.PluginConfig{
-							{
-								Name: defaultevictor.PluginName,
-								Args: &defaultevictor.DefaultEvictorArgs{
-									EvictSystemCriticalPods: true,
-									EvictFailedBarePods:     true,
-									EvictLocalStoragePods:   true,
-									PriorityThreshold:       &api.PriorityThreshold{Value: utilpointer.Int32(2000000000)},
-									NodeFit:                 true,
-								},
-							},
-							{
-								Name: removefailedpods.PluginName,
-								Args: &removefailedpods.RemoveFailedPodsArgs{
-									MinPodLifetimeSeconds: utilpointer.Uint(3600),
-								},
-							},
-						},
-						Plugins: api.Plugins{
-							Filter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							PreEvictionFilter: api.PluginSet{
-								Enabled: []string{defaultevictor.PluginName},
-							},
-							Deschedule: api.PluginSet{
-								Enabled: []string{removepodshavingtoomanyrestarts.PluginName},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			result, err := decode("filename", tc.policy, client, pluginregistry.PluginRegistry)
-			if err != nil {
-				if tc.err == nil {
-					t.Errorf("unexpected error: %s.", err.Error())
-				} else {
-					t.Errorf("unexpected error: %s. Was expecting %s", err.Error(), tc.err.Error())
-				}
-			}
-			diff := cmp.Diff(tc.result, result)
-			if diff != "" && err == nil {
-				t.Errorf("test '%s' failed. Results are not deep equal. mismatch (-want +got):\n%s", tc.description, diff)
-			}
-		})
-	}
-}

pkg/descheduler/scheme/scheme.go

@@ -22,19 +22,8 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/api/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/api/v1alpha2"
 	"sigs.k8s.io/descheduler/pkg/apis/componentconfig"
 	componentconfigv1alpha1 "sigs.k8s.io/descheduler/pkg/apis/componentconfig/v1alpha1"
-	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	"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"
 )
 
 var (
@@ -44,23 +33,8 @@ var (
 
 func init() {
 	utilruntime.Must(api.AddToScheme(Scheme))
-	utilruntime.Must(defaultevictor.AddToScheme(Scheme))
+	utilruntime.Must(v1alpha1.AddToScheme(Scheme))
-	utilruntime.Must(nodeutilization.AddToScheme(Scheme))
-	utilruntime.Must(podlifetime.AddToScheme(Scheme))
-	utilruntime.Must(removeduplicates.AddToScheme(Scheme))
-	utilruntime.Must(removefailedpods.AddToScheme(Scheme))
-	utilruntime.Must(removepodshavingtoomanyrestarts.AddToScheme(Scheme))
-	utilruntime.Must(removepodsviolatinginterpodantiaffinity.AddToScheme(Scheme))
-	utilruntime.Must(removepodsviolatingnodeaffinity.AddToScheme(Scheme))
-	utilruntime.Must(removepodsviolatingnodetaints.AddToScheme(Scheme))
-	utilruntime.Must(removepodsviolatingtopologyspreadconstraint.AddToScheme(Scheme))
 
 	utilruntime.Must(componentconfig.AddToScheme(Scheme))
 	utilruntime.Must(componentconfigv1alpha1.AddToScheme(Scheme))
-	utilruntime.Must(v1alpha1.AddToScheme(Scheme))
-	utilruntime.Must(v1alpha2.AddToScheme(Scheme))
-	utilruntime.Must(Scheme.SetVersionPriority(
-		v1alpha2.SchemeGroupVersion,
-		v1alpha1.SchemeGroupVersion,
-	))
 }

pkg/descheduler/setupplugins.go

@@ -17,9 +17,9 @@ limitations under the License.
 package descheduler
 
 import (
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
+	"sigs.k8s.io/descheduler/pkg/framework/plugins/pluginbuilder"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removefailedpods"
@@ -31,20 +31,20 @@ import (
 )
 
 func SetupPlugins() {
-	pluginregistry.PluginRegistry = pluginregistry.NewRegistry()
+	pluginbuilder.PluginRegistry = pluginbuilder.NewRegistry()
-	RegisterDefaultPlugins(pluginregistry.PluginRegistry)
+	RegisterDefaultPlugins(pluginbuilder.PluginRegistry)
 }
 
-func RegisterDefaultPlugins(registry pluginregistry.Registry) {
+func RegisterDefaultPlugins(registry pluginbuilder.Registry) {
-	pluginregistry.Register(defaultevictor.PluginName, defaultevictor.New, &defaultevictor.DefaultEvictor{}, &defaultevictor.DefaultEvictorArgs{}, defaultevictor.ValidateDefaultEvictorArgs, defaultevictor.SetDefaults_DefaultEvictorArgs, registry)
+	pluginbuilder.Register(defaultevictor.PluginName, defaultevictor.New, &defaultevictor.DefaultEvictorArgs{}, registry)
-	pluginregistry.Register(nodeutilization.LowNodeUtilizationPluginName, nodeutilization.NewLowNodeUtilization, &nodeutilization.LowNodeUtilization{}, &nodeutilization.LowNodeUtilizationArgs{}, nodeutilization.ValidateLowNodeUtilizationArgs, nodeutilization.SetDefaults_LowNodeUtilizationArgs, registry)
+	pluginbuilder.Register(nodeutilization.LowNodeUtilizationPluginName, nodeutilization.NewLowNodeUtilization, &nodeutilization.LowNodeUtilizationArgs{}, registry)
-	pluginregistry.Register(nodeutilization.HighNodeUtilizationPluginName, nodeutilization.NewHighNodeUtilization, &nodeutilization.HighNodeUtilization{}, &nodeutilization.HighNodeUtilizationArgs{}, nodeutilization.ValidateHighNodeUtilizationArgs, nodeutilization.SetDefaults_HighNodeUtilizationArgs, registry)
+	pluginbuilder.Register(nodeutilization.HighNodeUtilizationPluginName, nodeutilization.NewHighNodeUtilization, &nodeutilization.HighNodeUtilizationArgs{}, registry)
-	pluginregistry.Register(podlifetime.PluginName, podlifetime.New, &podlifetime.PodLifeTime{}, &podlifetime.PodLifeTimeArgs{}, podlifetime.ValidatePodLifeTimeArgs, podlifetime.SetDefaults_PodLifeTimeArgs, registry)
+	pluginbuilder.Register(podlifetime.PluginName, podlifetime.New, &podlifetime.PodLifeTimeArgs{}, registry)
-	pluginregistry.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicates{}, &removeduplicates.RemoveDuplicatesArgs{}, removeduplicates.ValidateRemoveDuplicatesArgs, removeduplicates.SetDefaults_RemoveDuplicatesArgs, registry)
+	pluginbuilder.Register(removeduplicates.PluginName, removeduplicates.New, &removeduplicates.RemoveDuplicatesArgs{}, registry)
-	pluginregistry.Register(removefailedpods.PluginName, removefailedpods.New, &removefailedpods.RemoveFailedPods{}, &removefailedpods.RemoveFailedPodsArgs{}, removefailedpods.ValidateRemoveFailedPodsArgs, removefailedpods.SetDefaults_RemoveFailedPodsArgs, registry)
+	pluginbuilder.Register(removefailedpods.PluginName, removefailedpods.New, &removefailedpods.RemoveFailedPodsArgs{}, registry)
-	pluginregistry.Register(removepodshavingtoomanyrestarts.PluginName, removepodshavingtoomanyrestarts.New, &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestarts{}, &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{}, removepodshavingtoomanyrestarts.ValidateRemovePodsHavingTooManyRestartsArgs, removepodshavingtoomanyrestarts.SetDefaults_RemovePodsHavingTooManyRestartsArgs, registry)
+	pluginbuilder.Register(removepodshavingtoomanyrestarts.PluginName, removepodshavingtoomanyrestarts.New, &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{}, registry)
-	pluginregistry.Register(removepodsviolatinginterpodantiaffinity.PluginName, removepodsviolatinginterpodantiaffinity.New, &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinity{}, &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{}, removepodsviolatinginterpodantiaffinity.ValidateRemovePodsViolatingInterPodAntiAffinityArgs, removepodsviolatinginterpodantiaffinity.SetDefaults_RemovePodsViolatingInterPodAntiAffinityArgs, registry)
+	pluginbuilder.Register(removepodsviolatinginterpodantiaffinity.PluginName, removepodsviolatinginterpodantiaffinity.New, &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{}, registry)
-	pluginregistry.Register(removepodsviolatingnodeaffinity.PluginName, removepodsviolatingnodeaffinity.New, &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinity{}, &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{}, removepodsviolatingnodeaffinity.ValidateRemovePodsViolatingNodeAffinityArgs, removepodsviolatingnodeaffinity.SetDefaults_RemovePodsViolatingNodeAffinityArgs, registry)
+	pluginbuilder.Register(removepodsviolatingnodeaffinity.PluginName, removepodsviolatingnodeaffinity.New, &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{}, registry)
-	pluginregistry.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaints{}, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, removepodsviolatingnodetaints.ValidateRemovePodsViolatingNodeTaintsArgs, removepodsviolatingnodetaints.SetDefaults_RemovePodsViolatingNodeTaintsArgs, registry)
+	pluginbuilder.Register(removepodsviolatingnodetaints.PluginName, removepodsviolatingnodetaints.New, &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{}, registry)
-	pluginregistry.Register(removepodsviolatingtopologyspreadconstraint.PluginName, removepodsviolatingtopologyspreadconstraint.New, &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraint{}, &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{}, removepodsviolatingtopologyspreadconstraint.ValidateRemovePodsViolatingTopologySpreadConstraintArgs, removepodsviolatingtopologyspreadconstraint.SetDefaults_RemovePodsViolatingTopologySpreadConstraintArgs, registry)
+	pluginbuilder.Register(removepodsviolatingtopologyspreadconstraint.PluginName, removepodsviolatingtopologyspreadconstraint.New, &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{}, registry)
 }

pkg/descheduler/strategy_migration.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2023 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package descheduler
 
 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/api/v1alpha1"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
@@ -38,8 +37,8 @@ import (
 // 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){
+var strategyParamsToPluginArgs = map[string]func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error){
-	"RemovePodsViolatingNodeTaints": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemovePodsViolatingNodeTaints": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		args := &removepodsviolatingnodetaints.RemovePodsViolatingNodeTaintsArgs{
 			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
 			LabelSelector:           params.LabelSelector,
@@ -55,10 +54,10 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemoveFailedPods": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemoveFailedPods": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		failedPodsParams := params.FailedPods
 		if failedPodsParams == nil {
-			failedPodsParams = &FailedPods{}
+			failedPodsParams = &v1alpha1.FailedPods{}
 		}
 		args := &removefailedpods.RemoveFailedPodsArgs{
 			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
@@ -77,7 +76,7 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemovePodsViolatingNodeAffinity": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemovePodsViolatingNodeAffinity": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		args := &removepodsviolatingnodeaffinity.RemovePodsViolatingNodeAffinityArgs{
 			Namespaces:       v1alpha1NamespacesToInternal(params.Namespaces),
 			LabelSelector:    params.LabelSelector,
@@ -92,7 +91,7 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemovePodsViolatingInterPodAntiAffinity": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemovePodsViolatingInterPodAntiAffinity": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		args := &removepodsviolatinginterpodantiaffinity.RemovePodsViolatingInterPodAntiAffinityArgs{
 			Namespaces:    v1alpha1NamespacesToInternal(params.Namespaces),
 			LabelSelector: params.LabelSelector,
@@ -106,10 +105,10 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemovePodsHavingTooManyRestarts": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemovePodsHavingTooManyRestarts": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		tooManyRestartsParams := params.PodsHavingTooManyRestarts
 		if tooManyRestartsParams == nil {
-			tooManyRestartsParams = &PodsHavingTooManyRestarts{}
+			tooManyRestartsParams = &v1alpha1.PodsHavingTooManyRestarts{}
 		}
 		args := &removepodshavingtoomanyrestarts.RemovePodsHavingTooManyRestartsArgs{
 			Namespaces:              v1alpha1NamespacesToInternal(params.Namespaces),
@@ -126,10 +125,10 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"PodLifeTime": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"PodLifeTime": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		podLifeTimeParams := params.PodLifeTime
 		if podLifeTimeParams == nil {
-			podLifeTimeParams = &PodLifeTime{}
+			podLifeTimeParams = &v1alpha1.PodLifeTime{}
 		}
 
 		var states []string
@@ -155,7 +154,7 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemoveDuplicates": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemoveDuplicates": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		args := &removeduplicates.RemoveDuplicatesArgs{
 			Namespaces: v1alpha1NamespacesToInternal(params.Namespaces),
 		}
@@ -171,16 +170,11 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"RemovePodsViolatingTopologySpreadConstraint": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"RemovePodsViolatingTopologySpreadConstraint": func(params *v1alpha1.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,
+			IncludeSoftConstraints: params.IncludeSoftConstraints,
-			TopologyBalanceNodeFit: utilpointer.Bool(true),
 		}
 		if err := removepodsviolatingtopologyspreadconstraint.ValidateRemovePodsViolatingTopologySpreadConstraintArgs(args); err != nil {
 			klog.ErrorS(err, "unable to validate plugin arguments", "pluginName", removepodsviolatingtopologyspreadconstraint.PluginName)
@@ -191,9 +185,9 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"HighNodeUtilization": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"HighNodeUtilization": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		if params.NodeResourceUtilizationThresholds == nil {
-			params.NodeResourceUtilizationThresholds = &NodeResourceUtilizationThresholds{}
+			params.NodeResourceUtilizationThresholds = &v1alpha1.NodeResourceUtilizationThresholds{}
 		}
 		args := &nodeutilization.HighNodeUtilizationArgs{
 			EvictableNamespaces: v1alpha1NamespacesToInternal(params.Namespaces),
@@ -209,9 +203,9 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 			Args: args,
 		}, nil
 	},
-	"LowNodeUtilization": func(params *StrategyParameters) (*api.PluginConfig, error) {
+	"LowNodeUtilization": func(params *v1alpha1.StrategyParameters) (*api.PluginConfig, error) {
 		if params.NodeResourceUtilizationThresholds == nil {
-			params.NodeResourceUtilizationThresholds = &NodeResourceUtilizationThresholds{}
+			params.NodeResourceUtilizationThresholds = &v1alpha1.NodeResourceUtilizationThresholds{}
 		}
 		args := &nodeutilization.LowNodeUtilizationArgs{
 			EvictableNamespaces:    v1alpha1NamespacesToInternal(params.Namespaces),
@@ -232,7 +226,7 @@ var StrategyParamsToPluginArgs = map[string]func(params *StrategyParameters) (*a
 	},
 }
 
-func v1alpha1NamespacesToInternal(namespaces *Namespaces) *api.Namespaces {
+func v1alpha1NamespacesToInternal(namespaces *v1alpha1.Namespaces) *api.Namespaces {
 	internal := &api.Namespaces{}
 	if namespaces != nil {
 		if namespaces.Exclude != nil {
@@ -247,7 +241,7 @@ func v1alpha1NamespacesToInternal(namespaces *Namespaces) *api.Namespaces {
 	return internal
 }
 
-func v1alpha1ThresholdToInternal(thresholds ResourceThresholds) api.ResourceThresholds {
+func v1alpha1ThresholdToInternal(thresholds v1alpha1.ResourceThresholds) api.ResourceThresholds {
 	internal := make(api.ResourceThresholds, len(thresholds))
 	for k, v := range thresholds {
 		internal[k] = api.Percentage(float64(v))

pkg/descheduler/strategy_migration_test.go

@@ -14,16 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package descheduler
 
 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/api/v1alpha1"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/nodeutilization"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/podlifetime"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/removeduplicates"
@@ -39,20 +39,20 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeTaints(t *testing.T) {
 	strategyName := "RemovePodsViolatingNodeTaints"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
 				ExcludedTaints: []string{
 					"dedicated=special-user",
 					"reserved",
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -69,8 +69,8 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeTaints(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -84,7 +84,7 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeTaints(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -107,22 +107,22 @@ func TestStrategyParamsToPluginArgsRemoveFailedPods(t *testing.T) {
 	strategyName := "RemoveFailedPods"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				FailedPods: &FailedPods{
+				FailedPods: &v1alpha1.FailedPods{
 					MinPodLifetimeSeconds:   utilpointer.Uint(3600),
 					ExcludeOwnerKinds:       []string{"Job"},
 					Reasons:                 []string{"NodeAffinity"},
 					IncludingInitContainers: true,
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -142,8 +142,8 @@ func TestStrategyParamsToPluginArgsRemoveFailedPods(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -157,7 +157,7 @@ func TestStrategyParamsToPluginArgsRemoveFailedPods(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -180,17 +180,17 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeAffinity(t *testing.T)
 	strategyName := "RemovePodsViolatingNodeAffinity"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
 				NodeAffinityType:  []string{"requiredDuringSchedulingIgnoredDuringExecution"},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -207,15 +207,15 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeAffinity(t *testing.T)
 		},
 		{
 			description: "invalid params, not setting nodeaffinity type",
-			params:      &StrategyParameters{},
+			params:      &v1alpha1.StrategyParameters{},
 			err:         fmt.Errorf("strategy \"%s\" param validation failed: nodeAffinityType needs to be set", strategyName),
 			result:      nil,
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
 				NodeAffinityType: []string{"requiredDuringSchedulingIgnoredDuringExecution"},
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -229,7 +229,7 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingNodeAffinity(t *testing.T)
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -252,16 +252,16 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingInterPodAntiAffinity(t *te
 	strategyName := "RemovePodsViolatingInterPodAntiAffinity"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -277,8 +277,8 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingInterPodAntiAffinity(t *te
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -292,7 +292,7 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingInterPodAntiAffinity(t *te
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -315,20 +315,20 @@ func TestStrategyParamsToPluginArgsRemovePodsHavingTooManyRestarts(t *testing.T)
 	strategyName := "RemovePodsHavingTooManyRestarts"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodsHavingTooManyRestarts: &PodsHavingTooManyRestarts{
+				PodsHavingTooManyRestarts: &v1alpha1.PodsHavingTooManyRestarts{
 					PodRestartThreshold:     100,
 					IncludingInitContainers: true,
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -346,8 +346,8 @@ func TestStrategyParamsToPluginArgsRemovePodsHavingTooManyRestarts(t *testing.T)
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -357,8 +357,8 @@ func TestStrategyParamsToPluginArgsRemovePodsHavingTooManyRestarts(t *testing.T)
 		},
 		{
 			description: "invalid params restart threshold",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodsHavingTooManyRestarts: &PodsHavingTooManyRestarts{
+				PodsHavingTooManyRestarts: &v1alpha1.PodsHavingTooManyRestarts{
 					PodRestartThreshold: 0,
 				},
 			},
@@ -371,7 +371,7 @@ func TestStrategyParamsToPluginArgsRemovePodsHavingTooManyRestarts(t *testing.T)
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -394,15 +394,15 @@ func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
 	strategyName := "PodLifeTime"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodLifeTime: &PodLifeTime{
+				PodLifeTime: &v1alpha1.PodLifeTime{
 					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
 					States: []string{
 						"Pending",
@@ -410,7 +410,7 @@ func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
 					},
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -431,11 +431,11 @@ func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodLifeTime: &PodLifeTime{
+				PodLifeTime: &v1alpha1.PodLifeTime{
 					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
 				},
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -445,8 +445,8 @@ func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
 		},
 		{
 			description: "invalid params MaxPodLifeTimeSeconds not set",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodLifeTime: &PodLifeTime{},
+				PodLifeTime: &v1alpha1.PodLifeTime{},
 			},
 			err:    fmt.Errorf("strategy \"%s\" param validation failed: MaxPodLifeTimeSeconds not set", strategyName),
 			result: nil,
@@ -457,7 +457,7 @@ func TestStrategyParamsToPluginArgsPodLifeTime(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -480,19 +480,19 @@ func TestStrategyParamsToPluginArgsRemoveDuplicates(t *testing.T) {
 	strategyName := "RemoveDuplicates"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				RemoveDuplicates: &RemoveDuplicates{
+				RemoveDuplicates: &v1alpha1.RemoveDuplicates{
 					ExcludeOwnerKinds: []string{"ReplicaSet"},
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -509,11 +509,11 @@ func TestStrategyParamsToPluginArgsRemoveDuplicates(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				PodLifeTime: &PodLifeTime{
+				PodLifeTime: &v1alpha1.PodLifeTime{
 					MaxPodLifeTimeSeconds: utilpointer.Uint(86400),
 				},
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -527,7 +527,7 @@ func TestStrategyParamsToPluginArgsRemoveDuplicates(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -550,17 +550,17 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingTopologySpreadConstraint(t
 	strategyName := "RemovePodsViolatingTopologySpreadConstraint"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
 				IncludeSoftConstraints: true,
 				ThresholdPriority:      utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -568,32 +568,17 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingTopologySpreadConstraint(t
 			result: &api.PluginConfig{
 				Name: removepodsviolatingtopologyspreadconstraint.PluginName,
 				Args: &removepodsviolatingtopologyspreadconstraint.RemovePodsViolatingTopologySpreadConstraintArgs{
-					Constraints:            []v1.UnsatisfiableConstraintAction{v1.DoNotSchedule, v1.ScheduleAnyway},
+					IncludeSoftConstraints: true,
-					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{
+			params: &v1alpha1.StrategyParameters{
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 					Include: []string{"test2"},
 				},
@@ -607,7 +592,7 @@ func TestStrategyParamsToPluginArgsRemovePodsViolatingTopologySpreadConstraint(t
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -630,24 +615,24 @@ func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
 	strategyName := "HighNodeUtilization"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(20),
+						"cpu":    v1alpha1.Percentage(20),
-						"memory": Percentage(20),
+						"memory": v1alpha1.Percentage(20),
-						"pods":   Percentage(20),
+						"pods":   v1alpha1.Percentage(20),
 					},
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -669,16 +654,16 @@ func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(20),
+						"cpu":    v1alpha1.Percentage(20),
-						"memory": Percentage(20),
+						"memory": v1alpha1.Percentage(20),
-						"pods":   Percentage(20),
+						"pods":   v1alpha1.Percentage(20),
 					},
 				},
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Include: []string{"test2"},
 				},
 			},
@@ -687,8 +672,8 @@ func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params nil ResourceThresholds",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
 				},
 			},
@@ -697,11 +682,11 @@ func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params out of bounds threshold",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu": Percentage(150),
+						"cpu": v1alpha1.Percentage(150),
 					},
 				},
 			},
@@ -714,7 +699,7 @@ func TestStrategyParamsToPluginArgsHighNodeUtilization(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {
@@ -737,30 +722,30 @@ func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
 	strategyName := "LowNodeUtilization"
 	type testCase struct {
 		description string
-		params      *StrategyParameters
+		params      *v1alpha1.StrategyParameters
 		err         error
 		result      *api.PluginConfig
 	}
 	testCases := []testCase{
 		{
 			description: "wire in all valid parameters",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(20),
+						"cpu":    v1alpha1.Percentage(20),
-						"memory": Percentage(20),
+						"memory": v1alpha1.Percentage(20),
-						"pods":   Percentage(20),
+						"pods":   v1alpha1.Percentage(20),
 					},
-					TargetThresholds: ResourceThresholds{
+					TargetThresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(50),
+						"cpu":    v1alpha1.Percentage(50),
-						"memory": Percentage(50),
+						"memory": v1alpha1.Percentage(50),
-						"pods":   Percentage(50),
+						"pods":   v1alpha1.Percentage(50),
 					},
 					UseDeviationThresholds: true,
 				},
 				ThresholdPriority: utilpointer.Int32(100),
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Exclude: []string{"test1"},
 				},
 			},
@@ -788,22 +773,22 @@ func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params namespaces",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(20),
+						"cpu":    v1alpha1.Percentage(20),
-						"memory": Percentage(20),
+						"memory": v1alpha1.Percentage(20),
-						"pods":   Percentage(20),
+						"pods":   v1alpha1.Percentage(20),
 					},
-					TargetThresholds: ResourceThresholds{
+					TargetThresholds: v1alpha1.ResourceThresholds{
-						"cpu":    Percentage(50),
+						"cpu":    v1alpha1.Percentage(50),
-						"memory": Percentage(50),
+						"memory": v1alpha1.Percentage(50),
-						"pods":   Percentage(50),
+						"pods":   v1alpha1.Percentage(50),
 					},
 					UseDeviationThresholds: true,
 				},
-				Namespaces: &Namespaces{
+				Namespaces: &v1alpha1.Namespaces{
 					Include: []string{"test2"},
 				},
 			},
@@ -812,8 +797,8 @@ func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params nil ResourceThresholds",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
 				},
 			},
@@ -822,11 +807,11 @@ func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
 		},
 		{
 			description: "invalid params out of bounds threshold",
-			params: &StrategyParameters{
+			params: &v1alpha1.StrategyParameters{
-				NodeResourceUtilizationThresholds: &NodeResourceUtilizationThresholds{
+				NodeResourceUtilizationThresholds: &v1alpha1.NodeResourceUtilizationThresholds{
 					NumberOfNodes: 3,
-					Thresholds: ResourceThresholds{
+					Thresholds: v1alpha1.ResourceThresholds{
-						"cpu": Percentage(150),
+						"cpu": v1alpha1.Percentage(150),
 					},
 				},
 			},
@@ -839,7 +824,7 @@ func TestStrategyParamsToPluginArgsLowNodeUtilization(t *testing.T) {
 		t.Run(tc.description, func(t *testing.T) {
 			var result *api.PluginConfig
 			var err error
-			if pcFnc, exists := StrategyParamsToPluginArgs[strategyName]; exists {
+			if pcFnc, exists := strategyParamsToPluginArgs[strategyName]; exists {
 				result, err = pcFnc(tc.params)
 			}
 			if err != nil {

pkg/framework/fake/fake.go

@@ -9,18 +9,18 @@ import (
 
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 )
 
 type HandleImpl struct {
 	ClientsetImpl                 clientset.Interface
 	GetPodsAssignedToNodeFuncImpl podutil.GetPodsAssignedToNodeFunc
 	SharedInformerFactoryImpl     informers.SharedInformerFactory
-	EvictorFilterImpl             frameworktypes.EvictorPlugin
+	EvictorFilterImpl             framework.EvictorPlugin
 	PodEvictorImpl                *evictions.PodEvictor
 }
 
-var _ frameworktypes.Handle = &HandleImpl{}
+var _ framework.Handle = &HandleImpl{}
 
 func (hi *HandleImpl) ClientSet() clientset.Interface {
 	return hi.ClientsetImpl
@@ -34,7 +34,7 @@ func (hi *HandleImpl) SharedInformerFactory() informers.SharedInformerFactory {
 	return hi.SharedInformerFactoryImpl
 }
 
-func (hi *HandleImpl) Evictor() frameworktypes.Evictor {
+func (hi *HandleImpl) Evictor() framework.Evictor {
 	return hi
 }
 

pkg/framework/fake/plugin/fake.go

@@ -1,410 +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 plugin
-
-import (
-	"context"
-	"fmt"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"sigs.k8s.io/descheduler/pkg/framework/pluginregistry"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-)
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// FakePluginArgs holds arguments used to configure FakePlugin plugin.
-type FakePluginArgs struct {
-	metav1.TypeMeta `json:",inline"`
-}
-
-func ValidateFakePluginArgs(obj runtime.Object) error {
-	return nil
-}
-
-func SetDefaults_FakePluginArgs(obj runtime.Object) {}
-
-var (
-	_ frameworktypes.EvictorPlugin    = &FakePlugin{}
-	_ frameworktypes.DeschedulePlugin = &FakePlugin{}
-	_ frameworktypes.BalancePlugin    = &FakePlugin{}
-	_ frameworktypes.EvictorPlugin    = &FakeFilterPlugin{}
-	_ frameworktypes.DeschedulePlugin = &FakeDeschedulePlugin{}
-	_ frameworktypes.BalancePlugin    = &FakeBalancePlugin{}
-)
-
-// FakePlugin is a configurable plugin used for testing
-type FakePlugin struct {
-	PluginName string
-
-	// ReactionChain is the list of reactors that will be attempted for every
-	// request in the order they are tried.
-	ReactionChain []Reactor
-
-	args   runtime.Object
-	handle frameworktypes.Handle
-}
-
-func NewPluginFncFromFake(fp *FakePlugin) pluginregistry.PluginBuilder {
-	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-		fakePluginArgs, ok := args.(*FakePluginArgs)
-		if !ok {
-			return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-		}
-
-		fp.handle = handle
-		fp.args = fakePluginArgs
-
-		return fp, nil
-	}
-}
-
-// New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-	fakePluginArgs, ok := args.(*FakePluginArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-	}
-
-	ev := &FakePlugin{}
-	ev.handle = handle
-	ev.args = fakePluginArgs
-
-	return ev, nil
-}
-
-func (c *FakePlugin) AddReactor(extensionPoint string, reaction ReactionFunc) {
-	c.ReactionChain = append(c.ReactionChain, &SimpleReactor{ExtensionPoint: extensionPoint, Reaction: reaction})
-}
-
-// Name retrieves the plugin name
-func (d *FakePlugin) Name() string {
-	return d.PluginName
-}
-
-func (d *FakePlugin) PreEvictionFilter(pod *v1.Pod) bool {
-	return true
-}
-
-func (d *FakePlugin) Filter(pod *v1.Pod) bool {
-	return true
-}
-
-func (d *FakePlugin) handleAction(action Action) *frameworktypes.Status {
-	actionCopy := action.DeepCopy()
-	for _, reactor := range d.ReactionChain {
-		if !reactor.Handles(actionCopy) {
-			continue
-		}
-		handled, _, err := reactor.React(actionCopy)
-		if !handled {
-			continue
-		}
-
-		return &frameworktypes.Status{
-			Err: err,
-		}
-	}
-	return &frameworktypes.Status{
-		Err: fmt.Errorf("unhandled %q action", action.GetExtensionPoint()),
-	}
-}
-
-func (d *FakePlugin) Deschedule(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	return d.handleAction(&DescheduleActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.DescheduleExtensionPoint),
-		},
-		nodes: nodes,
-	})
-}
-
-func (d *FakePlugin) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	return d.handleAction(&BalanceActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.BalanceExtensionPoint),
-		},
-		nodes: nodes,
-	})
-}
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// FakeDeschedulePluginArgs holds arguments used to configure FakeDeschedulePlugin plugin.
-type FakeDeschedulePluginArgs struct {
-	metav1.TypeMeta `json:",inline"`
-}
-
-// FakeDeschedulePlugin is a configurable plugin used for testing
-type FakeDeschedulePlugin struct {
-	PluginName string
-
-	// ReactionChain is the list of reactors that will be attempted for every
-	// request in the order they are tried.
-	ReactionChain []Reactor
-
-	args   runtime.Object
-	handle frameworktypes.Handle
-}
-
-func NewFakeDeschedulePluginFncFromFake(fp *FakeDeschedulePlugin) pluginregistry.PluginBuilder {
-	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-		fakePluginArgs, ok := args.(*FakeDeschedulePluginArgs)
-		if !ok {
-			return nil, fmt.Errorf("want args to be of type FakeDeschedulePluginArgs, got %T", args)
-		}
-
-		fp.handle = handle
-		fp.args = fakePluginArgs
-
-		return fp, nil
-	}
-}
-
-// New builds plugin from its arguments while passing a handle
-func NewFakeDeschedule(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-	fakePluginArgs, ok := args.(*FakeDeschedulePluginArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-	}
-
-	ev := &FakeDeschedulePlugin{}
-	ev.handle = handle
-	ev.args = fakePluginArgs
-
-	return ev, nil
-}
-
-func (c *FakeDeschedulePlugin) AddReactor(extensionPoint string, reaction ReactionFunc) {
-	c.ReactionChain = append(c.ReactionChain, &SimpleReactor{ExtensionPoint: extensionPoint, Reaction: reaction})
-}
-
-// Name retrieves the plugin name
-func (d *FakeDeschedulePlugin) Name() string {
-	return d.PluginName
-}
-
-func (d *FakeDeschedulePlugin) Deschedule(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	return d.handleAction(&DescheduleActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.DescheduleExtensionPoint),
-		},
-		nodes: nodes,
-	})
-}
-
-func (d *FakeDeschedulePlugin) handleAction(action Action) *frameworktypes.Status {
-	actionCopy := action.DeepCopy()
-	for _, reactor := range d.ReactionChain {
-		if !reactor.Handles(actionCopy) {
-			continue
-		}
-		handled, _, err := reactor.React(actionCopy)
-		if !handled {
-			continue
-		}
-
-		return &frameworktypes.Status{
-			Err: err,
-		}
-	}
-	return &frameworktypes.Status{
-		Err: fmt.Errorf("unhandled %q action", action.GetExtensionPoint()),
-	}
-}
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// FakeBalancePluginArgs holds arguments used to configure FakeBalancePlugin plugin.
-type FakeBalancePluginArgs struct {
-	metav1.TypeMeta `json:",inline"`
-}
-
-// FakeBalancePlugin is a configurable plugin used for testing
-type FakeBalancePlugin struct {
-	PluginName string
-
-	// ReactionChain is the list of reactors that will be attempted for every
-	// request in the order they are tried.
-	ReactionChain []Reactor
-
-	args   runtime.Object
-	handle frameworktypes.Handle
-}
-
-func NewFakeBalancePluginFncFromFake(fp *FakeBalancePlugin) pluginregistry.PluginBuilder {
-	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-		fakePluginArgs, ok := args.(*FakeBalancePluginArgs)
-		if !ok {
-			return nil, fmt.Errorf("want args to be of type FakeBalancePluginArgs, got %T", args)
-		}
-
-		fp.handle = handle
-		fp.args = fakePluginArgs
-
-		return fp, nil
-	}
-}
-
-// New builds plugin from its arguments while passing a handle
-func NewFakeBalance(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-	fakePluginArgs, ok := args.(*FakeBalancePluginArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-	}
-
-	ev := &FakeBalancePlugin{}
-	ev.handle = handle
-	ev.args = fakePluginArgs
-
-	return ev, nil
-}
-
-func (c *FakeBalancePlugin) AddReactor(extensionPoint string, reaction ReactionFunc) {
-	c.ReactionChain = append(c.ReactionChain, &SimpleReactor{ExtensionPoint: extensionPoint, Reaction: reaction})
-}
-
-// Name retrieves the plugin name
-func (d *FakeBalancePlugin) Name() string {
-	return d.PluginName
-}
-
-func (d *FakeBalancePlugin) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
-	return d.handleAction(&BalanceActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.BalanceExtensionPoint),
-		},
-		nodes: nodes,
-	})
-}
-
-func (d *FakeBalancePlugin) handleAction(action Action) *frameworktypes.Status {
-	actionCopy := action.DeepCopy()
-	for _, reactor := range d.ReactionChain {
-		if !reactor.Handles(actionCopy) {
-			continue
-		}
-		handled, _, err := reactor.React(actionCopy)
-		if !handled {
-			continue
-		}
-
-		return &frameworktypes.Status{
-			Err: err,
-		}
-	}
-	return &frameworktypes.Status{
-		Err: fmt.Errorf("unhandled %q action", action.GetExtensionPoint()),
-	}
-}
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// FakeFilterPluginArgs holds arguments used to configure FakeFilterPlugin plugin.
-type FakeFilterPluginArgs struct {
-	metav1.TypeMeta `json:",inline"`
-}
-
-// FakeFilterPlugin is a configurable plugin used for testing
-type FakeFilterPlugin struct {
-	PluginName string
-
-	// ReactionChain is the list of reactors that will be attempted for every
-	// request in the order they are tried.
-	ReactionChain []Reactor
-
-	args   runtime.Object
-	handle frameworktypes.Handle
-}
-
-func NewFakeFilterPluginFncFromFake(fp *FakeFilterPlugin) pluginregistry.PluginBuilder {
-	return func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-		fakePluginArgs, ok := args.(*FakeFilterPluginArgs)
-		if !ok {
-			return nil, fmt.Errorf("want args to be of type FakeFilterPluginArgs, got %T", args)
-		}
-
-		fp.handle = handle
-		fp.args = fakePluginArgs
-
-		return fp, nil
-	}
-}
-
-// New builds plugin from its arguments while passing a handle
-func NewFakeFilter(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
-	fakePluginArgs, ok := args.(*FakeFilterPluginArgs)
-	if !ok {
-		return nil, fmt.Errorf("want args to be of type FakePluginArgs, got %T", args)
-	}
-
-	ev := &FakeFilterPlugin{}
-	ev.handle = handle
-	ev.args = fakePluginArgs
-
-	return ev, nil
-}
-
-func (c *FakeFilterPlugin) AddReactor(extensionPoint string, reaction ReactionFunc) {
-	c.ReactionChain = append(c.ReactionChain, &SimpleReactor{ExtensionPoint: extensionPoint, Reaction: reaction})
-}
-
-// Name retrieves the plugin name
-func (d *FakeFilterPlugin) Name() string {
-	return d.PluginName
-}
-
-func (d *FakeFilterPlugin) Filter(pod *v1.Pod) bool {
-	return d.handleBoolAction(&FilterActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.FilterExtensionPoint),
-		},
-	})
-}
-
-func (d *FakeFilterPlugin) PreEvictionFilter(pod *v1.Pod) bool {
-	return d.handleBoolAction(&PreEvictionFilterActionImpl{
-		ActionImpl: ActionImpl{
-			handle:         d.handle,
-			extensionPoint: string(frameworktypes.PreEvictionFilterExtensionPoint),
-		},
-	})
-}
-
-func (d *FakeFilterPlugin) handleBoolAction(action Action) bool {
-	actionCopy := action.DeepCopy()
-	for _, reactor := range d.ReactionChain {
-		if !reactor.Handles(actionCopy) {
-			continue
-		}
-		handled, filter, _ := reactor.React(actionCopy)
-		if !handled {
-			continue
-		}
-
-		return filter
-	}
-	panic(fmt.Errorf("unhandled %q action", action.GetExtensionPoint()))
-}

pkg/framework/fake/plugin/fixture.go

@@ -1,170 +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 plugin
-
-import (
-	v1 "k8s.io/api/core/v1"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-)
-
-type Action interface {
-	Handle() frameworktypes.Handle
-	GetExtensionPoint() string
-	DeepCopy() Action
-}
-
-type ReactionFunc func(action Action) (handled, filter bool, err error)
-
-// Reactor is an interface to allow the composition of reaction functions.
-type Reactor interface {
-	// Handles indicates whether or not this Reactor deals with a given
-	// action.
-	Handles(action Action) bool
-	// React handles the action.  It may choose to
-	// delegate by indicated handled=false.
-	// filter is used to store results of filter based actions
-	React(action Action) (handled, filter bool, err error)
-}
-
-// SimpleReactor is a Reactor. Each reaction function is attached to a given extensionPoint. "*" in either field matches everything for that value.
-type SimpleReactor struct {
-	ExtensionPoint string
-	Reaction       ReactionFunc
-}
-
-func (r *SimpleReactor) Handles(action Action) bool {
-	return r.ExtensionPoint == "*" || r.ExtensionPoint == action.GetExtensionPoint()
-}
-
-func (r *SimpleReactor) React(action Action) (bool, bool, error) {
-	return r.Reaction(action)
-}
-
-type DescheduleAction interface {
-	Action
-	CanDeschedule() bool
-	Nodes() []*v1.Node
-}
-
-type BalanceAction interface {
-	Action
-	CanBalance() bool
-	Nodes() []*v1.Node
-}
-
-type FilterAction interface {
-	Action
-	CanFilter() bool
-}
-
-type PreEvictionFilterAction interface {
-	Action
-	CanPreEvictionFilter() bool
-}
-
-type ActionImpl struct {
-	handle         frameworktypes.Handle
-	extensionPoint string
-}
-
-func (a ActionImpl) Handle() frameworktypes.Handle {
-	return a.handle
-}
-
-func (a ActionImpl) GetExtensionPoint() string {
-	return a.extensionPoint
-}
-
-func (a ActionImpl) DeepCopy() Action {
-	// The handle is expected to be accessed only throuh interface methods
-	// Thus, no deep copy needed.
-	ret := a
-	return ret
-}
-
-type DescheduleActionImpl struct {
-	ActionImpl
-	nodes []*v1.Node
-}
-
-func (d DescheduleActionImpl) CanDeschedule() bool {
-	return true
-}
-
-func (d DescheduleActionImpl) Nodes() []*v1.Node {
-	return d.nodes
-}
-
-func (a DescheduleActionImpl) DeepCopy() Action {
-	nodesCopy := []*v1.Node{}
-	for _, node := range a.nodes {
-		nodesCopy = append(nodesCopy, node.DeepCopy())
-	}
-	return DescheduleActionImpl{
-		ActionImpl: a.ActionImpl.DeepCopy().(ActionImpl),
-		nodes:      nodesCopy,
-	}
-}
-
-type BalanceActionImpl struct {
-	ActionImpl
-	nodes []*v1.Node
-}
-
-func (d BalanceActionImpl) CanBalance() bool {
-	return true
-}
-
-func (d BalanceActionImpl) Nodes() []*v1.Node {
-	return d.nodes
-}
-
-func (a BalanceActionImpl) DeepCopy() Action {
-	nodesCopy := []*v1.Node{}
-	for _, node := range a.nodes {
-		nodesCopy = append(nodesCopy, node.DeepCopy())
-	}
-	return BalanceActionImpl{
-		ActionImpl: a.ActionImpl.DeepCopy().(ActionImpl),
-		nodes:      nodesCopy,
-	}
-}
-
-type FilterActionImpl struct {
-	ActionImpl
-}
-
-func (d FilterActionImpl) CanFilter() bool {
-	return true
-}
-
-func (a FilterActionImpl) DeepCopy() Action {
-	return FilterActionImpl{
-		ActionImpl: a.ActionImpl.DeepCopy().(ActionImpl),
-	}
-}
-
-type PreEvictionFilterActionImpl struct {
-	ActionImpl
-}
-
-func (d PreEvictionFilterActionImpl) CanPreEvictionFilter() bool {
-	return true
-}
-
-func (a PreEvictionFilterActionImpl) DeepCopy() Action {
-	return PreEvictionFilterActionImpl{
-		ActionImpl: a.ActionImpl.DeepCopy().(ActionImpl),
-	}
-}

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

@@ -1,126 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-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.
-*/
-
-// Code generated by deepcopy-gen. DO NOT EDIT.
-
-package plugin
-
-import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FakeBalancePluginArgs) DeepCopyInto(out *FakeBalancePluginArgs) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FakeBalancePluginArgs.
-func (in *FakeBalancePluginArgs) DeepCopy() *FakeBalancePluginArgs {
-	if in == nil {
-		return nil
-	}
-	out := new(FakeBalancePluginArgs)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *FakeBalancePluginArgs) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FakeDeschedulePluginArgs) DeepCopyInto(out *FakeDeschedulePluginArgs) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FakeDeschedulePluginArgs.
-func (in *FakeDeschedulePluginArgs) DeepCopy() *FakeDeschedulePluginArgs {
-	if in == nil {
-		return nil
-	}
-	out := new(FakeDeschedulePluginArgs)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *FakeDeschedulePluginArgs) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FakeFilterPluginArgs) DeepCopyInto(out *FakeFilterPluginArgs) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FakeFilterPluginArgs.
-func (in *FakeFilterPluginArgs) DeepCopy() *FakeFilterPluginArgs {
-	if in == nil {
-		return nil
-	}
-	out := new(FakeFilterPluginArgs)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *FakeFilterPluginArgs) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FakePluginArgs) DeepCopyInto(out *FakePluginArgs) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FakePluginArgs.
-func (in *FakePluginArgs) DeepCopy() *FakePluginArgs {
-	if in == nil {
-		return nil
-	}
-	out := new(FakePluginArgs)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *FakePluginArgs) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}

pkg/framework/pluginregistry/pluginregistry.go

@@ -1,71 +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 pluginregistry
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/klog/v2"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
-)
-
-var PluginRegistry Registry
-
-type PluginUtilities struct {
-	PluginBuilder PluginBuilder
-
-	PluginType interface{}
-	// Just an example instance of this PluginArg so we can avoid having
-	// to deal with reflect Types
-	PluginArgInstance  runtime.Object
-	PluginArgValidator PluginArgValidator
-	PluginArgDefaulter PluginArgDefaulter
-}
-
-type PluginBuilder = func(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error)
-
-type (
-	PluginArgValidator = func(args runtime.Object) error
-	PluginArgDefaulter = func(args runtime.Object)
-)
-
-type Registry map[string]PluginUtilities
-
-func NewRegistry() Registry {
-	return Registry{}
-}
-
-func Register(
-	name string,
-	builderFunc PluginBuilder,
-	pluginType interface{},
-	exampleArg runtime.Object,
-	pluginArgValidator PluginArgValidator,
-	pluginArgDefaulter PluginArgDefaulter,
-	registry Registry,
-) {
-	if _, ok := registry[name]; ok {
-		klog.V(10).InfoS("Plugin already registered", "plugin", name)
-	} else {
-		registry[name] = PluginUtilities{
-			PluginBuilder:      builderFunc,
-			PluginType:         pluginType,
-			PluginArgInstance:  exampleArg,
-			PluginArgValidator: pluginArgValidator,
-			PluginArgDefaulter: pluginArgDefaulter,
-		}
-	}
-}

pkg/framework/plugins/defaultevictor/defaultevictor.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/klog/v2"
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
@@ -35,7 +35,7 @@ const (
 	evictPodAnnotationKey = "descheduler.alpha.kubernetes.io/evict"
 )
 
-var _ frameworktypes.EvictorPlugin = &DefaultEvictor{}
+var _ framework.EvictorPlugin = &DefaultEvictor{}
 
 type constraint func(pod *v1.Pod) error
 
@@ -47,7 +47,7 @@ type constraint func(pod *v1.Pod) error
 type DefaultEvictor struct {
 	args        runtime.Object
 	constraints []constraint
-	handle      frameworktypes.Handle
+	handle      framework.Handle
 }
 
 // IsPodEvictableBasedOnPriority checks if the given pod is evictable based on priority resolved from pod Spec.
@@ -62,7 +62,7 @@ func HaveEvictAnnotation(pod *v1.Pod) bool {
 }
 
 // New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
 	defaultEvictorArgs, ok := args.(*DefaultEvictorArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type defaultEvictorFilterArgs, got %T", args)
@@ -156,11 +156,11 @@ func (d *DefaultEvictor) PreEvictionFilter(pod *v1.Pod) bool {
 	if defaultEvictorArgs.NodeFit {
 		nodes, err := nodeutil.ReadyNodes(context.TODO(), d.handle.ClientSet(), d.handle.SharedInformerFactory().Core().V1().Nodes().Lister(), defaultEvictorArgs.NodeSelector)
 		if err != nil {
-			klog.ErrorS(err, "unable to list ready nodes", "pod", klog.KObj(pod))
+			klog.ErrorS(fmt.Errorf("Pod fails the following checks"), "pod", klog.KObj(pod))
 			return false
 		}
 		if !nodeutil.PodFitsAnyOtherNode(d.handle.GetPodsAssignedToNodeFunc(), pod, nodes) {
-			klog.InfoS("pod does not fit on any other node because of nodeSelector(s), Taint(s), or nodes marked as unschedulable", "pod", klog.KObj(pod))
+			klog.ErrorS(fmt.Errorf("pod does not fit on any other node because of nodeSelector(s), Taint(s), or nodes marked as unschedulable"), "pod", klog.KObj(pod))
 			return false
 		}
 		return true

pkg/framework/plugins/defaultevictor/defaultevictor_test.go

@@ -24,8 +24,8 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"sigs.k8s.io/descheduler/pkg/api"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -347,7 +347,7 @@ func TestDefaultEvictorPreEvictionFilter(t *testing.T) {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
 
-			result := evictorPlugin.(frameworktypes.EvictorPlugin).PreEvictionFilter(test.pods[0])
+			result := evictorPlugin.(framework.EvictorPlugin).PreEvictionFilter(test.pods[0])
 			if (result) != test.result {
 				t.Errorf("Filter should return for pod %s %t, but it returns %t", test.pods[0].Name, test.result, result)
 			}
@@ -755,7 +755,7 @@ func TestDefaultEvictorFilter(t *testing.T) {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
 
-			result := evictorPlugin.(frameworktypes.EvictorPlugin).Filter(test.pods[0])
+			result := evictorPlugin.(framework.EvictorPlugin).Filter(test.pods[0])
 			if (result) != test.result {
 				t.Errorf("Filter should return for pod %s %t, but it returns %t", test.pods[0].Name, test.result, result)
 			}

pkg/framework/plugins/defaultevictor/defaults.go

@@ -23,30 +23,29 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 // SetDefaults_DefaultEvictorArgs
 // TODO: the final default values would be discussed in community
-func SetDefaults_DefaultEvictorArgs(obj runtime.Object) {
+func SetDefaults_DefaultEvictorArgs(obj *DefaultEvictorArgs) {
-	args := obj.(*DefaultEvictorArgs)
+	if obj.NodeSelector == "" {
-	if args.NodeSelector == "" {
+		obj.NodeSelector = ""
-		args.NodeSelector = ""
 	}
-	if !args.EvictLocalStoragePods {
+	if !obj.EvictLocalStoragePods {
-		args.EvictLocalStoragePods = false
+		obj.EvictLocalStoragePods = false
 	}
-	if !args.EvictSystemCriticalPods {
+	if !obj.EvictSystemCriticalPods {
-		args.EvictSystemCriticalPods = false
+		obj.EvictSystemCriticalPods = false
 	}
-	if !args.IgnorePvcPods {
+	if !obj.IgnorePvcPods {
-		args.IgnorePvcPods = false
+		obj.IgnorePvcPods = false
 	}
-	if !args.EvictFailedBarePods {
+	if !obj.EvictFailedBarePods {
-		args.EvictFailedBarePods = false
+		obj.EvictFailedBarePods = false
 	}
-	if args.LabelSelector == nil {
+	if obj.LabelSelector == nil {
-		args.LabelSelector = nil
+		obj.LabelSelector = nil
 	}
-	if args.PriorityThreshold == nil {
+	if obj.PriorityThreshold == nil {
-		args.PriorityThreshold = nil
+		obj.PriorityThreshold = nil
 	}
-	if !args.NodeFit {
+	if !obj.NodeFit {
-		args.NodeFit = false
+		obj.NodeFit = false
 	}
 }

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

@@ -29,5 +29,10 @@ import (
 // Public to allow building arbitrary schemes.
 // All generated defaulters are covering - they call all nested defaulters.
 func RegisterDefaults(scheme *runtime.Scheme) error {
+	scheme.AddTypeDefaultingFunc(&DefaultEvictorArgs{}, func(obj interface{}) { SetObjectDefaults_DefaultEvictorArgs(obj.(*DefaultEvictorArgs)) })
 	return nil
 }
+
+func SetObjectDefaults_DefaultEvictorArgs(in *DefaultEvictorArgs) {
+	SetDefaults_DefaultEvictorArgs(in)
+}

pkg/framework/plugins/nodeutilization/defaults.go

@@ -23,30 +23,28 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 // SetDefaults_LowNodeUtilizationArgs
 // TODO: the final default values would be discussed in community
-func SetDefaults_LowNodeUtilizationArgs(obj runtime.Object) {
+func SetDefaults_LowNodeUtilizationArgs(obj *LowNodeUtilizationArgs) {
-	args := obj.(*LowNodeUtilizationArgs)
+	if !obj.UseDeviationThresholds {
-	if !args.UseDeviationThresholds {
+		obj.UseDeviationThresholds = false
-		args.UseDeviationThresholds = false
 	}
-	if args.Thresholds == nil {
+	if obj.Thresholds == nil {
-		args.Thresholds = nil
+		obj.Thresholds = nil
 	}
-	if args.TargetThresholds == nil {
+	if obj.TargetThresholds == nil {
-		args.TargetThresholds = nil
+		obj.TargetThresholds = nil
 	}
-	if args.NumberOfNodes == 0 {
+	if obj.NumberOfNodes == 0 {
-		args.NumberOfNodes = 0
+		obj.NumberOfNodes = 0
 	}
 }
 
 // SetDefaults_HighNodeUtilizationArgs
 // TODO: the final default values would be discussed in community
-func SetDefaults_HighNodeUtilizationArgs(obj runtime.Object) {
+func SetDefaults_HighNodeUtilizationArgs(obj *HighNodeUtilizationArgs) {
-	args := obj.(*HighNodeUtilizationArgs)
+	if obj.Thresholds == nil {
-	if args.Thresholds == nil {
+		obj.Thresholds = nil
-		args.Thresholds = nil
 	}
-	if args.NumberOfNodes == 0 {
+	if obj.NumberOfNodes == 0 {
-		args.NumberOfNodes = 0
+		obj.NumberOfNodes = 0
 	}
 }

pkg/framework/plugins/nodeutilization/highnodeutilization.go

@@ -28,7 +28,7 @@ import (
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 )
 
 const HighNodeUtilizationPluginName = "HighNodeUtilization"
@@ -37,15 +37,15 @@ const HighNodeUtilizationPluginName = "HighNodeUtilization"
 // Note that CPU/Memory requests are used to calculate nodes' utilization and not the actual resource usage.
 
 type HighNodeUtilization struct {
-	handle    frameworktypes.Handle
+	handle    framework.Handle
 	args      *HighNodeUtilizationArgs
 	podFilter func(pod *v1.Pod) bool
 }
 
-var _ frameworktypes.BalancePlugin = &HighNodeUtilization{}
+var _ framework.BalancePlugin = &HighNodeUtilization{}
 
 // NewHighNodeUtilization builds plugin from its arguments while passing a handle
-func NewHighNodeUtilization(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func NewHighNodeUtilization(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
 	highNodeUtilizatioArgs, ok := args.(*HighNodeUtilizationArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type HighNodeUtilizationArgs, got %T", args)
@@ -71,7 +71,7 @@ func (h *HighNodeUtilization) Name() string {
 }
 
 // Balance extension point implementation for the plugin
-func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
+func (h *HighNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
 	thresholds := h.args.Thresholds
 	targetThresholds := make(api.ResourceThresholds)
 

pkg/framework/plugins/nodeutilization/highnodeutilization_test.go

@@ -33,9 +33,9 @@ import (
 	"sigs.k8s.io/descheduler/pkg/api"
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
 	"sigs.k8s.io/descheduler/pkg/utils"
 	"sigs.k8s.io/descheduler/test"
 )
@@ -519,7 +519,7 @@ func TestHighNodeUtilization(t *testing.T) {
 				ClientsetImpl:                 fakeClient,
 				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
 				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(frameworktypes.EvictorPlugin),
+				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
 				SharedInformerFactoryImpl:     sharedInformerFactory,
 			}
 
@@ -530,7 +530,7 @@ func TestHighNodeUtilization(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-			plugin.(frameworktypes.BalancePlugin).Balance(ctx, testCase.nodes)
+			plugin.(framework.BalancePlugin).Balance(ctx, testCase.nodes)
 
 			podsEvicted := podEvictor.TotalEvicted()
 			if testCase.expectedPodsEvicted != podsEvicted {
@@ -670,7 +670,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 				ClientsetImpl:                 fakeClient,
 				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
 				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(frameworktypes.EvictorPlugin),
+				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
 				SharedInformerFactoryImpl:     sharedInformerFactory,
 			}
 
@@ -683,7 +683,7 @@ func TestHighNodeUtilizationWithTaints(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-			plugin.(frameworktypes.BalancePlugin).Balance(ctx, item.nodes)
+			plugin.(framework.BalancePlugin).Balance(ctx, item.nodes)
 
 			if item.evictionsExpected != podEvictor.TotalEvicted() {
 				t.Errorf("Expected %v evictions, got %v", item.evictionsExpected, podEvictor.TotalEvicted())

pkg/framework/plugins/nodeutilization/lownodeutilization.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/klog/v2"
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 )
 
 const LowNodeUtilizationPluginName = "LowNodeUtilization"
@@ -35,15 +35,15 @@ const LowNodeUtilizationPluginName = "LowNodeUtilization"
 // to calculate nodes' utilization and not the actual resource usage.
 
 type LowNodeUtilization struct {
-	handle    frameworktypes.Handle
+	handle    framework.Handle
 	args      *LowNodeUtilizationArgs
 	podFilter func(pod *v1.Pod) bool
 }
 
-var _ frameworktypes.BalancePlugin = &LowNodeUtilization{}
+var _ framework.BalancePlugin = &LowNodeUtilization{}
 
 // NewLowNodeUtilization builds plugin from its arguments while passing a handle
-func NewLowNodeUtilization(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func NewLowNodeUtilization(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
 	lowNodeUtilizationArgsArgs, ok := args.(*LowNodeUtilizationArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type LowNodeUtilizationArgs, got %T", args)
@@ -69,7 +69,7 @@ func (l *LowNodeUtilization) Name() string {
 }
 
 // Balance extension point implementation for the plugin
-func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
+func (l *LowNodeUtilization) Balance(ctx context.Context, nodes []*v1.Node) *framework.Status {
 	useDeviationThresholds := l.args.UseDeviationThresholds
 	thresholds := l.args.Thresholds
 	targetThresholds := l.args.TargetThresholds

pkg/framework/plugins/nodeutilization/lownodeutilization_test.go

@@ -22,9 +22,9 @@ import (
 	"testing"
 
 	"sigs.k8s.io/descheduler/pkg/api"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	frameworkfake "sigs.k8s.io/descheduler/pkg/framework/fake"
 	"sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
 
 	v1 "k8s.io/api/core/v1"
 	policy "k8s.io/api/policy/v1"
@@ -921,7 +921,7 @@ func TestLowNodeUtilization(t *testing.T) {
 				ClientsetImpl:                 fakeClient,
 				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
 				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(frameworktypes.EvictorPlugin),
+				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
 				SharedInformerFactoryImpl:     sharedInformerFactory,
 			}
 
@@ -935,7 +935,7 @@ func TestLowNodeUtilization(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-			plugin.(frameworktypes.BalancePlugin).Balance(ctx, test.nodes)
+			plugin.(framework.BalancePlugin).Balance(ctx, test.nodes)
 
 			podsEvicted := podEvictor.TotalEvicted()
 			if test.expectedPodsEvicted != podsEvicted {
@@ -1093,7 +1093,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 				ClientsetImpl:                 fakeClient,
 				GetPodsAssignedToNodeFuncImpl: getPodsAssignedToNode,
 				PodEvictorImpl:                podEvictor,
-				EvictorFilterImpl:             evictorFilter.(frameworktypes.EvictorPlugin),
+				EvictorFilterImpl:             evictorFilter.(framework.EvictorPlugin),
 				SharedInformerFactoryImpl:     sharedInformerFactory,
 			}
 
@@ -1109,7 +1109,7 @@ func TestLowNodeUtilizationWithTaints(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unable to initialize the plugin: %v", err)
 			}
-			plugin.(frameworktypes.BalancePlugin).Balance(ctx, item.nodes)
+			plugin.(framework.BalancePlugin).Balance(ctx, item.nodes)
 
 			if item.evictionsExpected != podEvictor.TotalEvicted() {
 				t.Errorf("Expected %v evictions, got %v", item.evictionsExpected, podEvictor.TotalEvicted())

pkg/framework/plugins/nodeutilization/nodeutilization.go

@@ -18,7 +18,6 @@ package nodeutilization
 
 import (
 	"context"
-	"math"
 	"sort"
 
 	"sigs.k8s.io/descheduler/pkg/api"
@@ -31,7 +30,7 @@ import (
 	"sigs.k8s.io/descheduler/pkg/descheduler/node"
 	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 	"sigs.k8s.io/descheduler/pkg/utils"
 )
 
@@ -164,10 +163,6 @@ func resourceThreshold(nodeCapacity v1.ResourceList, resourceName v1.ResourceNam
 	return resource.NewQuantity(resourceCapacityFraction(resourceCapacityQuantity.Value()), defaultFormat)
 }
 
-func roundTo2Decimals(percentage float64) float64 {
-	return math.Round(percentage*100) / 100
-}
-
 func resourceUsagePercentages(nodeUsage NodeUsage) map[v1.ResourceName]float64 {
 	nodeCapacity := nodeUsage.node.Status.Capacity
 	if len(nodeUsage.node.Status.Allocatable) > 0 {
@@ -179,7 +174,6 @@ func resourceUsagePercentages(nodeUsage NodeUsage) map[v1.ResourceName]float64 {
 		cap := nodeCapacity[resourceName]
 		if !cap.IsZero() {
 			resourceUsagePercentage[resourceName] = 100 * float64(resourceUsage.MilliValue()) / float64(cap.MilliValue())
-			resourceUsagePercentage[resourceName] = roundTo2Decimals(resourceUsagePercentage[resourceName])
 		}
 	}
 
@@ -221,7 +215,7 @@ func evictPodsFromSourceNodes(
 	ctx context.Context,
 	evictableNamespaces *api.Namespaces,
 	sourceNodes, destinationNodes []NodeInfo,
-	podEvictor frameworktypes.Evictor,
+	podEvictor framework.Evictor,
 	podFilter func(pod *v1.Pod) bool,
 	resourceNames []v1.ResourceName,
 	continueEviction continueEvictionCond,
@@ -285,12 +279,12 @@ func evictPods(
 	nodeInfo NodeInfo,
 	totalAvailableUsage map[v1.ResourceName]*resource.Quantity,
 	taintsOfLowNodes map[string][]v1.Taint,
-	podEvictor frameworktypes.Evictor,
+	podEvictor framework.Evictor,
 	continueEviction continueEvictionCond,
 ) {
-	var excludedNamespaces sets.Set[string]
+	var excludedNamespaces sets.String
 	if evictableNamespaces != nil {
-		excludedNamespaces = sets.New(evictableNamespaces.Exclude...)
+		excludedNamespaces = sets.NewString(evictableNamespaces.Exclude...)
 	}
 
 	if continueEviction(nodeInfo, totalAvailableUsage) {

pkg/framework/plugins/nodeutilization/types.go

@@ -30,7 +30,7 @@ type LowNodeUtilizationArgs struct {
 	NumberOfNodes          int                    `json:"numberOfNodes"`
 
 	// Naming this one differently since namespaces are still
-	// considered while considering resources used by pods
+	// considered while considering resoures used by pods
 	// but then filtered out before eviction
 	EvictableNamespaces *api.Namespaces `json:"evictableNamespaces"`
 }
@@ -44,7 +44,7 @@ type HighNodeUtilizationArgs struct {
 	Thresholds    api.ResourceThresholds `json:"thresholds"`
 	NumberOfNodes int                    `json:"numberOfNodes"`
 	// Naming this one differently since namespaces are still
-	// considered while considering resources used by pods
+	// considered while considering resoures used by pods
 	// but then filtered out before eviction
 	EvictableNamespaces *api.Namespaces `json:"evictableNamespaces"`
 }

pkg/framework/plugins/nodeutilization/validation.go

@@ -16,12 +16,10 @@ package nodeutilization
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/descheduler/pkg/api"
 )
 
-func ValidateHighNodeUtilizationArgs(obj runtime.Object) error {
+func ValidateHighNodeUtilizationArgs(args *HighNodeUtilizationArgs) error {
-	args := obj.(*HighNodeUtilizationArgs)
 	// only exclude can be set, or not at all
 	if args.EvictableNamespaces != nil && len(args.EvictableNamespaces.Include) > 0 {
 		return fmt.Errorf("only Exclude namespaces can be set, inclusion is not supported")
@@ -34,8 +32,7 @@ func ValidateHighNodeUtilizationArgs(obj runtime.Object) error {
 	return nil
 }
 
-func ValidateLowNodeUtilizationArgs(obj runtime.Object) error {
+func ValidateLowNodeUtilizationArgs(args *LowNodeUtilizationArgs) error {
-	args := obj.(*LowNodeUtilizationArgs)
 	// only exclude can be set, or not at all
 	if args.EvictableNamespaces != nil && len(args.EvictableNamespaces.Include) > 0 {
 		return fmt.Errorf("only Exclude namespaces can be set, inclusion is not supported")

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

@@ -29,5 +29,15 @@ import (
 // Public to allow building arbitrary schemes.
 // All generated defaulters are covering - they call all nested defaulters.
 func RegisterDefaults(scheme *runtime.Scheme) error {
+	scheme.AddTypeDefaultingFunc(&HighNodeUtilizationArgs{}, func(obj interface{}) { SetObjectDefaults_HighNodeUtilizationArgs(obj.(*HighNodeUtilizationArgs)) })
+	scheme.AddTypeDefaultingFunc(&LowNodeUtilizationArgs{}, func(obj interface{}) { SetObjectDefaults_LowNodeUtilizationArgs(obj.(*LowNodeUtilizationArgs)) })
 	return nil
 }
+
+func SetObjectDefaults_HighNodeUtilizationArgs(in *HighNodeUtilizationArgs) {
+	SetDefaults_HighNodeUtilizationArgs(in)
+}
+
+func SetObjectDefaults_LowNodeUtilizationArgs(in *LowNodeUtilizationArgs) {
+	SetDefaults_LowNodeUtilizationArgs(in)
+}

pkg/framework/plugins/pluginbuilder/pluginbuilder.go

@@ -0,0 +1,48 @@
+/*
+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 pluginbuilder
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/descheduler/pkg/framework"
+)
+
+var PluginRegistry Registry
+
+type PluginBuilderAndArgsInstance struct {
+	PluginBuilder PluginBuilder
+	// Just an example instance of this PluginArg so we can avoid having
+	// to deal with reflect Types
+	PluginArgInstance runtime.Object
+}
+
+type PluginBuilder = func(args runtime.Object, handle framework.Handle) (framework.Plugin, error)
+
+type Registry = map[string]PluginBuilderAndArgsInstance
+
+func NewRegistry() Registry {
+	return Registry{}
+}
+
+func Register(name string, builderFunc PluginBuilder, exampleArg runtime.Object, registry Registry) {
+	if _, ok := registry[name]; ok {
+		klog.V(10).InfoS("Plugin already registered", "plugin", name)
+	} else {
+		registry[name] = PluginBuilderAndArgsInstance{
+			PluginBuilder:     builderFunc,
+			PluginArgInstance: exampleArg,
+		}
+	}
+}

pkg/framework/plugins/podlifetime/defaults.go

@@ -23,18 +23,17 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 // SetDefaults_PodLifeTimeArgs
 // TODO: the final default values would be discussed in community
-func SetDefaults_PodLifeTimeArgs(obj runtime.Object) {
+func SetDefaults_PodLifeTimeArgs(obj *PodLifeTimeArgs) {
-	args := obj.(*PodLifeTimeArgs)
+	if obj.Namespaces == nil {
-	if args.Namespaces == nil {
+		obj.Namespaces = nil
-		args.Namespaces = nil
 	}
-	if args.LabelSelector == nil {
+	if obj.LabelSelector == nil {
-		args.LabelSelector = nil
+		obj.LabelSelector = nil
 	}
-	if args.MaxPodLifeTimeSeconds == nil {
+	if obj.MaxPodLifeTimeSeconds == nil {
-		args.MaxPodLifeTimeSeconds = nil
+		obj.MaxPodLifeTimeSeconds = nil
 	}
-	if args.States == nil {
+	if obj.States == nil {
-		args.States = nil
+		obj.States = nil
 	}
 }

pkg/framework/plugins/podlifetime/pod_lifetime.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
-	frameworktypes "sigs.k8s.io/descheduler/pkg/framework/types"
+	"sigs.k8s.io/descheduler/pkg/framework"
 
 	"sigs.k8s.io/descheduler/pkg/descheduler/evictions"
 	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
@@ -33,26 +33,26 @@ import (
 
 const PluginName = "PodLifeTime"
 
-var _ frameworktypes.DeschedulePlugin = &PodLifeTime{}
+var _ framework.DeschedulePlugin = &PodLifeTime{}
 
 // PodLifeTime evicts pods on the node that violate the max pod lifetime threshold
 type PodLifeTime struct {
-	handle    frameworktypes.Handle
+	handle    framework.Handle
 	args      *PodLifeTimeArgs
 	podFilter podutil.FilterFunc
 }
 
 // New builds plugin from its arguments while passing a handle
-func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plugin, error) {
+func New(args runtime.Object, handle framework.Handle) (framework.Plugin, error) {
 	podLifeTimeArgs, ok := args.(*PodLifeTimeArgs)
 	if !ok {
 		return nil, fmt.Errorf("want args to be of type PodLifeTimeArgs, got %T", args)
 	}
 
-	var includedNamespaces, excludedNamespaces sets.Set[string]
+	var includedNamespaces, excludedNamespaces sets.String
 	if podLifeTimeArgs.Namespaces != nil {
-		includedNamespaces = sets.New(podLifeTimeArgs.Namespaces.Include...)
+		includedNamespaces = sets.NewString(podLifeTimeArgs.Namespaces.Include...)
-		excludedNamespaces = sets.New(podLifeTimeArgs.Namespaces.Exclude...)
+		excludedNamespaces = sets.NewString(podLifeTimeArgs.Namespaces.Exclude...)
 	}
 
 	// We can combine Filter and PreEvictionFilter since for this strategy it does not matter where we run PreEvictionFilter
@@ -72,7 +72,7 @@ func New(args runtime.Object, handle frameworktypes.Handle) (frameworktypes.Plug
 	})
 
 	if len(podLifeTimeArgs.States) > 0 {
-		states := sets.New(podLifeTimeArgs.States...)
+		states := sets.NewString(podLifeTimeArgs.States...)
 		podFilter = podutil.WrapFilterFuncs(podFilter, func(pod *v1.Pod) bool {
 			if states.Has(string(pod.Status.Phase)) {
 				return true
@@ -101,16 +101,16 @@ func (d *PodLifeTime) Name() string {
 }
 
 // Deschedule extension point implementation for the plugin
-func (d *PodLifeTime) Deschedule(ctx context.Context, nodes []*v1.Node) *frameworktypes.Status {
+func (d *PodLifeTime) Deschedule(ctx context.Context, nodes []*v1.Node) *framework.Status {
 	podsToEvict := make([]*v1.Pod, 0)
 	nodeMap := make(map[string]*v1.Node, len(nodes))
 
 	for _, node := range nodes {
-		klog.V(2).InfoS("Processing node", "node", klog.KObj(node))
+		klog.V(1).InfoS("Processing node", "node", klog.KObj(node))
 		pods, err := podutil.ListAllPodsOnANode(node.Name, d.handle.GetPodsAssignedToNodeFunc(), d.podFilter)
 		if err != nil {
 			// no pods evicted as error encountered retrieving evictable Pods
-			return &frameworktypes.Status{
+			return &framework.Status{
 				Err: fmt.Errorf("error listing pods on a node: %v", err),
 			}
 		}