diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 655aea0bb97..cf5d933767a 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1158,7 +1158,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, ClearingNominatedNodeNameAfterBinding: { - {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: false, PreRelease: featuregate.Alpha}, }, ClusterTrustBundle: { @@ -1516,7 +1516,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, NominatedNodeNameForExpectation: { - {Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.34"), Default: false, PreRelease: featuregate.Alpha}, }, OrderedNamespaceDeletion: { diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index 4c97e8e79fe..4040893383c 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -181,9 +181,9 @@ version: "1.32" - name: ClearingNominatedNodeNameAfterBinding versionedSpecs: - - default: true + - default: false lockToDefault: false - preRelease: Beta + preRelease: Alpha version: "1.34" - name: CloudControllerManagerWebhook versionedSpecs: @@ -1089,9 +1089,9 @@ version: "1.34" - name: NominatedNodeNameForExpectation versionedSpecs: - - default: true + - default: false lockToDefault: false - preRelease: Beta + preRelease: Alpha version: "1.34" - name: OpenAPIEnums versionedSpecs: diff --git a/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go b/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go index a3517b8d36a..a163bceb85b 100644 --- a/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go +++ b/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go @@ -23,7 +23,10 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + utilfeature "k8s.io/apiserver/pkg/util/feature" + featuregatetesting "k8s.io/component-base/featuregate/testing" fwk "k8s.io/kube-scheduler/framework" + "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/framework" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" @@ -126,6 +129,8 @@ func Test_PutNominatedNodeNameInBindingCycle(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { + featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NominatedNodeNameForExpectation, true) + testContext := testutils.InitTestAPIServer(t, "nnn-test", nil) if test.cleanup != nil { defer test.cleanup()