update

Signed-off-by: bitliu <[email protected]>

Author: Xunzhuo

e2e/pkg/helpers/kubernetes.go

@@ -114,44 +114,19 @@ func VerifyServicePodsRunning(ctx context.Context, client *kubernetes.Clientset,
 }
 
 // StartPortForward starts port forwarding to a service
+// The ports parameter should be in format "localPort:servicePort" (e.g., "8080:80")
+// This function forwards directly to the service, letting Kubernetes handle the routing
 func StartPortForward(ctx context.Context, client *kubernetes.Clientset, restConfig *rest.Config, namespace, service, ports string, verbose bool) error {
-	// Parse ports (e.g., "8080:80" -> local=8080, remote=80)
+	// Parse ports (e.g., "8080:80" -> local=8080, service=80)
 	portParts := strings.Split(ports, ":")
 	if len(portParts) != 2 {
-		return fmt.Errorf("invalid port format: %s (expected format: localPort:remotePort)", ports)
+		return fmt.Errorf("invalid port format: %s (expected format: localPort:servicePort)", ports)
 	}
 	localPort := portParts[0]
-	remotePort := portParts[1]
-
-	// Get the service to find a pod
-	svc, err := client.CoreV1().Services(namespace).Get(ctx, service, metav1.GetOptions{})
-	if err != nil {
-		return fmt.Errorf("failed to get service: %w", err)
-	}
-
-	// Get pods matching the service selector
-	var selectorParts []string
-	for key, value := range svc.Spec.Selector {
-		selectorParts = append(selectorParts, fmt.Sprintf("%s=%s", key, value))
-	}
-	labelSelector := strings.Join(selectorParts, ",")
-
-	pods, err := client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{
-		LabelSelector: labelSelector,
-		FieldSelector: "status.phase=Running",
-	})
-	if err != nil {
-		return fmt.Errorf("failed to list pods: %w", err)
-	}
-
-	if len(pods.Items) == 0 {
-		return fmt.Errorf("no running pods found for service %s", service)
-	}
-
-	podName := pods.Items[0].Name
+	servicePort := portParts[1]
 
 	if verbose {
-		fmt.Printf("[Helper] Starting port-forward to pod %s/%s (%s:%s)\n", namespace, podName, localPort, remotePort)
+		fmt.Printf("[Helper] Starting port-forward to service %s/%s (%s:%s)\n", namespace, service, localPort, servicePort)
 	}
 
 	// Create SPDY transport
@@ -160,11 +135,11 @@ func StartPortForward(ctx context.Context, client *kubernetes.Clientset, restCon
 		return fmt.Errorf("failed to create SPDY transport: %w", err)
 	}
 
-	// Build the URL for port forwarding
+	// Build the URL for port forwarding to service
 	url := client.CoreV1().RESTClient().Post().
-		Resource("pods").
+		Resource("services").
 		Namespace(namespace).
-		Name(podName).
+		Name(service).
 		SubResource("portforward").
 		URL()
 
@@ -182,7 +157,7 @@ func StartPortForward(ctx context.Context, client *kubernetes.Clientset, restCon
 	}
 
 	// Create port forwarder
-	forwarder, err := portforward.New(dialer, []string{fmt.Sprintf("%s:%s", localPort, remotePort)}, stopChan, readyChan, out, errOut)
+	forwarder, err := portforward.New(dialer, []string{fmt.Sprintf("%s:%s", localPort, servicePort)}, stopChan, readyChan, out, errOut)
 	if err != nil {
 		return fmt.Errorf("failed to create port forwarder: %w", err)
 	}

e2e/profiles/ai-gateway/chat_completions_request.go

@@ -70,7 +70,8 @@ func testChatCompletionsRequest(ctx context.Context, client *kubernetes.Clientse
 		fmt.Printf("[Test] Envoy service: %s\n", envoyService)
 	}
 
-	// Start port forwarding
+	// Start port forwarding to service (8080:80)
+	// Port forwarding to service lets Kubernetes handle the port mapping automatically
 	if err := helpers.StartPortForward(ctx, client, opts.RestConfig, "envoy-gateway-system", envoyService, "8080:80", opts.Verbose); err != nil {
 		return fmt.Errorf("failed to start port forwarding: %w", err)
 	}
@@ -136,4 +137,3 @@ func testChatCompletionsRequest(ctx context.Context, client *kubernetes.Clientse
 
 	return nil
 }
-