diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index fe474402f96..74280f3b377 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -266,13 +266,6 @@ const ( // Lock to default and remove after v1.22 based on user feedback that should be reflected in KEP #1972 update ExecProbeTimeout featuregate.Feature = "ExecProbeTimeout" - // owner: @jpbetz - // alpha: v1.30 - // beta: v1.31 - // Resource create requests using generateName are retried automatically by the apiserver - // if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries. - RetryGenerateName featuregate.Feature = "RetryGenerateName" - // owner: @bobbypage // alpha: v1.20 // beta: v1.21 @@ -1028,6 +1021,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.ResilientWatchCacheInitialization: {Default: true, PreRelease: featuregate.Beta}, + genericfeatures.RetryGenerateName: {Default: true, PreRelease: featuregate.Beta}, + genericfeatures.SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha}, @@ -1067,8 +1062,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS InPlacePodVerticalScaling: {Default: false, PreRelease: featuregate.Alpha}, - RetryGenerateName: {Default: true, PreRelease: featuregate.Beta}, - // features that enable backwards compatibility but are scheduled to be removed // ... HPAScaleToZero: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index a86e43f0c8a..3749145f116 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -188,6 +188,7 @@ const ( // owner: @jpbetz // alpha: v1.30 + // beta: v1.31 // Resource create requests using generateName are retried automatically by the apiserver // if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries. RetryGenerateName featuregate.Feature = "RetryGenerateName"