From 36f19f77ec755c1916f70c9969169ba5e8ff9e18 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sat, 21 Feb 2015 18:13:28 -0500
Subject: [PATCH] Add PortalIP to Service describe

---
 pkg/kubectl/describe.go         | 6 ++++++
 pkg/kubectl/resource_printer.go | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go
index 8e1613b3ddc..18bf7270e62 100644
--- a/pkg/kubectl/describe.go
+++ b/pkg/kubectl/describe.go
@@ -268,8 +268,14 @@ func (d *ServiceDescriber) Describe(namespace, name string) (string, error) {
 		fmt.Fprintf(out, "Name:\t%s\n", service.Name)
 		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(service.Labels))
 		fmt.Fprintf(out, "Selector:\t%s\n", formatLabels(service.Spec.Selector))
+		fmt.Fprintf(out, "IP:\t%s\n", service.Spec.PortalIP)
+		if len(service.Spec.PublicIPs) > 0 {
+			list := strings.Join(service.Spec.PublicIPs, ", ")
+			fmt.Fprintf(out, "Public IPs:\t%s\n", list)
+		}
 		fmt.Fprintf(out, "Port:\t%d\n", service.Spec.Port)
 		fmt.Fprintf(out, "Endpoints:\t%s\n", formatEndpoints(endpoints.Endpoints))
+		fmt.Fprintf(out, "Session Affinity:\t%s\n", service.Spec.SessionAffinity)
 		if events != nil {
 			describeEvents(events, out)
 		}
diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go
index 330ebe721fc..edefc3beb93 100644
--- a/pkg/kubectl/resource_printer.go
+++ b/pkg/kubectl/resource_printer.go
@@ -267,7 +267,7 @@ func (h *HumanReadablePrinter) printHeader(columnNames []string, w io.Writer) er
 
 func formatEndpoints(endpoints []api.Endpoint) string {
 	if len(endpoints) == 0 {
-		return "<empty>"
+		return "<none>"
 	}
 	list := []string{}
 	for i := range endpoints {