Fix Rebase issue

Rancher annotation fix merge into wrong place after rebase. Annotation ip should be returned after internal ip in GetNodeIPOrName.
mikekuzak · Jun 23, 2018 · d7bd680 · d7bd680
1 parent a6a82dd
commit d7bd680
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/internal/k8s/main.go b/internal/k8s/main.go
@@ -70,13 +70,14 @@ func GetNodeIPOrName(kubeClient clientset.Interface, name string, useInternalIP
 				}
 			}
 		}
-		if node.Annotations != nil {
-			if annotatedIP := node.Annotations[externalAddressAnnotation]; annotatedIP != "" {
-				return annotatedIP
-			}
-			if annotatedIP := node.Annotations[internalAddressAnnotation]; annotatedIP != "" {
-				return annotatedIP
-			}
+	}
+
+	if node.Annotations != nil {
+		if annotatedIP := node.Annotations[externalAddressAnnotation]; annotatedIP != "" {
+			return annotatedIP
+		}
+		if annotatedIP := node.Annotations[internalAddressAnnotation]; annotatedIP != "" {
+			return annotatedIP
 		}
 	}