github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71035 from Nordix/issue-68437

Browse Source 
Fixes NodePort in ipv6 with proxy-mode=ipvs
This commit is contained in:
Kubernetes Prow Robot
2018-12-10 08:53:42 -08:00
committed by GitHub
parent 486f407b1d 2e5a985e47
commit 0914272a42
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/proxy/ipvs/proxier.go
View File

@@ -406,14 +406,14 @@ func NewProxier(ipt utiliptables.Interface,
healthzServer: healthzServer,
ipvs: ipvs,
ipvsScheduler: scheduler,
ipGetter: &realIPGetter{nl: NewNetLinkHandle()},
ipGetter: &realIPGetter{nl: NewNetLinkHandle(isIPv6)},
iptablesData: bytes.NewBuffer(nil),
filterChainsData: bytes.NewBuffer(nil),
natChains: bytes.NewBuffer(nil),
natRules: bytes.NewBuffer(nil),
filterChains: bytes.NewBuffer(nil),
filterRules: bytes.NewBuffer(nil),
netlinkHandle: NewNetLinkHandle(),
netlinkHandle: NewNetLinkHandle(isIPv6),
ipset: ipset,
nodePortAddresses: nodePortAddresses,
networkInterfacer: utilproxy.RealNetwork{},
@@ -600,7 +600,7 @@ func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset
}
}
// Delete dummy interface created by ipvs Proxier.
nl := NewNetLinkHandle()
nl := NewNetLinkHandle(false)
err := nl.DeleteDummyDevice(DefaultDummyDevice)
if err != nil {
klog.Errorf("Error deleting dummy device %s created by IPVS proxier: %v", DefaultDummyDevice, err)