Skip to content

Commit 619957c

Browse files
Graduate TopologyAwareHints feature-gate to GA in 1.33 and LockToDefault
1 parent f9e92a1 commit 619957c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
786786
{Version: version.MustParse("1.21"), Default: false, PreRelease: featuregate.Alpha},
787787
{Version: version.MustParse("1.23"), Default: false, PreRelease: featuregate.Beta},
788788
{Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta},
789+
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
789790
},
790791

791792
TopologyManagerPolicyAlphaOptions: {

pkg/registry/discovery/endpointslice/strategy_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
apiequality "k8s.io/apimachinery/pkg/api/equality"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/util/sets"
28+
"k8s.io/apimachinery/pkg/util/version"
2829
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
2930
utilfeature "k8s.io/apiserver/pkg/util/feature"
3031
featuregatetesting "k8s.io/component-base/featuregate/testing"
@@ -67,6 +68,9 @@ func Test_dropDisabledFieldsOnCreate(t *testing.T) {
6768

6869
for _, testcase := range testcases {
6970
t.Run(testcase.name, func(t *testing.T) {
71+
if !testcase.hintsGateEnabled {
72+
featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, utilfeature.DefaultFeatureGate, version.MustParse("1.32"))
73+
}
7074
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.TopologyAwareHints, testcase.hintsGateEnabled)
7175

7276
dropDisabledFieldsOnCreate(testcase.eps)
@@ -283,6 +287,9 @@ func Test_dropDisabledFieldsOnUpdate(t *testing.T) {
283287

284288
for _, testcase := range testcases {
285289
t.Run(testcase.name, func(t *testing.T) {
290+
if !testcase.hintsGateEnabled {
291+
featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, utilfeature.DefaultFeatureGate, version.MustParse("1.32"))
292+
}
286293
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.TopologyAwareHints, testcase.hintsGateEnabled)
287294

288295
dropDisabledFieldsOnUpdate(testcase.oldEPS, testcase.newEPS)

0 commit comments

Comments
 (0)