Skip to content

Commit 5639b4b

Browse files
authored
Merge pull request kubernetes#127019 from carlory/remove-fg-NodeOutOfServiceVolumeDetach
Remove generally available feature gate NodeOutOfServiceVolumeDetach
2 parents 88b9395 + d5d5bf9 commit 5639b4b

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -496,15 +496,6 @@ const (
496496
// Enables querying logs of node services using the /logs endpoint
497497
NodeLogQuery featuregate.Feature = "NodeLogQuery"
498498

499-
// owner: @xing-yang @sonasingh46
500-
// kep: https://kep.k8s.io/2268
501-
// alpha: v1.24
502-
// beta: v1.26
503-
// GA: v1.28
504-
//
505-
// Allow pods to failover to a different node in case of non graceful node shutdown
506-
NodeOutOfServiceVolumeDetach featuregate.Feature = "NodeOutOfServiceVolumeDetach"
507-
508499
// owner: @iholder101 @kannon92
509500
// kep: https://kep.k8s.io/2400
510501
// alpha: v1.22

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
226226
{Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha},
227227
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta},
228228
},
229-
NodeOutOfServiceVolumeDetach: {
230-
{Version: version.MustParse("1.24"), Default: false, PreRelease: featuregate.Alpha},
231-
{Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta},
232-
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31
233-
},
234229
NodeSwap: {
235230
{Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha},
236231
{Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Beta},

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -536,20 +536,6 @@
536536
lockToDefault: false
537537
preRelease: Beta
538538
version: "1.30"
539-
- name: NodeOutOfServiceVolumeDetach
540-
versionedSpecs:
541-
- default: false
542-
lockToDefault: false
543-
preRelease: Alpha
544-
version: "1.24"
545-
- default: true
546-
lockToDefault: false
547-
preRelease: Beta
548-
version: "1.26"
549-
- default: true
550-
lockToDefault: true
551-
preRelease: GA
552-
version: "1.28"
553539
- name: NodeSwap
554540
versionedSpecs:
555541
- default: false

test/integration/podgc/podgc_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ func TestTerminatingOnOutOfServiceNode(t *testing.T) {
160160

161161
for name, test := range tests {
162162
t.Run(name, func(t *testing.T) {
163-
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeOutOfServiceVolumeDetach, true)
164163
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.JobPodReplacementPolicy, test.enableJobPodReplacementPolicy)
165164
testCtx := setup(t, "podgc-out-of-service")
166165
cs := testCtx.ClientSet

0 commit comments

Comments
 (0)