Merge pull request #8423 from adrianmoisey/bump-in-place-to-beta

Promote In-Place to Beta

Author: k8s-ci-robot

vertical-pod-autoscaler/docs/features.md

@@ -82,6 +82,7 @@ To enable this feature, set the `--round-memory-bytes` flag when running the VPA
 
 > [!WARNING] 
 > FEATURE STATE: VPA v1.4.0 [alpha]
+> FEATURE STATE: VPA v1.5.0 [beta]
 
 VPA supports in-place updates to reduce disruption when applying resource recommendations. This feature leverages Kubernetes' in-place update capabilities (which is in beta as of Kubernetes 1.33) to modify container resources without requiring pod recreation.
 For more information, see [AEP-4016: Support for in place updates in VPA](https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler/enhancements/4016-in-place-updates-support)
@@ -151,4 +152,4 @@ VPA provides metrics to track in-place update operations:
 * `vpa_in_place_updated_pods_total`: Number of pods successfully updated in-place
 * `vpa_vpas_with_in_place_updatable_pods_total`: Number of VPAs with pods eligible for in-place updates
 * `vpa_vpas_with_in_place_updated_pods_total`: Number of VPAs with successfully in-place updated pods
-* `vpa_updater_failed_in_place_update_attempts_total`: Number of failed attempts to update pods in-place.
+* `vpa_updater_failed_in_place_update_attempts_total`: Number of failed attempts to update pods in-place.

vertical-pod-autoscaler/docs/flags.md

@@ -14,7 +14,7 @@ This document is auto-generated from the flag definitions in the VPA admission-c
 | `address` | string |  ":8944" | The address to expose Prometheus metrics.  |
 | `alsologtostderr` |  |  | log to standard error as well as files (no effect when -logtostderr=true) |
 | `client-ca-file` | string |  "/etc/tls-certs/caCert.pem" | Path to CA PEM file.  |
-| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (ALPHA - default=false) |
+| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (BETA - default=true) |
 | `ignored-vpa-object-namespaces` | string |  | A comma-separated list of namespaces to ignore when searching for VPA objects. Leave empty to avoid ignoring any namespaces. These namespaces will not be cleaned by the garbage collector. |
 | `kube-api-burst` | float |  100 | QPS burst limit when making requests to Kubernetes apiserver  |
 | `kube-api-qps` | float |  50 | QPS limit when making requests to Kubernetes apiserver  |
@@ -68,7 +68,7 @@ This document is auto-generated from the flag definitions in the VPA recommender
 | `cpu-integer-post-processor-enabled` |  |  | Enable the cpu-integer recommendation post processor. The post processor will round up CPU recommendations to a whole CPU for pods which were opted in by setting an appropriate label on VPA object (experimental) |
 | `external-metrics-cpu-metric` | string |  | ALPHA.  Metric to use with external metrics provider for CPU usage. |
 | `external-metrics-memory-metric` | string |  | ALPHA.  Metric to use with external metrics provider for memory usage. |
-| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (ALPHA - default=false) |
+| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (BETA - default=true) |
 | `history-length` | string |  "8d" | How much time back prometheus have to be queried to get historical metrics  |
 | `history-resolution` | string |  "1h" | Resolution at which Prometheus is queried for historical metrics  |
 | `humanize-memory` |  |  | DEPRECATED: Convert memory values in recommendations to the highest appropriate SI unit with up to 2 decimal places for better readability. This flag is deprecated and will be removed in a future version. Use --round-memory-bytes instead. |
@@ -144,7 +144,7 @@ This document is auto-generated from the flag definitions in the VPA updater cod
 | `eviction-rate-burst` | int |  1 | Burst of pods that can be evicted.  |
 | `eviction-rate-limit` | float |  | Number of pods that can be evicted per seconds. A rate limit set to 0 or -1 will disable<br>the rate limiter. (default -1) |
 | `eviction-tolerance` | float |  0.5 | Fraction of replica count that can be evicted for update, if more than one pod can be evicted.  |
-| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (ALPHA - default=false) |
+| `feature-gates` | mapStringBool |  | A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:<br>AllAlpha=true\|false (ALPHA - default=false)<br>AllBeta=true\|false (BETA - default=false)<br>InPlaceOrRecreate=true\|false (BETA - default=true) |
 | `ignored-vpa-object-namespaces` | string |  | A comma-separated list of namespaces to ignore when searching for VPA objects. Leave empty to avoid ignoring any namespaces. These namespaces will not be cleaned by the garbage collector. |
 | `in-recommendation-bounds-eviction-lifetime-threshold` |  |  12h0m0s | duration   Pods that live for at least that long can be evicted even if their request is within the [MinRecommended...MaxRecommended] range  |
 | `kube-api-burst` | float |  100 | QPS burst limit when making requests to Kubernetes apiserver  |

vertical-pod-autoscaler/e2e/v1/actuation.go

@@ -52,14 +52,10 @@ import (
 	"github.com/onsi/gomega"
 )
 
-var _ = ActuationSuiteE2eDescribe("Actuation", ginkgo.Label("FG:InPlaceOrRecreate"), func() {
+var _ = ActuationSuiteE2eDescribe("Actuation", func() {
 	f := framework.NewDefaultFramework("vertical-pod-autoscaling")
 	f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
 
-	ginkgo.BeforeEach(func() {
-		checkInPlaceOrRecreateTestsEnabled(f, true, true)
-	})
-
 	ginkgo.It("still applies recommendations on restart when update mode is InPlaceOrRecreate", func() {
 		ginkgo.By("Setting up a hamster deployment")
 		SetupHamsterDeployment(f, "100m", "100Mi", defaultHamsterReplicas)
@@ -283,11 +279,6 @@ var _ = ActuationSuiteE2eDescribe("Actuation", ginkgo.Label("FG:InPlaceOrRecreat
 		err = WaitForPodsEvicted(f, podList)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
-})
-
-var _ = ActuationSuiteE2eDescribe("Actuation", func() {
-	f := framework.NewDefaultFramework("vertical-pod-autoscaling")
-	f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
 
 	ginkgo.It("stops when pods get pending", func() {
 

vertical-pod-autoscaler/e2e/v1/admission_controller.go

@@ -47,7 +47,6 @@ var _ = AdmissionControllerE2eDescribe("Admission-controller", ginkgo.Label("FG:
 	f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
 
 	ginkgo.BeforeEach(func() {
-		checkInPlaceOrRecreateTestsEnabled(f, true, false)
 		waitForVpaWebhookRegistration(f)
 	})
 

vertical-pod-autoscaler/e2e/v1/common.go

@@ -37,7 +37,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	vpa_clientset "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned"
-	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
 	framework_deployment "k8s.io/kubernetes/test/e2e/framework/deployment"
@@ -613,39 +612,6 @@ func WaitForPodsUpdatedWithoutEviction(f *framework.Framework, initialPods *apiv
 	return err
 }
 
-// checkInPlaceOrRecreateTestsEnabled check for enabled feature gates in the cluster used for the
-// InPlaceOrRecreate VPA feature.
-// Use this in a "beforeEach" call before any suites that use InPlaceOrRecreate featuregate.
-func checkInPlaceOrRecreateTestsEnabled(f *framework.Framework, checkAdmission, checkUpdater bool) {
-	ginkgo.By("Checking InPlacePodVerticalScaling cluster feature gate is on")
-
-	if checkUpdater {
-		ginkgo.By("Checking InPlaceOrRecreate VPA feature gate is enabled for updater")
-
-		deploy, err := f.ClientSet.AppsV1().Deployments(VpaNamespace).Get(context.TODO(), "vpa-updater", metav1.GetOptions{})
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		gomega.Expect(deploy.Spec.Template.Spec.Containers).To(gomega.HaveLen(1))
-		vpaUpdaterPod := deploy.Spec.Template.Spec.Containers[0]
-		gomega.Expect(vpaUpdaterPod.Name).To(gomega.Equal("updater"))
-		if !anyContainsSubstring(vpaUpdaterPod.Args, fmt.Sprintf("%s=true", string(features.InPlaceOrRecreate))) {
-			ginkgo.Skip("Skipping suite: InPlaceOrRecreate feature gate is not enabled for the VPA updater")
-		}
-	}
-
-	if checkAdmission {
-		ginkgo.By("Checking InPlaceOrRecreate VPA feature gate is enabled for admission controller")
-
-		deploy, err := f.ClientSet.AppsV1().Deployments(VpaNamespace).Get(context.TODO(), "vpa-admission-controller", metav1.GetOptions{})
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		gomega.Expect(deploy.Spec.Template.Spec.Containers).To(gomega.HaveLen(1))
-		vpaAdmissionPod := deploy.Spec.Template.Spec.Containers[0]
-		gomega.Expect(vpaAdmissionPod.Name).To(gomega.Equal("admission-controller"))
-		if !anyContainsSubstring(vpaAdmissionPod.Args, fmt.Sprintf("%s=true", string(features.InPlaceOrRecreate))) {
-			ginkgo.Skip("Skipping suite: InPlaceOrRecreate feature gate is not enabled for VPA admission controller")
-		}
-	}
-}
-
 func anyContainsSubstring(arr []string, substr string) bool {
 	for _, s := range arr {
 		if strings.Contains(s, substr) {

vertical-pod-autoscaler/e2e/v1/full_vpa.go

@@ -63,8 +63,6 @@ var _ = FullVpaE2eDescribe("Pods under VPA", func() {
 
 	ginkgo.Describe("with InPlaceOrRecreate update mode", ginkgo.Label("FG:InPlaceOrRecreate"), func() {
 		ginkgo.BeforeEach(func() {
-			checkInPlaceOrRecreateTestsEnabled(f, true, false)
-
 			ns := f.Namespace.Name
 			ginkgo.By("Setting up a hamster deployment")
 			rc = NewDynamicResourceConsumer("hamster", ns, KindDeployment,

vertical-pod-autoscaler/e2e/v1/updater.go

@@ -138,15 +138,6 @@ var _ = UpdaterE2eDescribe("Updater", func() {
 		ginkgo.By(fmt.Sprintf("Waiting for pods to be evicted, hoping it won't happen, sleep for %s", VpaEvictionTimeout.String()))
 		CheckNoPodsEvicted(f, MakePodSet(podList))
 	})
-})
-
-var _ = UpdaterE2eDescribe("Updater", ginkgo.Label("FG:InPlaceOrRecreate"), func() {
-	f := framework.NewDefaultFramework("vertical-pod-autoscaling")
-	f.NamespacePodSecurityEnforceLevel = podsecurity.LevelBaseline
-
-	ginkgo.BeforeEach(func() {
-		checkInPlaceOrRecreateTestsEnabled(f, false, true)
-	})
 
 	ginkgo.It("In-place update pods when Admission Controller status available", func() {
 		const statusUpdateInterval = 10 * time.Second

vertical-pod-autoscaler/pkg/admission-controller/resource/vpa/handler_test.go

@@ -322,9 +322,7 @@ func TestValidateVPA(t *testing.T) {
 	}
 	for _, tc := range tests {
 		t.Run(fmt.Sprintf("test case: %s", tc.name), func(t *testing.T) {
-			if !tc.inPlaceOrRecreateFeatureGateDisabled {
-				featuregatetesting.SetFeatureGateDuringTest(t, features.MutableFeatureGate, features.InPlaceOrRecreate, true)
-			}
+			featuregatetesting.SetFeatureGateDuringTest(t, features.MutableFeatureGate, features.InPlaceOrRecreate, !tc.inPlaceOrRecreateFeatureGateDisabled)
 			err := ValidateVPA(&tc.vpa, tc.isCreate)
 			if tc.expectError == nil {
 				assert.NoError(t, err)

vertical-pod-autoscaler/pkg/features/features.go

@@ -41,6 +41,8 @@ const (
 	// The feature must be enabled by the --feature-gates argument on each listed component.
 
 	// alpha: v1.4.0
+	// beta: v1.5.0
+
 	// components: admission-controller, updater
 
 	// InPlaceOrRecreate enables the InPlaceOrRecreate update mode to be used.

vertical-pod-autoscaler/pkg/features/versioned_features.go

@@ -29,5 +29,6 @@ import (
 var defaultVersionedFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
 	InPlaceOrRecreate: {
 		{Version: version.MustParse("1.4"), Default: false, PreRelease: featuregate.Alpha},
+		{Version: version.MustParse("1.5"), Default: true, PreRelease: featuregate.Beta},
 	},
 }