Merge pull request kubernetes#94728 from amorenoz/portforward_udp

kubectl: Fix TCP and UDP port forward

Author: k8s-ci-robot

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

@@ -260,35 +260,37 @@ func checkUDPPorts(udpOnlyPorts sets.Int, ports []string, obj metav1.Object) err
 // checkUDPPortInService returns an error if remote port in Service is a UDP port
 // TODO: remove this check after #47862 is solved
 func checkUDPPortInService(ports []string, svc *corev1.Service) error {
-	udpOnlyPorts := sets.NewInt()
+	udpPorts := sets.NewInt()
+	tcpPorts := sets.NewInt()
 	for _, port := range svc.Spec.Ports {
 		portNum := int(port.Port)
 		switch port.Protocol {
 		case corev1.ProtocolUDP:
-			udpOnlyPorts.Insert(portNum)
+			udpPorts.Insert(portNum)
 		case corev1.ProtocolTCP:
-			udpOnlyPorts.Delete(portNum)
+			tcpPorts.Insert(portNum)
 		}
 	}
-	return checkUDPPorts(udpOnlyPorts, ports, svc)
+	return checkUDPPorts(udpPorts.Difference(tcpPorts), ports, svc)
 }
 
 // checkUDPPortInPod returns an error if remote port in Pod is a UDP port
 // TODO: remove this check after #47862 is solved
 func checkUDPPortInPod(ports []string, pod *corev1.Pod) error {
-	udpOnlyPorts := sets.NewInt()
+	udpPorts := sets.NewInt()
+	tcpPorts := sets.NewInt()
 	for _, ct := range pod.Spec.Containers {
 		for _, ctPort := range ct.Ports {
 			portNum := int(ctPort.ContainerPort)
 			switch ctPort.Protocol {
 			case corev1.ProtocolUDP:
-				udpOnlyPorts.Insert(portNum)
+				udpPorts.Insert(portNum)
 			case corev1.ProtocolTCP:
-				udpOnlyPorts.Delete(portNum)
+				tcpPorts.Insert(portNum)
 			}
 		}
 	}
-	return checkUDPPorts(udpOnlyPorts, ports, pod)
+	return checkUDPPorts(udpPorts.Difference(tcpPorts), ports, pod)
 }
 
 // Complete completes all the required options for port-forward cmd.

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

@@ -880,7 +880,7 @@ func TestCheckUDPPort(t *testing.T) {
 			expectError: true,
 		},
 		{
-			name: "Pod has ports with both TCP and UDP protocol",
+			name: "Pod has ports with both TCP and UDP protocol (UDP first)",
 			pod: &corev1.Pod{
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
@@ -895,6 +895,22 @@ func TestCheckUDPPort(t *testing.T) {
 			},
 			ports: []string{":53"},
 		},
+		{
+			name: "Pod has ports with both TCP and UDP protocol (TCP first)",
+			pod: &corev1.Pod{
+				Spec: corev1.PodSpec{
+					Containers: []corev1.Container{
+						{
+							Ports: []corev1.ContainerPort{
+								{Protocol: corev1.ProtocolTCP, ContainerPort: 53},
+								{Protocol: corev1.ProtocolUDP, ContainerPort: 53},
+							},
+						},
+					},
+				},
+			},
+			ports: []string{":53"},
+		},
 
 		{
 			name: "forward to a UDP port in a Service",
@@ -921,7 +937,7 @@ func TestCheckUDPPort(t *testing.T) {
 			expectError: true,
 		},
 		{
-			name: "Service has ports with both TCP and UDP protocol",
+			name: "Service has ports with both TCP and UDP protocol (UDP first)",
 			service: &corev1.Service{
 				Spec: corev1.ServiceSpec{
 					Ports: []corev1.ServicePort{
@@ -932,6 +948,18 @@ func TestCheckUDPPort(t *testing.T) {
 			},
 			ports: []string{"53"},
 		},
+		{
+			name: "Service has ports with both TCP and UDP protocol (TCP first)",
+			service: &corev1.Service{
+				Spec: corev1.ServiceSpec{
+					Ports: []corev1.ServicePort{
+						{Protocol: corev1.ProtocolTCP, Port: 53},
+						{Protocol: corev1.ProtocolUDP, Port: 53},
+					},
+				},
+			},
+			ports: []string{"53"},
+		},
 	}
 	for _, tc := range tests {
 		var err error