diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index dbd41b8c5..053f69af2 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -335,7 +335,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS RemainingItemCount: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 - RetryGenerateName: {Default: false, PreRelease: featuregate.Alpha}, + RetryGenerateName: {Default: true, PreRelease: featuregate.Beta}, SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta}, diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index cb5a5c1c6..25fe2700b 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -399,7 +399,6 @@ func (m *sequentialNameGenerator) GenerateName(base string) string { } func TestStoreCreateWithRetryNameGenerate(t *testing.T) { - featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RetryGenerateName, true) namedObj := func(id int) *example.Pod { return &example.Pod{ @@ -448,6 +447,7 @@ func TestStoreCreateWithRetryNameGenerate(t *testing.T) { } func TestStoreCreateWithRetryNameGenerateFeatureDisabled(t *testing.T) { + featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RetryGenerateName, false) namedObj := func(id int) *example.Pod { return &example.Pod{ ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("prefix-%d", id), Namespace: "test"}, @@ -2973,6 +2973,8 @@ func (p *predictableNameGenerator) GenerateName(base string) string { } func TestStoreCreateGenerateNameConflict(t *testing.T) { + featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RetryGenerateName, false) + // podA will be stored with name foo12345 podA := &example.Pod{ ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "test"},