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
```

hack/.linted_packages

@@ -205,6 +205,7 @@ pkg/fieldpath
 pkg/fields
 pkg/hyperkube
 pkg/kubectl/cmd/util/openapi
+pkg/kubectl/util/term
 pkg/kubelet/apis/cri
 pkg/kubelet/apis/stats/v1alpha1
 pkg/kubelet/container

pkg/kubectl/util/term/BUILD

@@ -13,7 +13,6 @@ go_library(
     srcs = [
         "resize.go",
         "resizeevents.go",
-        "setsize.go",
         "term.go",
         "term_writer.go",
     ],

pkg/kubelet/dockershim/BUILD

@@ -53,9 +53,9 @@ go_library(
         "//pkg/security/apparmor:go_default_library",
         "//pkg/util/exec:go_default_library",
         "//pkg/util/hash:go_default_library",
+        "//pkg/util/term:go_default_library",
         "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library",
-        "//vendor/github.com/docker/docker/pkg/term:go_default_library",
         "//vendor/github.com/docker/engine-api/types:go_default_library",
         "//vendor/github.com/docker/engine-api/types/container:go_default_library",
         "//vendor/github.com/docker/engine-api/types/filters:go_default_library",

pkg/kubelet/dockershim/exec.go

@@ -23,13 +23,13 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/docker/docker/pkg/term"
 	dockertypes "github.com/docker/engine-api/types"
 	"github.com/golang/glog"
 
 	"k8s.io/client-go/tools/remotecommand"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
+	"k8s.io/kubernetes/pkg/util/term"
 
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 )
@@ -89,7 +89,7 @@ func (*NsenterExecHandler) ExecInContainer(client libdocker.Interface, container
 		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 {

pkg/kubelet/rkt/BUILD

@@ -39,13 +39,13 @@ go_library(
         "//pkg/util/parsers:go_default_library",
         "//pkg/util/selinux:go_default_library",
         "//pkg/util/strings:go_default_library",
+        "//pkg/util/term:go_default_library",
         "//pkg/util/version:go_default_library",
         "//vendor/github.com/appc/spec/schema:go_default_library",
         "//vendor/github.com/appc/spec/schema/types:go_default_library",
         "//vendor/github.com/coreos/go-systemd/dbus:go_default_library",
         "//vendor/github.com/coreos/go-systemd/unit:go_default_library",
         "//vendor/github.com/coreos/rkt/api/v1alpha:go_default_library",
-        "//vendor/github.com/docker/docker/pkg/term:go_default_library",
         "//vendor/github.com/docker/engine-api/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",

pkg/kubelet/rkt/rkt.go

@@ -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 {

pkg/util/BUILD

@@ -90,6 +90,7 @@ filegroup(
         "//pkg/util/system:all-srcs",
         "//pkg/util/tail:all-srcs",
         "//pkg/util/taints:all-srcs",
+        "//pkg/util/term:all-srcs",
         "//pkg/util/threading:all-srcs",
         "//pkg/util/tolerations:all-srcs",
         "//pkg/util/uuid:all-srcs",

pkg/util/term/BUILD

@@ -0,0 +1,31 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["setsize.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//vendor/github.com/docker/docker/pkg/term:go_default_library",
+        "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)