Skip to content

Commit 9e2a0c7

Browse files
authored
Merge pull request kubernetes#133293 from utam0k/kep-5278--fg-alpha
Demote KEP-5278 feature gates ClearingNominatedNodeNameAfterBinding and NominatedNodeNameForExpectation to Alpha
2 parents 032142c + 988c9b0 commit 9e2a0c7

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

pkg/features/kube_features.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
11581158
},
11591159

11601160
ClearingNominatedNodeNameAfterBinding: {
1161-
{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.Beta},
1161+
{Version: version.MustParse("1.34"), Default: false, PreRelease: featuregate.Alpha},
11621162
},
11631163

11641164
ClusterTrustBundle: {
@@ -1516,7 +1516,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
15161516
},
15171517

15181518
NominatedNodeNameForExpectation: {
1519-
{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.Beta},
1519+
{Version: version.MustParse("1.34"), Default: false, PreRelease: featuregate.Alpha},
15201520
},
15211521

15221522
OrderedNamespaceDeletion: {

test/compatibility_lifecycle/reference/versioned_feature_list.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@
181181
version: "1.32"
182182
- name: ClearingNominatedNodeNameAfterBinding
183183
versionedSpecs:
184-
- default: true
184+
- default: false
185185
lockToDefault: false
186-
preRelease: Beta
186+
preRelease: Alpha
187187
version: "1.34"
188188
- name: CloudControllerManagerWebhook
189189
versionedSpecs:
@@ -1089,9 +1089,9 @@
10891089
version: "1.34"
10901090
- name: NominatedNodeNameForExpectation
10911091
versionedSpecs:
1092-
- default: true
1092+
- default: false
10931093
lockToDefault: false
1094-
preRelease: Beta
1094+
preRelease: Alpha
10951095
version: "1.34"
10961096
- name: OpenAPIEnums
10971097
versionedSpecs:

test/integration/scheduler/nominated_node_name/nominated_node_name_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ import (
2323

2424
v1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
26+
utilfeature "k8s.io/apiserver/pkg/util/feature"
27+
featuregatetesting "k8s.io/component-base/featuregate/testing"
2628
fwk "k8s.io/kube-scheduler/framework"
29+
"k8s.io/kubernetes/pkg/features"
2730
"k8s.io/kubernetes/pkg/scheduler"
2831
"k8s.io/kubernetes/pkg/scheduler/framework"
2932
frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
@@ -126,6 +129,8 @@ func Test_PutNominatedNodeNameInBindingCycle(t *testing.T) {
126129

127130
for _, test := range tests {
128131
t.Run(test.name, func(t *testing.T) {
132+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NominatedNodeNameForExpectation, true)
133+
129134
testContext := testutils.InitTestAPIServer(t, "nnn-test", nil)
130135
if test.cleanup != nil {
131136
defer test.cleanup()

0 commit comments

Comments
 (0)