Simplify dual or single port logic

kubernetes · Mar 24, 2020 · dfeb617 · dfeb617
1 parent ef2eaa4
commit dfeb617
Showing 1 changed file with 5 additions and 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
@@ -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