Skip to content

Commit 033b275

Browse files
authored
Merge pull request kubernetes#128352 from omerap12/fix-empty-remote-port
port-forward: fixed error handling for empty remote port
2 parents c69f150 + c01a8a5 commit 033b275

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ func convertPodNamedPortToNumber(ports []string, pod corev1.Pod) ([]string, erro
223223
var converted []string
224224
for _, port := range ports {
225225
localPort, remotePort := splitPort(port)
226-
226+
if remotePort == "" {
227+
return nil, fmt.Errorf("remote port cannot be empty")
228+
}
227229
containerPortStr := remotePort
228230
_, err := strconv.Atoi(remotePort)
229231
if err != nil {

staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,24 @@ func TestConvertPodNamedPortToNumber(t *testing.T) {
820820
ports: []string{"https", "http"},
821821
err: true,
822822
},
823+
{
824+
name: "empty port name",
825+
pod: corev1.Pod{
826+
Spec: corev1.PodSpec{
827+
Containers: []corev1.Container{
828+
{
829+
Ports: []corev1.ContainerPort{
830+
{
831+
ContainerPort: int32(27017)},
832+
},
833+
},
834+
},
835+
},
836+
},
837+
ports: []string{"28015:"},
838+
converted: nil,
839+
err: true,
840+
},
823841
}
824842

825843
for _, tc := range cases {

0 commit comments

Comments
 (0)