From 4367bae2f5e1fe5206dab97f6f0e724557c3a902 Mon Sep 17 00:00:00 2001 From: Adarsh-verma-14 Date: Fri, 6 Sep 2024 12:04:07 +0530 Subject: [PATCH 1/2] remove the feature flag definition from pkg/features/kube_features.go for RetryGenerateName --- pkg/features/kube_features.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index c30588fb4bb..57299404852 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -259,13 +259,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 @@ -1021,6 +1014,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}, @@ -1060,8 +1055,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}, From 8619996319a07d5c5f777b6e06f54ce3884a73b4 Mon Sep 17 00:00:00 2001 From: Adarsh-verma-14 Date: Sat, 7 Sep 2024 00:07:31 +0530 Subject: [PATCH 2/2] add missing comment --- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 1 + 1 file changed, 1 insertion(+) 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"