From 45529062e7654953f5cd2963e68dc1edb2025925 Mon Sep 17 00:00:00 2001
From: Alexander Constantinescu <alexander.constantinescu88@gmail.com>
Date: Fri, 17 Jan 2025 15:56:45 +0100
Subject: [PATCH] KEP-3836: 1.33 - remove feature gate

---
 cmd/kube-proxy/app/server.go                       |  8 +++-----
 pkg/features/kube_features.go                      |  7 -------
 pkg/features/versioned_kube_features.go            |  6 ------
 .../test_data/versioned_feature_list.yaml          | 14 --------------
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go
index 1c6492633f4..af9dd5101fe 100644
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -592,11 +592,9 @@ func (s *ProxyServer) Run(ctx context.Context) error {
 	if s.Config.DetectLocalMode == kubeproxyconfig.LocalModeNodeCIDR {
 		nodeConfig.RegisterEventHandler(proxy.NewNodePodCIDRHandler(ctx, s.podCIDRs))
 	}
-	if utilfeature.DefaultFeatureGate.Enabled(features.KubeProxyDrainingTerminatingNodes) {
-		nodeConfig.RegisterEventHandler(&proxy.NodeEligibleHandler{
-			HealthServer: s.HealthzServer,
-		})
-	}
+	nodeConfig.RegisterEventHandler(&proxy.NodeEligibleHandler{
+		HealthServer: s.HealthzServer,
+	})
 	nodeConfig.RegisterEventHandler(s.Proxier)
 
 	go nodeConfig.Run(wait.NeverStop)
diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index 3b73571a7e8..de7691a035c 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -384,13 +384,6 @@ const (
 	// Add support for distributed tracing in the kubelet
 	KubeletTracing featuregate.Feature = "KubeletTracing"
 
-	// owner: @alexanderConstantinescu
-	// kep: http://kep.k8s.io/3836
-	//
-	// Implement connection draining for terminating nodes for
-	// `externalTrafficPolicy: Cluster` services.
-	KubeProxyDrainingTerminatingNodes featuregate.Feature = "KubeProxyDrainingTerminatingNodes"
-
 	// owner: @RobertKrawitz
 	//
 	// Allow use of filesystems for ephemeral storage monitoring.
diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go
index b6dc23a9a73..1f932552412 100644
--- a/pkg/features/versioned_kube_features.go
+++ b/pkg/features/versioned_kube_features.go
@@ -482,12 +482,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 		{Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta},
 	},
 
-	KubeProxyDrainingTerminatingNodes: {
-		{Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
-		{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.31; remove in 1.33
-	},
-
 	LoadBalancerIPMode: {
 		{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.30"), Default: true, 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 65f5821324b..31d904c2baf 100644
--- a/test/featuregates_linter/test_data/versioned_feature_list.yaml
+++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml
@@ -708,20 +708,6 @@
     lockToDefault: false
     preRelease: Beta
     version: "1.27"
-- name: KubeProxyDrainingTerminatingNodes
-  versionedSpecs:
-  - default: false
-    lockToDefault: false
-    preRelease: Alpha
-    version: "1.28"
-  - default: true
-    lockToDefault: false
-    preRelease: Beta
-    version: "1.30"
-  - default: true
-    lockToDefault: true
-    preRelease: GA
-    version: "1.31"
 - name: LoadBalancerIPMode
   versionedSpecs:
   - default: false