github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix review

Browse Source
This commit is contained in:
lichunlong 2017-06-01 17:22:41 +08:00
parent 58d0596c23
commit 63bc96e1b0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kube-proxy/app/server.go
View File

@ -399,9 +399,13 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
proxyMode := getProxyMode(string(config.Mode), iptInterface, iptables.LinuxKernelCompatTester{}) proxyMode := getProxyMode(string(config.Mode), iptInterface, iptables.LinuxKernelCompatTester{})
if proxyMode == proxyModeIPTables { if proxyMode == proxyModeIPTables {
glog.V(0).Info("Using iptables Proxier.") glog.V(0).Info("Using iptables Proxier.")
nodeIP := net.ParseIP(config.BindAddress) var nodeIP net.IP
if local, _ := isLocalIP(nodeIP); !local { if config.BindAddress != "0.0.0.0" {
glog.V(2).Infof("bind-address %s must be local ip", config.BindAddress) nodeIP := net.ParseIP(config.BindAddress)
if local := isLocalIP(nodeIP); !local {
return nil, fmt.Errorf("invalid bind-address: %v, it must be a local IP", config.BindAddress)
}
} else {
nodeIP = getNodeIP(client, hostname) nodeIP = getNodeIP(client, hostname)
} }
if config.IPTables.MasqueradeBit == nil { if config.IPTables.MasqueradeBit == nil {
@ -705,19 +709,19 @@ func getNodeIP(client clientset.Interface, hostname string) net.IP {
return nodeIP return nodeIP
} }
func isLocalIP(ip net.IP) (bool, error) { func isLocalIP(ip net.IP) bool {
addrs, err := net.InterfaceAddrs() addrs, err := net.InterfaceAddrs()
if err != nil { if err != nil {
return false, err return false
} }
for i := range addrs { for i := range addrs {
intfIP, _, err := net.ParseCIDR(addrs[i].String()) intfIP, _, err := net.ParseCIDR(addrs[i].String())
if err != nil { if err != nil {
return false, err return false
} }
if ip.Equal(intfIP) { if ip.Equal(intfIP) {
return true, nil return true
} }
} }
return false, nil return false
} }