support websocket for exec and attach

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

cmd/crictl/attach.go

@@ -43,6 +43,11 @@ var runtimeAttachCommand = &cli.Command{
 			Aliases: []string{"i"},
 			Usage:   "Keep STDIN open",
 		},
+		&cli.BoolFlag{
+			Name:    "websocket",
+			Aliases: []string{"w"},
+			Usage:   "Use websocket protocol",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		id := c.Args().First()
@@ -63,9 +68,10 @@ var runtimeAttachCommand = &cli.Command{
 		defer cancel()
 
 		var opts = attachOptions{
-			id:    id,
-			tty:   c.Bool("tty"),
-			stdin: c.Bool("stdin"),
+			id:        id,
+			tty:       c.Bool("tty"),
+			stdin:     c.Bool("stdin"),
+			websocket: c.Bool("websocket"),
 		}
 		if err = Attach(ctx, runtimeClient, opts); err != nil {
 			return fmt.Errorf("attaching running container failed: %w", err)
@@ -109,5 +115,5 @@ func Attach(ctx context.Context, client internalapi.RuntimeService, opts attachO
 	}
 
 	logrus.Debugf("Attach URL: %v", URL)
-	return stream(ctx, opts.stdin, opts.tty, URL)
+	return stream(ctx, opts.stdin, opts.tty, opts.websocket, URL)
 }

cmd/crictl/exec.go

@@ -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"
@@ -67,6 +68,11 @@ var runtimeExecCommand = &cli.Command{
 			Aliases: []string{"i"},
 			Usage:   "Keep STDIN open",
 		},
+		&cli.BoolFlag{
+			Name:    "websocket",
+			Aliases: []string{"w"},
+			Usage:   "Use websocket protocol",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		if c.NArg() < 2 {
@@ -79,11 +85,12 @@ var runtimeExecCommand = &cli.Command{
 		}
 
 		var opts = execOptions{
-			id:      c.Args().First(),
-			timeout: c.Int64("timeout"),
-			tty:     c.Bool("tty"),
-			stdin:   c.Bool("interactive"),
-			cmd:     c.Args().Slice()[1:],
+			id:        c.Args().First(),
+			timeout:   c.Int64("timeout"),
+			tty:       c.Bool("tty"),
+			stdin:     c.Bool("interactive"),
+			websocket: c.Bool("websocket"),
+			cmd:       c.Args().Slice()[1:],
 		}
 		if c.Bool("sync") {
 			exitCode, err := ExecSync(runtimeClient, opts)
@@ -160,15 +167,27 @@ func Exec(ctx context.Context, client internalapi.RuntimeService, opts execOptio
 	}
 
 	logrus.Debugf("Exec URL: %v", URL)
-	return stream(ctx, opts.stdin, opts.tty, URL)
+	return stream(ctx, opts.stdin, opts.tty, opts.websocket, URL)
 }
 
-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)
+func stream(ctx context.Context, in, tty, websocket bool, url *url.URL) error {
+	config := &restclient.Config{TLSClientConfig: restclient.TLSClientConfig{Insecure: true}}
+	executor, err := remoteclient.NewSPDYExecutor(config, "POST", url)
 	if err != nil {
 		return err
 	}
 
+	if websocket {
+		websocketExecutor, err := remoteclient.NewWebSocketExecutor(config, "GET", url.String())
+		if err != nil {
+			return err
+		}
+		executor, err = remoteclient.NewFallbackExecutor(websocketExecutor, executor, httpstream.IsUpgradeFailure)
+		if err != nil {
+			return err
+		}
+	}
+
 	stdin, stdout, stderr := mobyterm.StdStreams()
 	streamOptions := remoteclient.StreamOptions{
 		Stdout: stdout,

cmd/crictl/util.go

@@ -112,6 +112,8 @@ type execOptions struct {
 	tty bool
 	// Whether to stream stdin
 	stdin bool
+	// Whether to use websocket
+	websocket bool
 	// Command to exec
 	cmd []string
 }
@@ -122,6 +124,8 @@ type attachOptions struct {
 	tty bool
 	// Whether pass Stdin to container
 	stdin bool
+	// Whether to use websocket
+	websocket bool
 }
 
 type portforwardOptions struct {