github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127186 from Adarsh-verma-14/remove-duplication

Browse Source 
remove the feature flag duplicate definition from pkg/features/kube_features.go
This commit is contained in:
Kubernetes Prow Robot 2024-09-10 23:05:56 +01:00 committed by GitHub
commit 0aea469b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/features/kube_features.go
View File

@ -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 // Lock to default and remove after v1.22 based on user feedback that should be reflected in KEP #1972 update
ExecProbeTimeout featuregate.Feature = "ExecProbeTimeout" 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 // owner: @bobbypage
// alpha: v1.20 // alpha: v1.20
// beta: v1.21 // beta: v1.21
@ -1028,6 +1021,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
genericfeatures.ResilientWatchCacheInitialization: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.ResilientWatchCacheInitialization: {Default: true, PreRelease: featuregate.Beta},
genericfeatures.RetryGenerateName: {Default: true, PreRelease: featuregate.Beta},
genericfeatures.SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta},
genericfeatures.StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},
@ -1067,8 +1062,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
InPlacePodVerticalScaling: {Default: false, PreRelease: featuregate.Alpha}, InPlacePodVerticalScaling: {Default: false, PreRelease: featuregate.Alpha},
RetryGenerateName: {Default: true, PreRelease: featuregate.Beta},
// features that enable backwards compatibility but are scheduled to be removed // features that enable backwards compatibility but are scheduled to be removed
// ... // ...
HPAScaleToZero: {Default: false, PreRelease: featuregate.Alpha}, HPAScaleToZero: {Default: false, PreRelease: featuregate.Alpha},

1
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View File

@ -188,6 +188,7 @@ const (
// owner: @jpbetz // owner: @jpbetz
// alpha: v1.30 // alpha: v1.30
// beta: v1.31
// Resource create requests using generateName are retried automatically by the apiserver // 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. // if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries.
RetryGenerateName featuregate.Feature = "RetryGenerateName" RetryGenerateName featuregate.Feature = "RetryGenerateName"