populate target port in service list

kubernetes · Mar 4, 2020 · eab12d9 · eab12d9
1 parent 92fe4dd
commit eab12d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cmd/minikube/cmd/service_list.go b/cmd/minikube/cmd/service_list.go
@@ -66,14 +66,15 @@ var serviceListCmd = &cobra.Command{
 			if len(serviceURL.URLs) == 0 {
 				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "No node port"})
 			} else {
+				servicePortNames := strings.Join(serviceURL.PortNames, "\n")
 				serviceURLs := strings.Join(serviceURL.URLs, "\n")
 
 				// if we are running Docker on OSX we empty the internal service URLs
 				if runtime.GOOS == "darwin" && cfg.Driver == oci.Docker {
 					serviceURLs = ""
 				}
 
-				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, "", serviceURLs})
+				data = append(data, []string{serviceURL.Namespace, serviceURL.Name, servicePortNames, serviceURLs})
 			}
 		}
 

diff --git a/pkg/minikube/service/service.go b/pkg/minikube/service/service.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"text/template"
 	"time"
@@ -196,6 +197,13 @@ func printURLsForService(c typed_core.CoreV1Interface, ip, service, namespace st
 	urls := []string{}
 	portNames := []string{}
 	for _, port := range svc.Spec.Ports {
+
+		if port.Name != "" {
+			m[port.TargetPort.IntVal] = port.Name
+		} else {
+			m[port.TargetPort.IntVal] = strconv.Itoa(int(port.Port))
+		}
+
 		if port.NodePort > 0 {
 			var doc bytes.Buffer
 			err = t.Execute(&doc, struct {