Merge pull request #2147 from justinsb/ipv6

Initial ipv6 / iptables work
This commit is contained in:
Brendan Burns
2014-11-14 10:34:37 -08:00
10 changed files with 250 additions and 163 deletions

View File

@@ -100,8 +100,12 @@ func main() {
}
}
protocol := iptables.ProtocolIpv4
if net.IP(bindAddress).To4() == nil {
protocol = iptables.ProtocolIpv6
}
loadBalancer := proxy.NewLoadBalancerRR()
proxier := proxy.NewProxier(loadBalancer, net.IP(bindAddress), iptables.New(exec.New()))
proxier := proxy.NewProxier(loadBalancer, net.IP(bindAddress), iptables.New(exec.New(), protocol))
// Wire proxier to handle changes to services
serviceConfig.RegisterHandler(proxier)
// And wire loadBalancer to handle changes to endpoints to services