Always return an IP address

This commit is contained in:
Manuel de Brito Fontes 2018-02-11 13:38:50 -03:00
parent 42c7111259
commit 59eab049af
No known key found for this signature in database
GPG key ID: 786136016A8BA02A

View file

@ -45,25 +45,29 @@ func GetNodeIPOrName(kubeClient clientset.Interface, name string, useInternalIP
return ""
}
ip := ""
for _, address := range node.Status.Addresses {
if address.Type == apiv1.NodeExternalIP {
if address.Address != "" {
ip = address.Address
break
}
}
}
if useInternalIP {
for _, address := range node.Status.Addresses {
if address.Type == apiv1.NodeInternalIP {
if address.Address != "" {
return address.Address
}
}
}
} else {
for _, address := range node.Status.Addresses {
if address.Type == apiv1.NodeExternalIP {
if address.Address != "" {
return address.Address
ip = address.Address
break
}
}
}
}
return ""
return ip
}
// PodInfo contains runtime information about the pod running the Ingres controller