Drop UseGardenerNodeAgent feature gate

gardener · Mar 26, 2024 · 3113b80 · 3113b80
1 parent 17733c5
commit 3113b80
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/docs/deployment/feature_gates.md b/docs/deployment/feature_gates.md
@@ -28,9 +28,6 @@ The following tables are a summary of the feature gates that you can set on diff
 | MutableShootSpecNetworkingNodes    | `false` | `Alpha` | `1.64` |        |
 | ShootForceDeletion                 | `false` | `Alpha` | `1.81` | `1.90` |
 | ShootForceDeletion                 | `true`  | `Beta`  | `1.91` |        |
-| UseGardenerNodeAgent               | `false` | `Alpha` | `1.82` | `1.88` |
-| UseGardenerNodeAgent               | `true`  | `Beta`  | `1.89` |        |
-| UseGardenerNodeAgent               | `true`  | `GA`    | `1.90` |        |
 
 ## Feature Gates for Graduated or Deprecated Features
 
@@ -149,6 +146,10 @@ The following tables are a summary of the feature gates that you can set on diff
 | APIServerFastRollout                         | `true`  | `Beta`       | `1.82` | `1.89` |
 | APIServerFastRollout                         | `true`  | `GA`         | `1.90` | `1.91` |
 | APIServerFastRollout                         |         | `Removed`    | `1.92` |        |
+| UseGardenerNodeAgent                         | `false` | `Alpha`      | `1.82` | `1.88` |
+| UseGardenerNodeAgent                         | `true`  | `Beta`       | `1.89` |        |
+| UseGardenerNodeAgent                         | `true`  | `GA`         | `1.90` | `1.91` |
+| UseGardenerNodeAgent                         |         | `Removed`    | `1.92` |        |
 
 ## Using a Feature
 
@@ -195,4 +196,3 @@ A *General Availability* (GA) feature is also referred to as a *stable* feature.
 | IPv6SingleStack                    | `gardener-apiserver`, `gardenlet` | Allows creating seed and shoot clusters with [IPv6 single-stack networking](../usage/ipv6.md) enabled in their spec ([GEP-21](../proposals/21-ipv6-singlestack-local.md)). If enabled in gardenlet, the default behavior is unchanged, but setting `ipFamilies=[IPv6]` in the `seedConfig` is allowed. Only if the `ipFamilies` setting is changed, gardenlet behaves differently. |
 | MutableShootSpecNetworkingNodes    | `gardener-apiserver`              | Allows updating the field `spec.networking.nodes`. The validity of the values has to be checked in the provider extensions. Only enable this feature gate when your system runs provider extensions which have implemented the validation.                                                                                                                                         |
 | ShootForceDeletion                 | `gardener-apiserver`              | Allows forceful deletion of Shoots by annotating them with the `confirmation.gardener.cloud/force-deletion` annotation.                                                                                                                                                                                                                                                            |
-| UseGardenerNodeAgent               | `gardenlet`                       | Enables the `gardener-node-agent` instead of the `cloud-config-downloader` for shoot worker nodes.                                                                                                                                                                                                                                                                                 |
diff --git a/example/gardener-local/gardenlet/values.yaml b/example/gardener-local/gardenlet/values.yaml
@@ -44,7 +44,6 @@ config:
     # This feature gate doesn't change gardenlet's default behavior, it only allows setting `ipFamilies=[IPv6]` in the
     # Seed config. Only when this is set, gardenlet's behavior changes.
     IPv6SingleStack: true
-    UseGardenerNodeAgent: true
   etcdConfig:
     featureGates:
       UseEtcdWrapper: true

diff --git a/extensions/pkg/webhook/controlplane/genericmutator/.import-restrictions b/extensions/pkg/webhook/controlplane/genericmutator/.import-restrictions
@@ -17,7 +17,3 @@ rules:
   - github.com/gardener/gardener/pkg/component
 # allow the transitive import of github.com/gardener/gardener/pkg/features
 # which is imported by github.com/gardener/gardener/pkg/component/extensions/operatingsystemconfig/original/components/kubelet
-# TODO(ialidzhikov): Remove the below rule when the UseGardenerNodeAgent feature gate is promoted to GA.
-- selectorRegexp: github[.]com/gardener/gardener/pkg/features
-  allowedPrefixes:
-  - github.com/gardener/gardener/pkg/features
diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -64,14 +64,6 @@ const (
 	// alpha: v1.81.0
 	// beta: v1.91.0
 	ShootForceDeletion featuregate.Feature = "ShootForceDeletion"
-
-	// UseGardenerNodeAgent enables the `gardener-node-agent` instead of the `cloud-config-downloader` for shoot worker
-	// nodes.
-	// owner: @rfranzke @oliver-goetz
-	// alpha: v1.82.0
-	// beta: v1.89.0
-	// GA: v1.90.0
-	UseGardenerNodeAgent featuregate.Feature = "UseGardenerNodeAgent"
 )
 
 // DefaultFeatureGate is the central feature gate map used by all gardener components.
@@ -106,7 +98,6 @@ var AllFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	IPv6SingleStack:                 {Default: false, PreRelease: featuregate.Alpha},
 	MutableShootSpecNetworkingNodes: {Default: false, PreRelease: featuregate.Alpha},
 	ShootForceDeletion:              {Default: true, PreRelease: featuregate.Beta},
-	UseGardenerNodeAgent:            {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 }
 
 // GetFeatures returns a feature gate map with the respective specifications. Non-existing feature gates are ignored.

diff --git a/pkg/gardenlet/features/features.go b/pkg/gardenlet/features/features.go
@@ -34,6 +34,5 @@ func GetFeatures() []featuregate.Feature {
 		features.DefaultSeccompProfile,
 		features.CoreDNSQueryRewriting,
 		features.IPv6SingleStack,
-		features.UseGardenerNodeAgent,
 	}
 }