Merge pull request #41805 from aanm/adding-ipv6-brackets-in-kubectl-endpoint

Automatic merge from submit-queue kubectl: Adding IPv6 brackets for IPv6 endpoints This fixes the lack of IPv6 when printing the IP:Port tuple with kubectl describe command. Signed-off-by: André Martins <aanm90@gmail.com> **What this PR does / why we need it**: This adds IPv6 brackets on IPv6 endpoints when using `kubectl describe service` **Special notes for your reviewer**: Since the IP is a string I think the fastest way to detect if it's an IPv6 was to check for the presence of : in it. Let me know what you think.

Merge pull request #41805 from aanm/adding-ipv6-brackets-in-kubectl-endpoint
74c23bdf · Kubernetes Submit Queue · GitHub · 4fa902a9 · cecc03ca · 74c23bdf
Commit 74c23bdf authored Apr 02, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

printers.go pkg/printers/internalversion/printers.go +4 -1

No files found.
--- a/pkg/printers/internalversion/printers.go
+++ b/pkg/printers/internalversion/printers.go
@@ -20,7 +20,9 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"net"
 	"sort"
+	"strconv"
 	"strings"
 	"time"

@@ -223,7 +225,8 @@ func formatEndpoints(endpoints *api.Endpoints, ports sets.String) string {
 					}
 					addr := &ss.Addresses[i]
 					if !more {
-						list = append(list, fmt.Sprintf("%s:%d", addr.IP, port.Port))
+						hostPort := net.JoinHostPort(addr.IP, strconv.Itoa(int(port.Port)))
+						list = append(list, hostPort)
 					}
 					count++
 				}