Merge pull request #402 from zlabjp/simplify

Simplify

pkg/controller/controller.go

@@ -1305,7 +1305,7 @@ func (lbc *LoadBalancerController) createIngressUpstreams(ctx context.Context, i
 					reqPath = reqPath[:idx]
 				}
 
-				if lbc.noDefaultBackendOverride && (rule.Host == "" && (reqPath == "" || reqPath == "/")) {
+				if lbc.noDefaultBackendOverride && rule.Host == "" && (reqPath == "" || reqPath == "/") {
 					log.Error(nil, "Ignore rule which overrides default backend")
 					continue
 				}
@@ -3239,19 +3239,16 @@ func (lc *LeaderController) getPodNodeAddress(pod *corev1.Pod) (string, error) {
 
 	for i := range node.Status.Addresses {
 		address := &node.Status.Addresses[i]
-		if address.Type == corev1.NodeExternalIP {
-			if address.Address == "" {
-				continue
+		switch address.Type {
+		case corev1.NodeExternalIP:
+			if address.Address != "" {
+				return address.Address, nil
+			}
+		case corev1.NodeInternalIP:
+			if externalIP == "" && lc.lbc.allowInternalIP {
+				// Continue to the next iteration because we may encounter v1.NodeExternalIP later.
+				externalIP = address.Address
 			}
-
-			externalIP = address.Address
-
-			break
-		}
-
-		if externalIP == "" && lc.lbc.allowInternalIP && address.Type == corev1.NodeInternalIP {
-			// Continue to the next iteration because we may encounter v1.NodeExternalIP later.
-			externalIP = address.Address
 		}
 	}