Skip to content
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

support websocket for exec and attach #1305

Closed
wants to merge 1 commit into from
Closed

support websocket for exec and attach #1305

Show file tree
Hide file tree
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
22 changes: 21 additions & 1 deletion cmd/crictl/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
mobyterm "github.com/moby/term"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
"k8s.io/apimachinery/pkg/util/httpstream"
restclient "k8s.io/client-go/rest"
remoteclient "k8s.io/client-go/tools/remotecommand"
internalapi "k8s.io/cri-api/pkg/apis"
Expand Down Expand Up @@ -163,8 +164,27 @@ func Exec(ctx context.Context, client internalapi.RuntimeService, opts execOptio
return stream(ctx, opts.stdin, opts.tty, URL)
}

func getExecutor(url *url.URL) (exec remoteclient.Executor, err error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say we reintroduce the flag to select the executor.

config := &restclient.Config{TLSClientConfig: restclient.TLSClientConfig{Insecure: true}}

exec, err = remoteclient.NewSPDYExecutor(config, "POST", url)
if err != nil {
return
}
if !IsEnabledWebsockets() {
return
}
Comment on lines +174 to +176
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if !IsEnabledWebsockets() {
return
}

wexec, err := remoteclient.NewWebSocketExecutor(config, "GET", url.String())
if err != nil {
return
}

exec, err = remoteclient.NewFallbackExecutor(wexec, exec, httpstream.IsUpgradeFailure)
return
}

func stream(ctx context.Context, in, tty bool, url *url.URL) error {
executor, err := remoteclient.NewSPDYExecutor(&restclient.Config{TLSClientConfig: restclient.TLSClientConfig{Insecure: true}}, "POST", url)
executor, err := getExecutor(url)
if err != nil {
return err
}
Expand Down
4 changes: 4 additions & 0 deletions cmd/crictl/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ func SetupInterruptSignalHandler() <-chan struct{} {
return signalIntStopCh
}

func IsEnabledWebsockets() bool {
return strings.ToLower(os.Getenv("CRICTL_REMOTE_COMMAND_WEBSOCKETS")) == "true"
}
Comment on lines +73 to +75
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this


type listOptions struct {
// id of container or sandbox
id string
Expand Down