github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 19:47:56 +00:00
Code Issues Projects Releases Wiki Activity

e2e uses websockets by default for portforward

Browse Source
This commit is contained in:
Antonio Ojea 2025-02-23 11:35:28 +00:00
parent 071b1bd839
commit ae991725b7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/framework/pod/dial.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/client-go/tools/portforward" "k8s.io/client-go/tools/portforward"
"k8s.io/client-go/transport/spdy" "k8s.io/client-go/transport/spdy"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/test/e2e/framework"
) )
// NewTransport creates a transport which uses the port forward dialer. // NewTransport creates a transport which uses the port forward dialer.
@ -91,6 +92,20 @@ func (d *Dialer) DialContainerPort(ctx context.Context, addr Addr) (conn net.Con
} }
dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", req.URL()) dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", req.URL())
tunnelingDialer, err := portforward.NewSPDYOverWebsocketDialer(req.URL(), restConfig)
if err != nil {
return nil, err
}
// First attempt tunneling (websocket) dialer, then fallback to spdy dialer.
dialer = portforward.NewFallbackDialer(tunnelingDialer, dialer, func(err error) bool {
if httpstream.IsUpgradeFailure(err) || httpstream.IsHTTPSProxyError(err) {
framework.Logf("fallback to secondary dialer from primary dialer err: %v", err)
return true
}
framework.Logf("unexpected error trying to use websockets for portforward: %v", err)
return false
})
streamConn, _, err := dialer.Dial(portforward.PortForwardProtocolV1Name) streamConn, _, err := dialer.Dial(portforward.PortForwardProtocolV1Name)
if err != nil { if err != nil {
return nil, fmt.Errorf("dialer failed: %w", err) return nil, fmt.Errorf("dialer failed: %w", err)