Skip to content

Commit e3cae09

Browse files
committed
Promote RetryGenerateName to GA
1 parent 283ff76 commit e3cae09

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,8 +1002,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10021002

10031003
genericfeatures.ResilientWatchCacheInitialization: {Default: true, PreRelease: featuregate.Beta},
10041004

1005-
genericfeatures.RetryGenerateName: {Default: true, PreRelease: featuregate.Beta},
1006-
10071005
genericfeatures.SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta},
10081006

10091007
genericfeatures.StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},

pkg/features/versioned_kube_features.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,9 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
431431
KubeletRegistrationGetOnExistsOnly: {
432432
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Deprecated},
433433
},
434+
genericfeatures.RetryGenerateName: {
435+
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
436+
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta},
437+
{Version: version.MustParse("1.32"), Default: true, LockToDefault: true, PreRelease: featuregate.GA},
438+
},
434439
}

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ const (
189189
// owner: @jpbetz
190190
// alpha: v1.30
191191
// beta: v1.31
192+
// ga: v1.32
192193
// Resource create requests using generateName are retried automatically by the apiserver
193194
// if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries.
194195
RetryGenerateName featuregate.Feature = "RetryGenerateName"
@@ -307,6 +308,11 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
307308
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
308309
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
309310
},
311+
RetryGenerateName: {
312+
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
313+
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta},
314+
{Version: version.MustParse("1.32"), Default: true, LockToDefault: true, PreRelease: featuregate.GA},
315+
},
310316
}
311317

312318
// defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
@@ -344,8 +350,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
344350

345351
ResilientWatchCacheInitialization: {Default: true, PreRelease: featuregate.Beta},
346352

347-
RetryGenerateName: {Default: true, PreRelease: featuregate.Beta},
348-
349353
SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta},
350354

351355
StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},

test/featuregates_linter/test_data/unversioned_feature_list.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,6 @@
178178
lockToDefault: false
179179
preRelease: Beta
180180
version: ""
181-
- name: RetryGenerateName
182-
versionedSpecs:
183-
- default: true
184-
lockToDefault: false
185-
preRelease: Beta
186-
version: ""
187181
- name: SeparateCacheWatchRPC
188182
versionedSpecs:
189183
- default: true

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,20 @@
700700
lockToDefault: false
701701
preRelease: Alpha
702702
version: "1.31"
703+
- name: RetryGenerateName
704+
versionedSpecs:
705+
- default: false
706+
lockToDefault: false
707+
preRelease: Alpha
708+
version: "1.30"
709+
- default: true
710+
lockToDefault: false
711+
preRelease: Beta
712+
version: "1.31"
713+
- default: true
714+
lockToDefault: true
715+
preRelease: GA
716+
version: "1.32"
703717
- name: RotateKubeletServerCertificate
704718
versionedSpecs:
705719
- default: false

0 commit comments

Comments
 (0)