From dfeb617cc0e6a7b4c595eb5f7e927e9ceec1e18d Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 23 Mar 2020 22:04:14 -0400 Subject: [PATCH] Simplify dual or single port logic --- .../k8s.io/kubectl/pkg/cmd/portforward/portforward.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go index ceaec5ab3fc..8fd25b87d86 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go @@ -185,13 +185,13 @@ func translateServicePortToTargetPort(ports []string, svc corev1.Service, pod co return nil, err } - // should fail when localPort is empty (=> use random local port) - localportnum, err := strconv.Atoi(localPort) + // convert the resolved target port back to a string + remotePort = strconv.Itoa(int(containerPort)) - if int32(portnum) != containerPort || localPort == "" || (int32(localportnum) != containerPort && err == nil) { - translated = append(translated, fmt.Sprintf("%s:%d", localPort, containerPort)) + if localPort != remotePort { + translated = append(translated, fmt.Sprintf("%s:%s", localPort, remotePort)) } else { - translated = append(translated, fmt.Sprintf("%d", containerPort)) + translated = append(translated, remotePort) } } return translated, nil