Promote AdminKubeconfigRequest feature gate to GA

gardener · Mar 4, 2022 · b43dbd9 · b43dbd9
1 parent 416eff7
commit b43dbd9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/docs/deployment/feature_gates.md b/docs/deployment/feature_gates.md
@@ -31,8 +31,6 @@ The following tables are a summary of the feature gates that you can set on diff
 | SeedChange                                   | `false` | `Alpha` | `1.12` |        |
 | SeedKubeScheduler                            | `false` | `Alpha` | `1.15` |        |
 | ReversedVPN                                  | `false` | `Alpha` | `1.22` |        |
-| AdminKubeconfigRequest                       | `false` | `Alpha` | `1.24` | `1.38` |
-| AdminKubeconfigRequest                       | `true`  | `Beta`  | `1.39` |        |
 | UseDNSRecords                                | `false` | `Alpha` | `1.27` | `1.38` |
 | UseDNSRecords                                | `true`  | `Beta`  | `1.39` |        |
 | RotateSSHKeypairOnMaintenance                | `false` | `Alpha` | `1.28` |        |
@@ -62,6 +60,9 @@ The following tables are a summary of the feature gates that you can set on diff
 | DisallowKubeconfigRotationForShootInDeletion |         | `Removed` | `1.38` |        |
 | Logging                                      | `false` | `Alpha`   | `0.13` | `1.40` |
 | Logging                                      | `false` | `Removed` | `1.41` |        |
+| AdminKubeconfigRequest                       | `false` | `Alpha`   | `1.24` | `1.38` |
+| AdminKubeconfigRequest                       | `true`  | `Beta`    | `1.39` | `1.41` |
+| AdminKubeconfigRequest                       | `true`  | `GA`      | `1.42` |        |
 
 ## Using a feature
 

diff --git a/docs/proposals/16-adminkubeconfig-subresource.md b/docs/proposals/16-adminkubeconfig-subresource.md
@@ -96,7 +96,7 @@ status:
         client-key-data: LS0tLS1CRUd...
 ```
 
-The `AdminKubeconfigRequest` feature gate (enabled by default starting from `v1.39`) enables the above mentioned API in the `gardener-apiserver`. The old `{shoot-name}.kubeconfig` is kept, but deprecated and will be removed in the future.
+The `AdminKubeconfigRequest` feature gate (enabled strictly starting from `v1.42`) enables the above mentioned API in the `gardener-apiserver`. The old `{shoot-name}.kubeconfig` is kept, but deprecated and will be removed in the future.
 
 In order to get the server's address used in the `kubeconfig`, the Shoot's `status` should be updated with new entries:
 

diff --git a/pkg/apiserver/features/features.go b/pkg/apiserver/features/features.go
@@ -24,7 +24,7 @@ import (
 
 var featureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	features.SeedChange:                      {Default: false, PreRelease: featuregate.Alpha},
-	features.AdminKubeconfigRequest:          {Default: true, PreRelease: featuregate.Beta},
+	features.AdminKubeconfigRequest:          {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	features.UseDNSRecords:                   {Default: true, PreRelease: featuregate.Beta},
 	features.WorkerPoolKubernetesVersion:     {Default: false, PreRelease: featuregate.Alpha},
 	features.SecretBindingProviderValidation: {Default: false, PreRelease: featuregate.Alpha},

diff --git a/pkg/features/features.go b/pkg/features/features.go
@@ -81,6 +81,7 @@ const (
 	// owner: @petersutter
 	// alpha: v1.24.0
 	// beta: v1.39.0
+	// GA: v1.42.0
 	AdminKubeconfigRequest featuregate.Feature = "AdminKubeconfigRequest"
 
 	// UseDNSRecords enables using DNSRecords resources for Gardener DNS records instead of DNSProvider and DNSEntry resources.