From b6d2c2b2957ba31ae5cdd09ad27c658e5f221e93 Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Thu, 21 Apr 2016 15:35:32 +0800 Subject: [PATCH] Clarify kubectl output. --- pkg/kubectl/cmd/cmd_test.go | 4 ++-- pkg/kubectl/resource_printer.go | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 3561eca8d0b..73c4de9fced 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -766,8 +766,8 @@ func Example_printServiceWithNamespacesAndLabels() { } // Output: // |NAMESPACE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE L1| - // |ns1 svc1 10.1.1.1 unknown 53/UDP,53/TCP 10y value| - // |ns2 svc2 10.1.1.2 unknown 80/TCP,8080/TCP 10y dolla-bill-yall| + // |ns1 svc1 10.1.1.1 53/UDP,53/TCP 10y value| + // |ns2 svc2 10.1.1.2 80/TCP,8080/TCP 10y dolla-bill-yall| // || } diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 623bf6f2b62..f6e18849d4c 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -880,16 +880,19 @@ func getServiceExternalIP(svc *api.Service) string { if len(svc.Spec.ExternalIPs) > 0 { return strings.Join(svc.Spec.ExternalIPs, ",") } - return "nodes" + return "" case api.ServiceTypeLoadBalancer: lbIps := loadBalancerStatusStringer(svc.Status.LoadBalancer) if len(svc.Spec.ExternalIPs) > 0 { result := append(strings.Split(lbIps, ","), svc.Spec.ExternalIPs...) return strings.Join(result, ",") } - return lbIps + if len(lbIps) > 0 { + return lbIps + } + return "" } - return "unknown" + return "" } func makePortString(ports []api.ServicePort) string {