From d5d5bf9f59eda8ca2fd8c6bf8a5e908956ec8c5d Mon Sep 17 00:00:00 2001
From: carlory <baofa.fan@daocloud.io>
Date: Thu, 5 Sep 2024 10:33:16 +0800
Subject: [PATCH] Remove generally available feature gate
 NodeOutOfServiceVolumeDetach

---
 pkg/features/kube_features.go                      |  9 ---------
 pkg/features/versioned_kube_features.go            |  5 -----
 .../test_data/versioned_feature_list.yaml          | 14 --------------
 test/integration/podgc/podgc_test.go               |  1 -
 4 files changed, 29 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index c30588fb4bb..c0c30d43ccf 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -505,15 +505,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 e88426ed0e7..c59890a9f19 100644
--- a/pkg/features/versioned_kube_features.go
+++ b/pkg/features/versioned_kube_features.go
@@ -232,11 +232,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 2a5653ac3ba..5a0594f3aea 100644
--- a/test/featuregates_linter/test_data/versioned_feature_list.yaml
+++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml
@@ -548,20 +548,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