github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Clarify kubectl output.

Browse Source
This commit is contained in:
Klaus Ma 2016-04-21 15:35:32 +08:00
parent 739d0a61d3
commit b6d2c2b295
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/cmd_test.go
View File

@ -766,8 +766,8 @@ func Example_printServiceWithNamespacesAndLabels() {
} }
// Output: // Output:
// |NAMESPACE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE L1| // |NAMESPACE NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE L1|
// |ns1 svc1 10.1.1.1 unknown 53/UDP,53/TCP 10y value| // |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| // |ns2 svc2 10.1.1.2 <unknown> 80/TCP,8080/TCP 10y dolla-bill-yall|
// || // ||
} }

7
pkg/kubectl/resource_printer.go
View File

@ -880,16 +880,19 @@ func getServiceExternalIP(svc *api.Service) string {
if len(svc.Spec.ExternalIPs) > 0 { if len(svc.Spec.ExternalIPs) > 0 {
return strings.Join(svc.Spec.ExternalIPs, ",") return strings.Join(svc.Spec.ExternalIPs, ",")
} }
return "nodes" return "<nodes>"
case api.ServiceTypeLoadBalancer: case api.ServiceTypeLoadBalancer:
lbIps := loadBalancerStatusStringer(svc.Status.LoadBalancer) lbIps := loadBalancerStatusStringer(svc.Status.LoadBalancer)
if len(svc.Spec.ExternalIPs) > 0 { if len(svc.Spec.ExternalIPs) > 0 {
result := append(strings.Split(lbIps, ","), svc.Spec.ExternalIPs...) result := append(strings.Split(lbIps, ","), svc.Spec.ExternalIPs...)
return strings.Join(result, ",") return strings.Join(result, ",")
} }
if len(lbIps) > 0 {
return lbIps return lbIps
} }
return "unknown" return "<pending>"
}
return "<unknown>"
} }
func makePortString(ports []api.ServicePort) string { func makePortString(ports []api.ServicePort) string {