update port-forwarder

Author: matmerr

test/integration/k8s_test.go

@@ -166,26 +166,26 @@ func TestPodScaling(t *testing.T) {
 			clusterCheckCtx, cancel := context.WithTimeout(ctx, 20*time.Minute)
 			defer cancel()
 
-			pfOpts := PortForwardingOpts{
-				Namespace:     "default",
-				LabelSelector: "type=goldpinger-pod",
-				LocalPort:     9090,
-				DestPort:      8080,
-			}
+			Namespace := "default"
+			LabelSelector := "type=goldpinger-pod"
+			LocalPort := 9090
+			DestPort := 8080
 
 			pingCheckFn := func() error {
-				pf, err := NewPortForwarder(restConfig, t, pfOpts)
+				pf, err := NewPortForwarder(restConfig)
 				if err != nil {
 					t.Fatalf("could not build port forwarder: %v", err)
 				}
 
 				portForwardCtx, cancel := context.WithTimeout(ctx, (retryAttempts+1)*retryDelaySec)
 				defer cancel()
 
+				var handle PortForwardStreamHandle
 				portForwardFn := func() error {
 					t.Log("attempting port forward")
 
-					if err := pf.Forward(portForwardCtx); err != nil {
+					handle, err = pf.ForwardWithLabelSelector(portForwardCtx, Namespace, LabelSelector, LocalPort, DestPort)
+					if err != nil {
 						return fmt.Errorf("could not start port forward: %w", err)
 					}
 
@@ -196,11 +196,9 @@ func TestPodScaling(t *testing.T) {
 					t.Fatalf("could not start port forward within %v: %v", retryDelaySec.String(), err)
 				}
 
-				go pf.KeepAlive(clusterCheckCtx)
-
-				defer pf.Stop()
+				defer handle.Stop()
 
-				gpClient := goldpinger.Client{Host: pf.Address()}
+				gpClient := goldpinger.Client{Host: handle.URL()}
 
 				clusterState, err := gpClient.CheckAll(clusterCheckCtx)
 				if err != nil {