From 42e1e7aed41a76642c18f506d4b2f9a76aaeac52 Mon Sep 17 00:00:00 2001
From: Rudi Chiarito <rudi@clarifai.com>
Date: Tue, 23 Aug 2016 09:51:17 -0400
Subject: [PATCH] kubectl: display ExternalName for services

Also add ExternalIPs in `describe`
---
 pkg/kubectl/describe.go         | 6 ++++++
 pkg/kubectl/resource_printer.go | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go
index 26cc34596ae..f7aa7b47f5a 100644
--- a/pkg/kubectl/describe.go
+++ b/pkg/kubectl/describe.go
@@ -1562,6 +1562,12 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api
 		fmt.Fprintf(out, "Selector:\t%s\n", labels.FormatLabels(service.Spec.Selector))
 		fmt.Fprintf(out, "Type:\t%s\n", service.Spec.Type)
 		fmt.Fprintf(out, "IP:\t%s\n", service.Spec.ClusterIP)
+		if len(service.Spec.ExternalIPs) > 0 {
+			fmt.Fprintf(out, "External IPs:\t%v\n", strings.Join(service.Spec.ExternalIPs, ","))
+		}
+		if service.Spec.ExternalName != "" {
+			fmt.Fprintf(out, "External Name:\t%s\n", service.Spec.ExternalName)
+		}
 		if len(service.Status.LoadBalancer.Ingress) > 0 {
 			list := buildIngressString(service.Status.LoadBalancer.Ingress)
 			fmt.Fprintf(out, "LoadBalancer Ingress:\t%s\n", list)
diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go
index 4ccfb396280..10cc51ce8cf 100644
--- a/pkg/kubectl/resource_printer.go
+++ b/pkg/kubectl/resource_printer.go
@@ -1092,6 +1092,8 @@ func getServiceExternalIP(svc *api.Service, wide bool) string {
 			return lbIps
 		}
 		return "<pending>"
+	case api.ServiceTypeExternalName:
+		return svc.Spec.ExternalName
 	}
 	return "<unknown>"
 }