Skip to content

Commit ee7669d

Browse files
committed
Restores the service proxier when unidling is disabled
The unidling code change had inadvertently removed the proxier when idling was disabled. This change restores the default proxier (userspace or iptables depending on the config). Bug 1370435
1 parent 6ac43a7 commit ee7669d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/cmd/server/kubernetes/node.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,11 +452,12 @@ func (c *NodeConfig) RunProxy() {
452452
}
453453
}
454454
endpointsHandler = hybridProxier
455-
456-
iptInterface.AddReloadFunc(hybridProxier.Sync)
457-
serviceConfig.RegisterHandler(hybridProxier)
455+
proxier = hybridProxier
458456
}
459457

458+
iptInterface.AddReloadFunc(proxier.Sync)
459+
serviceConfig.RegisterHandler(proxier)
460+
460461
endpointsConfig := pconfig.NewEndpointsConfig()
461462
// customized handling registration that inserts a filter if needed
462463
if c.FilteringEndpointsHandler != nil {

test/extended/idling/idling.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ var _ = g.Describe("idling and unidling", func() {
432432
for i := 0; i < connectionsToStart; i++ {
433433
connWG.Add(1)
434434
go func(ind int) {
435+
defer g.GinkgoRecover()
435436
defer connWG.Done()
436437
err = tryEchoUDP(svc)
437438
errors[ind] = err

0 commit comments

Comments
 (0)