Skip to content

Commit 10aeb93

Browse files
authored
Merge pull request kubernetes#92736 from robscott/endpointslice-proxying-beta
Graduating EndpointSliceProxying to beta for Linux
2 parents a9ce8c4 + 8039cf9 commit 10aeb93

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

cmd/kube-proxy/app/server_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExi
174174
OOMScoreAdj: config.OOMScoreAdj,
175175
ConfigSyncPeriod: config.ConfigSyncPeriod.Duration,
176176
HealthzServer: healthzServer,
177-
UseEndpointSlices: utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceProxying),
177+
UseEndpointSlices: utilfeature.DefaultFeatureGate.Enabled(features.WindowsEndpointSliceProxying),
178178
}, nil
179179
}
180180

pkg/features/kube_features.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,17 @@ const (
521521

522522
// owner: @robscott @freehan
523523
// alpha: v1.18
524+
// beta: v1.19
524525
//
525526
// Enable Endpoint Slice consumption by kube-proxy for improved scalability.
526527
EndpointSliceProxying featuregate.Feature = "EndpointSliceProxying"
527528

529+
// owner: @robscott @kumarvin123
530+
// alpha: v1.19
531+
//
532+
// Enable Endpoint Slice consumption by kube-proxy in Windows for improved scalability.
533+
WindowsEndpointSliceProxying featuregate.Feature = "WindowsEndpointSliceProxying"
534+
528535
// owner: @Huang-Wei
529536
// alpha: v1.16
530537
// beta: v1.18
@@ -687,7 +694,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
687694
PodOverhead: {Default: true, PreRelease: featuregate.Beta},
688695
IPv6DualStack: {Default: false, PreRelease: featuregate.Alpha},
689696
EndpointSlice: {Default: true, PreRelease: featuregate.Beta},
690-
EndpointSliceProxying: {Default: false, PreRelease: featuregate.Alpha},
697+
EndpointSliceProxying: {Default: true, PreRelease: featuregate.Beta},
698+
WindowsEndpointSliceProxying: {Default: false, PreRelease: featuregate.Alpha},
691699
EvenPodsSpread: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.21
692700
StartupProbe: {Default: true, PreRelease: featuregate.Beta},
693701
AllowInsecureBackendProxy: {Default: true, PreRelease: featuregate.Beta},

pkg/proxy/winkernel/proxier.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ func NewProxier(
579579
}
580580

581581
isIPv6 := utilnet.IsIPv6(nodeIP)
582-
endpointSlicesEnabled := utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceProxying)
582+
endpointSlicesEnabled := utilfeature.DefaultFeatureGate.Enabled(features.WindowsEndpointSliceProxying)
583583
proxier := &Proxier{
584584
endPointsRefCount: make(endPointsReferenceCountMap),
585585
portsMap: make(map[utilproxy.LocalPort]utilproxy.Closeable),
@@ -779,7 +779,7 @@ func (proxier *Proxier) OnServiceDelete(service *v1.Service) {
779779
func (proxier *Proxier) OnServiceSynced() {
780780
proxier.mu.Lock()
781781
proxier.servicesSynced = true
782-
if utilfeature.DefaultFeatureGate.Enabled(features.EndpointSliceProxying) {
782+
if utilfeature.DefaultFeatureGate.Enabled(features.WindowsEndpointSliceProxying) {
783783
proxier.setInitialized(proxier.endpointSlicesSynced)
784784
} else {
785785
proxier.setInitialized(proxier.endpointsSynced)

0 commit comments

Comments
 (0)