From ad8506c3c55594c57ccda484ddcb43d70f210b3d Mon Sep 17 00:00:00 2001
From: xiangpengzhao <zhao.xiangpeng@zte.com.cn>
Date: Thu, 3 Aug 2017 16:18:54 +0800
Subject: [PATCH] Display healthcheck nodeport and other fields in describe
 service

---
 pkg/printers/internalversion/describe.go      | 17 +++++++++
 pkg/printers/internalversion/describe_test.go | 35 +++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go
index 0d64b65e979..d8b3ae409a8 100644
--- a/pkg/printers/internalversion/describe.go
+++ b/pkg/printers/internalversion/describe.go
@@ -2006,6 +2006,9 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api
 		if len(service.Spec.ExternalIPs) > 0 {
 			w.Write(LEVEL_0, "External IPs:\t%v\n", strings.Join(service.Spec.ExternalIPs, ","))
 		}
+		if service.Spec.LoadBalancerIP != "" {
+			w.Write(LEVEL_0, "IP:\t%s\n", service.Spec.LoadBalancerIP)
+		}
 		if service.Spec.ExternalName != "" {
 			w.Write(LEVEL_0, "External Name:\t%s\n", service.Spec.ExternalName)
 		}
@@ -2021,12 +2024,26 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api
 				name = "<unset>"
 			}
 			w.Write(LEVEL_0, "Port:\t%s\t%d/%s\n", name, sp.Port, sp.Protocol)
+			if sp.TargetPort.Type == intstr.Type(intstr.Int) {
+				w.Write(LEVEL_0, "TargetPort:\t%d/%s\n", sp.TargetPort.IntVal, sp.Protocol)
+			} else {
+				w.Write(LEVEL_0, "TargetPort:\t%d/%s\n", sp.TargetPort.StrVal, sp.Protocol)
+			}
 			if sp.NodePort != 0 {
 				w.Write(LEVEL_0, "NodePort:\t%s\t%d/%s\n", name, sp.NodePort, sp.Protocol)
 			}
 			w.Write(LEVEL_0, "Endpoints:\t%s\n", formatEndpoints(endpoints, sets.NewString(sp.Name)))
 		}
 		w.Write(LEVEL_0, "Session Affinity:\t%s\n", service.Spec.SessionAffinity)
+		if service.Spec.ExternalTrafficPolicy != "" {
+			w.Write(LEVEL_0, "External Traffic Policy:\t%s\n", service.Spec.ExternalTrafficPolicy)
+		}
+		if service.Spec.HealthCheckNodePort != 0 {
+			w.Write(LEVEL_0, "HealthCheck NodePort:\t%d\n", service.Spec.HealthCheckNodePort)
+		}
+		if len(service.Spec.LoadBalancerSourceRanges) > 0 {
+			w.Write(LEVEL_0, "LoadBalancer Source Ranges:\t%v\n", strings.Join(service.Spec.LoadBalancerSourceRanges, ","))
+		}
 		if events != nil {
 			DescribeEvents(events, w)
 		}
diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go
index 91a7ca02841..9d9e8d99c27 100644
--- a/pkg/printers/internalversion/describe_test.go
+++ b/pkg/printers/internalversion/describe_test.go
@@ -172,15 +172,46 @@ func TestDescribeService(t *testing.T) {
 			Name:      "bar",
 			Namespace: "foo",
 		},
+		Spec: api.ServiceSpec{
+			Type: api.ServiceTypeLoadBalancer,
+			Ports: []api.ServicePort{{
+				Name:       "port-tcp",
+				Port:       8080,
+				Protocol:   api.ProtocolTCP,
+				TargetPort: intstr.FromInt(9527),
+				NodePort:   31111,
+			}},
+			Selector:              map[string]string{"blah": "heh"},
+			ClusterIP:             "1.2.3.4",
+			LoadBalancerIP:        "5.6.7.8",
+			SessionAffinity:       "None",
+			ExternalTrafficPolicy: "Local",
+			HealthCheckNodePort:   32222,
+		},
 	})
+	expectedElements := []string{
+		"Name", "bar",
+		"Namespace", "foo",
+		"Selector", "blah=heh",
+		"Type", "LoadBalancer",
+		"IP", "1.2.3.4",
+		"Port", "port-tcp", "8080/TCP",
+		"TargetPort", "9527/TCP",
+		"NodePort", "port-tcp", "31111/TCP",
+		"Session Affinity", "None",
+		"External Traffic Policy", "Local",
+		"HealthCheck NodePort", "32222",
+	}
 	c := &describeClient{T: t, Namespace: "foo", Interface: fake}
 	d := ServiceDescriber{c}
 	out, err := d.Describe("foo", "bar", printers.DescriberSettings{ShowEvents: true})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
-	if !strings.Contains(out, "Labels:") || !strings.Contains(out, "bar") {
-		t.Errorf("unexpected out: %s", out)
+	for _, expected := range expectedElements {
+		if !strings.Contains(out, expected) {
+			t.Errorf("expected to find %q in output: %q", expected, out)
+		}
 	}
 }