Skip to content

Commit 4552906

Browse files
KEP-3836: 1.33 - remove feature gate
1 parent f64b651 commit 4552906

File tree

4 files changed

+3
-32
lines changed

4 files changed

+3
-32
lines changed

cmd/kube-proxy/app/server.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -592,11 +592,9 @@ func (s *ProxyServer) Run(ctx context.Context) error {
592592
if s.Config.DetectLocalMode == kubeproxyconfig.LocalModeNodeCIDR {
593593
nodeConfig.RegisterEventHandler(proxy.NewNodePodCIDRHandler(ctx, s.podCIDRs))
594594
}
595-
if utilfeature.DefaultFeatureGate.Enabled(features.KubeProxyDrainingTerminatingNodes) {
596-
nodeConfig.RegisterEventHandler(&proxy.NodeEligibleHandler{
597-
HealthServer: s.HealthzServer,
598-
})
599-
}
595+
nodeConfig.RegisterEventHandler(&proxy.NodeEligibleHandler{
596+
HealthServer: s.HealthzServer,
597+
})
600598
nodeConfig.RegisterEventHandler(s.Proxier)
601599

602600
go nodeConfig.Run(wait.NeverStop)

pkg/features/kube_features.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,6 @@ const (
384384
// Add support for distributed tracing in the kubelet
385385
KubeletTracing featuregate.Feature = "KubeletTracing"
386386

387-
// owner: @alexanderConstantinescu
388-
// kep: http://kep.k8s.io/3836
389-
//
390-
// Implement connection draining for terminating nodes for
391-
// `externalTrafficPolicy: Cluster` services.
392-
KubeProxyDrainingTerminatingNodes featuregate.Feature = "KubeProxyDrainingTerminatingNodes"
393-
394387
// owner: @RobertKrawitz
395388
//
396389
// Allow use of filesystems for ephemeral storage monitoring.

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
482482
{Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta},
483483
},
484484

485-
KubeProxyDrainingTerminatingNodes: {
486-
{Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha},
487-
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
488-
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.31; remove in 1.33
489-
},
490-
491485
LoadBalancerIPMode: {
492486
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
493487
{Version: version.MustParse("1.30"), Default: true, 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
@@ -708,20 +708,6 @@
708708
lockToDefault: false
709709
preRelease: Beta
710710
version: "1.27"
711-
- name: KubeProxyDrainingTerminatingNodes
712-
versionedSpecs:
713-
- default: false
714-
lockToDefault: false
715-
preRelease: Alpha
716-
version: "1.28"
717-
- default: true
718-
lockToDefault: false
719-
preRelease: Beta
720-
version: "1.30"
721-
- default: true
722-
lockToDefault: true
723-
preRelease: GA
724-
version: "1.31"
725711
- name: LoadBalancerIPMode
726712
versionedSpecs:
727713
- default: false

0 commit comments

Comments
 (0)