Skip to content

Migrate kubectl exec from using SPDY to using WebSockets with SPDY as fallback #1980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andyvandy wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

Migrate kubectl exec from using SPDY to using WebSockets with SPDY as fallback #1980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion pkg/driver/kubernetes/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/httpstream"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
Expand Down Expand Up @@ -115,7 +116,16 @@ func (c *Client) Exec(ctx context.Context, options *ExecStreamOptions) error {
Stderr: options.Stderr != nil,
}, scheme.ParameterCodec)

exec, err := remotecommand.NewSPDYExecutor(c.config, "POST", execRequest.URL())
// Use WebSocket executor which is the default as of Kubernetes 1.31. Fall back to SPDY for older clusters.
websocketExec, err := remotecommand.NewWebSocketExecutor(c.config, "GET", execRequest.URL().String())
if err != nil {
return err
}
spdyExec, err := remotecommand.NewSPDYExecutor(c.config, "POST", execRequest.URL())
if err != nil {
return err
}
exec, err := remotecommand.NewFallbackExecutor(websocketExec, spdyExec, httpstream.IsUpgradeFailure)
if err != nil {
return err
}
Expand Down