Merge pull request #112675 from aimuz/improve-readability

improve readability, code nesting too deep

pkg/printers/internalversion/printers.go

@@ -619,35 +619,38 @@ func formatEndpoints(endpoints *api.Endpoints, ports sets.String) string {
 		ss := &endpoints.Subsets[i]
 		if len(ss.Ports) == 0 {
 			// It's possible to have headless services with no ports.
+			count += len(ss.Addresses)
 			for i := range ss.Addresses {
 				if len(list) == max {
 					more = true
+					// the next loop is redundant
+					break
 				}
-				if !more {
 				list = append(list, ss.Addresses[i].IP)
 			}
-				count++
+			// avoid nesting code too deeply
+			continue
 		}
-		} else {
+
 		// "Normal" services with ports defined.
 		for i := range ss.Ports {
 			port := &ss.Ports[i]
 			if ports == nil || ports.Has(port.Name) {
+				count += len(ss.Addresses)
 				for i := range ss.Addresses {
 					if len(list) == max {
 						more = true
+						// the next loop is redundant
+						break
 					}
 					addr := &ss.Addresses[i]
-						if !more {
 					hostPort := net.JoinHostPort(addr.IP, strconv.Itoa(int(port.Port)))
 					list = append(list, hostPort)
 				}
-						count++
-					}
-				}
 			}
 		}
 	}
+
 	ret := strings.Join(list, ",")
 	if more {
 		return fmt.Sprintf("%s + %d more...", ret, count-max)