Always return an IP address (#2065)

kubernetes · Feb 11, 2018 · d4784cf · d4784cf
1 parent 42c7111
commit d4784cf
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/internal/k8s/main.go b/internal/k8s/main.go
@@ -45,25 +45,29 @@ func GetNodeIPOrName(kubeClient clientset.Interface, name string, useInternalIP
 		return ""
 	}
 
-	if useInternalIP {
-		for _, address := range node.Status.Addresses {
-			if address.Type == apiv1.NodeInternalIP {
-				if address.Address != "" {
-					return address.Address
-				}
+	ip := ""
+
+	for _, address := range node.Status.Addresses {
+		if address.Type == apiv1.NodeExternalIP {
+			if address.Address != "" {
+				ip = address.Address
+				break
 			}
 		}
-	} else {
+	}
+
+	if useInternalIP {
 		for _, address := range node.Status.Addresses {
-			if address.Type == apiv1.NodeExternalIP {
+			if address.Type == apiv1.NodeInternalIP {
 				if address.Address != "" {
-					return address.Address
+					ip = address.Address
+					break
 				}
 			}
 		}
 	}
 
-	return ""
+	return ip
 }
 
 // PodInfo contains runtime information about the pod running the Ingres controller