diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2ca3c1cdcc5..8284a5b4677 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -496,15 +496,6 @@ const ( // Enables querying logs of node services using the /logs endpoint NodeLogQuery featuregate.Feature = "NodeLogQuery" - // owner: @xing-yang @sonasingh46 - // kep: https://kep.k8s.io/2268 - // alpha: v1.24 - // beta: v1.26 - // GA: v1.28 - // - // Allow pods to failover to a different node in case of non graceful node shutdown - NodeOutOfServiceVolumeDetach featuregate.Feature = "NodeOutOfServiceVolumeDetach" - // owner: @iholder101 @kannon92 // kep: https://kep.k8s.io/2400 // alpha: v1.22 diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 43fbf8938a8..39ae95f3682 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -226,11 +226,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta}, }, - NodeOutOfServiceVolumeDetach: { - {Version: version.MustParse("1.24"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.31 - }, NodeSwap: { {Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Beta}, diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index e1f2809735d..3c6ef9dc997 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -536,20 +536,6 @@ lockToDefault: false preRelease: Beta version: "1.30" -- name: NodeOutOfServiceVolumeDetach - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.24" - - default: true - lockToDefault: false - preRelease: Beta - version: "1.26" - - default: true - lockToDefault: true - preRelease: GA - version: "1.28" - name: NodeSwap versionedSpecs: - default: false diff --git a/test/integration/podgc/podgc_test.go b/test/integration/podgc/podgc_test.go index 3175e2ddc17..9d78950920a 100644 --- a/test/integration/podgc/podgc_test.go +++ b/test/integration/podgc/podgc_test.go @@ -160,7 +160,6 @@ func TestTerminatingOnOutOfServiceNode(t *testing.T) { for name, test := range tests { t.Run(name, func(t *testing.T) { - featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeOutOfServiceVolumeDetach, true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.JobPodReplacementPolicy, test.enableJobPodReplacementPolicy) testCtx := setup(t, "podgc-out-of-service") cs := testCtx.ClientSet