Merge pull request #48508 from mengqiy/fix_term

Automatic merge from submit-queue

fix cross build

Fix the issue introduced in #48299 which breaks cross-build (https://github.com/kubernetes/kubernetes/pull/48299#issuecomment-312846398).
move setsize.go and setsize_unsupported.go back to util/term for kubelet.
move unmark_windows.go as well.

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-07-06 00:08:49 -07:00
committed by GitHub
11 changed files with 39 additions and 7 deletions

View File

@@ -38,7 +38,6 @@ import (
appctypes "github.com/appc/spec/schema/types"
"github.com/coreos/go-systemd/unit"
rktapi "github.com/coreos/rkt/api/v1alpha"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"golang.org/x/net/context"
"google.golang.org/grpc"
@@ -66,6 +65,7 @@ import (
utilexec "k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/selinux"
utilstrings "k8s.io/kubernetes/pkg/util/strings"
"k8s.io/kubernetes/pkg/util/term"
)
const (
@@ -2199,7 +2199,7 @@ func (r *Runtime) ExecInContainer(containerID kubecontainer.ContainerID, cmd []s
defer stdout.Close()
kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) {
term.SetWinsize(p.Fd(), &term.Winsize{Height: size.Height, Width: size.Width})
term.SetSize(p.Fd(), size)
})
if stdin != nil {