Promote feature gate VPAForETCD to beta status (gardener#9873)

* Promote feature gate VPAForETCD to beta status * Address PR review feedback --------- Co-authored-by: Rafael Franzke <rafael.franzke@sap.com>
jfortin-sap · Jun 6, 2024 · 5019b80 · 5019b80
1 parent 0c63ae3
commit 5019b80
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/docs/deployment/feature_gates.md b/docs/deployment/feature_gates.md
@@ -34,7 +34,8 @@ The following tables are a summary of the feature gates that you can set on diff
 | ShootForceDeletion                 | `true`  | `Beta`  | `1.91` |        |
 | UseNamespacedCloudProfile          | `false` | `Alpha` | `1.92` |        |
 | ShootManagedIssuer                 | `false` | `Alpha` | `1.93` |        |
-| VPAForETCD                         | `false` | `Alpha` | `1.94` |        |
+| VPAForETCD                         | `false` | `Alpha` | `1.94` | `1.96` |
+| VPAForETCD                         | `true`  | `Beta`  | `1.97` |        |
 | VPAAndHPAForAPIServer              | `false` | `Alpha` | `1.95` |        |
 
 ## Feature Gates for Graduated or Deprecated Features

diff --git a/docs/development/autoscaling-specifics-for-components.md b/docs/development/autoscaling-specifics-for-components.md
@@ -17,13 +17,16 @@ However, there are two supported autoscaling modes for the Garden or Shoot clust
    In `HVPA` mode, the etcd is scaled by the [hvpa-controller](https://github.com/gardener/hvpa-controller). The gardenlet/gardener-operator is creating an `HVPA` resource for the etcd (`main` or `events`).
    The `HVPA` enables a vertical scaling for etcd.
 
-   The `HVPA` mode is the used autoscaling mode when the `HVPA` feature gate is enabled (and the `VPAForETCD` feature gate is disabled).
+   The `HVPA` mode is the used autoscaling mode when the `HVPA` feature gate is enabled and the `VPAForETCD` feature gate is disabled.
 
 - `VPA`
 
    In `VPA` mode, the etcd is scaled by a native `VPA` resource.
 
-   The `VPA` mode is the used autoscaling mode when the `VPAForETCD` feature gate is enabled (takes precedence over the `HVPA` feature gate).
+   The `VPA` mode is the used autoscaling mode when the `VPAForETCD` feature gate is enabled (takes precedence over the `HVPA` feature gate). 
+
+> [!NOTE]
+> Starting with release `v1.97`, the `VPAForETCD` feature gate is enabled by default.
 
 For both of the autoscaling modes downscaling is handled more pessimistically to prevent many subsequent etcd restarts. Thus, for `production` and `infrastructure` Shoot clusters (or all Garden clusters), downscaling is deactivated for the main etcd. For all other Shoot clusters, lower advertised requests/limits are only applied during the Shoot's maintenance time window.
 

diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -30,6 +30,7 @@ const (
 	// VPAForETCD enables using plain VPA for etcd-main and etcd-events, even if HVPA is enabled for the other components.
 	// owner @voelzmo
 	// alpha: v1.94.0
+	// beta: v1.97.0
 	VPAForETCD featuregate.Feature = "VPAForETCD"
 
 	// DefaultSeccompProfile defaults the seccomp profile for Gardener managed workload in the seed to RuntimeDefault.
@@ -114,7 +115,7 @@ var DefaultFeatureGate = utilfeature.DefaultMutableFeatureGate
 var AllFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	HVPA:                            {Default: false, PreRelease: featuregate.Alpha},
 	HVPAForShootedSeed:              {Default: false, PreRelease: featuregate.Alpha},
-	VPAForETCD:                      {Default: false, PreRelease: featuregate.Alpha},
+	VPAForETCD:                      {Default: true, PreRelease: featuregate.Beta},
 	DefaultSeccompProfile:           {Default: false, PreRelease: featuregate.Alpha},
 	CoreDNSQueryRewriting:           {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	IPv6SingleStack:                 {Default: false, PreRelease: featuregate.Alpha},