From 37de8cafda2eff25101bc21a2d59a19c6516af4e Mon Sep 17 00:00:00 2001 From: Ray Wainman Date: Thu, 16 Jan 2025 02:50:13 +0000 Subject: [PATCH 1/2] Update default VPA version to 1.2.2 in main branch --- .../deploy/admission-controller-deployment.yaml | 2 +- .../deploy/recommender-deployment-high.yaml | 2 +- vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml | 2 +- vertical-pod-autoscaler/deploy/recommender-deployment.yaml | 2 +- vertical-pod-autoscaler/deploy/updater-deployment.yaml | 2 +- vertical-pod-autoscaler/docs/installation.md | 3 ++- vertical-pod-autoscaler/hack/vpa-process-yaml.sh | 2 +- vertical-pod-autoscaler/hack/vpa-up.sh | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml index 567dd430bf14..c4b1f9d8bfda 100644 --- a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: admission-controller - image: registry.k8s.io/autoscaling/vpa-admission-controller:1.2.1 + image: registry.k8s.io/autoscaling/vpa-admission-controller:1.2.2 imagePullPolicy: IfNotPresent env: - name: NAMESPACE diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml index 50412c643d5b..a8e53ac9751d 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml @@ -26,7 +26,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: registry.k8s.io/autoscaling/vpa-recommender:1.2.1 + image: registry.k8s.io/autoscaling/vpa-recommender:1.2.2 imagePullPolicy: Always args: - --recommender-name=performance diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml index e28b114bf638..510870f378ad 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml @@ -26,7 +26,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: registry.k8s.io/autoscaling/vpa-recommender:1.2.1 + image: registry.k8s.io/autoscaling/vpa-recommender:1.2.2 imagePullPolicy: Always args: - --recommender-name=frugal diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml index 5ce429a9fdb2..cc3cd8c4494c 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: registry.k8s.io/autoscaling/vpa-recommender:1.2.1 + image: registry.k8s.io/autoscaling/vpa-recommender:1.2.2 imagePullPolicy: IfNotPresent resources: limits: diff --git a/vertical-pod-autoscaler/deploy/updater-deployment.yaml b/vertical-pod-autoscaler/deploy/updater-deployment.yaml index b1f7343e5bdc..5122248b3a05 100644 --- a/vertical-pod-autoscaler/deploy/updater-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/updater-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: updater - image: registry.k8s.io/autoscaling/vpa-updater:1.2.1 + image: registry.k8s.io/autoscaling/vpa-updater:1.2.2 imagePullPolicy: IfNotPresent env: - name: NAMESPACE diff --git a/vertical-pod-autoscaler/docs/installation.md b/vertical-pod-autoscaler/docs/installation.md index 69b53d5d1fac..c0d7f2368231 100644 --- a/vertical-pod-autoscaler/docs/installation.md +++ b/vertical-pod-autoscaler/docs/installation.md @@ -10,12 +10,13 @@ - [Install command](#install-command) - [Tear down](#tear-down) -The current default version is Vertical Pod Autoscaler 1.2.1 +The current default version is Vertical Pod Autoscaler 1.2.2 ## Compatibility | VPA version | Kubernetes version | |-----------------|--------------------| +| 1.2.2 | 1.27+ | | 1.2.1 | 1.27+ | | 1.2.0 | 1.27+ | | 1.1.2 | 1.25+ | diff --git a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh index 457db9d79d0a..4fcb7e1687a8 100755 --- a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh +++ b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh @@ -32,7 +32,7 @@ if [ $# -eq 0 ]; then fi DEFAULT_REGISTRY="registry.k8s.io/autoscaling" -DEFAULT_TAG="1.2.1" +DEFAULT_TAG="1.2.2" REGISTRY_TO_APPLY=${REGISTRY-$DEFAULT_REGISTRY} TAG_TO_APPLY=${TAG-$DEFAULT_TAG} diff --git a/vertical-pod-autoscaler/hack/vpa-up.sh b/vertical-pod-autoscaler/hack/vpa-up.sh index de9e8e6113b7..222785e54e34 100755 --- a/vertical-pod-autoscaler/hack/vpa-up.sh +++ b/vertical-pod-autoscaler/hack/vpa-up.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. -DEFAULT_TAG="1.2.1" +DEFAULT_TAG="1.2.2" TAG_TO_APPLY=${TAG-$DEFAULT_TAG} if [ "${TAG_TO_APPLY}" == "${DEFAULT_TAG}" ]; then From 44711f669a044015f824bc2bcf14fa2fa4454b92 Mon Sep 17 00:00:00 2001 From: Ray Wainman Date: Thu, 16 Jan 2025 18:20:10 +0000 Subject: [PATCH 2/2] Small cleanup of version compatability table --- vertical-pod-autoscaler/docs/installation.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vertical-pod-autoscaler/docs/installation.md b/vertical-pod-autoscaler/docs/installation.md index c0d7f2368231..bc89985081f7 100644 --- a/vertical-pod-autoscaler/docs/installation.md +++ b/vertical-pod-autoscaler/docs/installation.md @@ -16,11 +16,8 @@ The current default version is Vertical Pod Autoscaler 1.2.2 | VPA version | Kubernetes version | |-----------------|--------------------| -| 1.2.2 | 1.27+ | -| 1.2.1 | 1.27+ | -| 1.2.0 | 1.27+ | -| 1.1.2 | 1.25+ | -| 1.1.1 | 1.25+ | +| 1.2.x | 1.27+ | +| 1.1.x | 1.25+ | | 1.0 | 1.25+ | | 0.14 | 1.25+ | | 0.13 | 1.25+ |