Merge pull request #9878 from ncdc/pick-terminal-resizing

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/registry/buildconfiginstantiate/rest.go

@@ -219,7 +219,11 @@ func (h *binaryInstantiateHandler) handle(r io.Reader) (runtime.Object, error) {
 	if err != nil {
 		return nil, errors.NewInternalError(fmt.Errorf("unable to connect to server: %v", err))
 	}
-	if err := exec.Stream(kubeletremotecommand.SupportedStreamingProtocols, r, nil, nil, false); err != nil {
+	streamOptions := remotecommand.StreamOptions{
+		SupportedProtocols: kubeletremotecommand.SupportedStreamingProtocols,
+		Stdin:              r,
+	}
+	if err := exec.Stream(streamOptions); err != nil {
 		return nil, errors.NewInternalError(err)
 	}
 	return latest, nil

pkg/cmd/cli/cmd/debug.go

@@ -104,11 +104,13 @@ func NewCmdDebug(fullName string, f *clientcmd.Factory, in io.Reader, out, errou
 	options := &DebugOptions{
 		Timeout: 15 * time.Minute,
 		Attach: kcmd.AttachOptions{
-			In:    in,
-			Out:   out,
-			Err:   errout,
-			TTY:   true,
-			Stdin: true,
+			StreamOptions: kcmd.StreamOptions{
+				In:    in,
+				Out:   out,
+				Err:   errout,
+				TTY:   true,
+				Stdin: true,
+			},
 
 			Attach: &kcmd.DefaultRemoteAttach{},
 		},

pkg/cmd/cli/cmd/rsh.go

@@ -59,12 +59,14 @@ func NewCmdRsh(name string, parent string, f *clientcmd.Factory, in io.Reader, o
 		ForceTTY:   false,
 		DisableTTY: false,
 		ExecOptions: &kubecmd.ExecOptions{
-			In:  in,
-			Out: out,
-			Err: err,
-
-			TTY:   true,
-			Stdin: true,
+			StreamOptions: kubecmd.StreamOptions{
+				In:  in,
+				Out: out,
+				Err: err,
+
+				TTY:   true,
+				Stdin: true,
+			},
 
 			Executor: &kubecmd.DefaultRemoteExecutor{},
 		},

pkg/cmd/cli/cmd/rsync/execremote.go

@@ -28,17 +28,19 @@ var _ executor = &remoteExecutor{}
 func (e *remoteExecutor) Execute(command []string, in io.Reader, out, errOut io.Writer) error {
 	glog.V(3).Infof("Remote executor running command: %s", strings.Join(command, " "))
 	execOptions := &kubecmd.ExecOptions{
-		In:            in,
-		Out:           out,
-		Err:           errOut,
-		Stdin:         in != nil,
-		Executor:      &kubecmd.DefaultRemoteExecutor{},
-		Client:        e.Client,
-		Config:        e.Config,
-		PodName:       e.PodName,
-		ContainerName: e.ContainerName,
-		Namespace:     e.Namespace,
-		Command:       command,
+		StreamOptions: kubecmd.StreamOptions{
+			Namespace:     e.Namespace,
+			PodName:       e.PodName,
+			ContainerName: e.ContainerName,
+			In:            in,
+			Out:           out,
+			Err:           errOut,
+			Stdin:         in != nil,
+		},
+		Executor: &kubecmd.DefaultRemoteExecutor{},
+		Client:   e.Client,
+		Config:   e.Config,
+		Command:  command,
 	}
 	err := execOptions.Validate()
 	if err != nil {