server: platform specific tty handling

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>

server/container_exec.go

@@ -8,14 +8,11 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/pools"
-	"github.com/kr/pty"
 	"github.com/kubernetes-incubator/cri-o/oci"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"k8s.io/client-go/tools/remotecommand"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
-	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
-	"k8s.io/kubernetes/pkg/util/term"
 	utilexec "k8s.io/utils/exec"
 )
 
@@ -65,28 +62,7 @@ func (ss streamService) Exec(containerID string, cmd []string, stdin io.Reader,
 	execCmd := exec.Command(ss.runtimeServer.Runtime().Path(c), args...)
 	var cmdErr error
 	if tty {
-		p, err := pty.Start(execCmd)
-		if err != nil {
-			return err
-		}
-		defer p.Close()
-
-		// make sure to close the stdout stream
-		defer stdout.Close()
-
-		kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) {
-			term.SetSize(p.Fd(), size)
-		})
-
-		if stdin != nil {
-			go pools.Copy(p, stdin)
-		}
-
-		if stdout != nil {
-			go pools.Copy(stdout, p)
-		}
-
-		cmdErr = execCmd.Wait()
+		cmdErr = ss.ttyCmd(execCmd, stdin, stdout, resize)
 	} else {
 		if stdin != nil {
 			// Use an os.Pipe here as it returns true *os.File objects.

server/container_exec_unix.go

@@ -0,0 +1,39 @@
+// +build !windows
+
+package server
+
+import (
+	"io"
+	"os/exec"
+
+	"github.com/docker/docker/pkg/pools"
+	"github.com/kr/pty"
+	"k8s.io/client-go/tools/remotecommand"
+	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
+	"k8s.io/kubernetes/pkg/util/term"
+)
+
+func (ss streamService) ttyCmd(execCmd *exec.Cmd, stdin io.Reader, stdout io.WriteCloser, resize <-chan remotecommand.TerminalSize) error {
+	p, err := pty.Start(execCmd)
+	if err != nil {
+		return err
+	}
+	defer p.Close()
+
+	// make sure to close the stdout stream
+	defer stdout.Close()
+
+	kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) {
+		term.SetSize(p.Fd(), size)
+	})
+
+	if stdin != nil {
+		go pools.Copy(p, stdin)
+	}
+
+	if stdout != nil {
+		go pools.Copy(stdout, p)
+	}
+
+	return execCmd.Wait()
+}

server/container_exec_windows.go

@@ -0,0 +1,15 @@
+// +build windows
+
+package server
+
+import (
+	"fmt"
+	"io"
+	"os/exec"
+
+	"k8s.io/client-go/tools/remotecommand"
+)
+
+func (ss streamService) ttyCmd(cmd *exec.Cmd, stdin io.Reader, stdout io.WriteCloser, resize <-chan remotecommand.TerminalSize) error {
+	return fmt.Errorf("unsupported")
+}