From ce561b204453c39a6caf875df06e16da6c9d10ba Mon Sep 17 00:00:00 2001 From: ymqytw Date: Wed, 5 Jul 2017 10:44:41 -0700 Subject: [PATCH] fix cross build for windows --- hack/.linted_packages | 1 + pkg/kubectl/util/term/BUILD | 1 - pkg/{ => kubectl}/util/umask_windows.go | 0 pkg/kubelet/dockershim/BUILD | 2 +- pkg/kubelet/dockershim/exec.go | 4 +-- pkg/kubelet/rkt/BUILD | 2 +- pkg/kubelet/rkt/rkt.go | 4 +-- pkg/util/BUILD | 1 + pkg/util/term/BUILD | 31 +++++++++++++++++++ pkg/{kubectl => }/util/term/setsize.go | 0 .../util/term/setsize_unsupported.go | 0 11 files changed, 39 insertions(+), 7 deletions(-) rename pkg/{ => kubectl}/util/umask_windows.go (100%) create mode 100644 pkg/util/term/BUILD rename pkg/{kubectl => }/util/term/setsize.go (100%) rename pkg/{kubectl => }/util/term/setsize_unsupported.go (100%) diff --git a/hack/.linted_packages b/hack/.linted_packages index 1dc6c85999..3b0eb08d3a 100644 --- a/hack/.linted_packages +++ b/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 diff --git a/pkg/kubectl/util/term/BUILD b/pkg/kubectl/util/term/BUILD index e238ccfc48..7f977b0190 100644 --- a/pkg/kubectl/util/term/BUILD +++ b/pkg/kubectl/util/term/BUILD @@ -13,7 +13,6 @@ go_library( srcs = [ "resize.go", "resizeevents.go", - "setsize.go", "term.go", "term_writer.go", ], diff --git a/pkg/util/umask_windows.go b/pkg/kubectl/util/umask_windows.go similarity index 100% rename from pkg/util/umask_windows.go rename to pkg/kubectl/util/umask_windows.go diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index a2b81a5ecc..915b6b8485 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/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", diff --git a/pkg/kubelet/dockershim/exec.go b/pkg/kubelet/dockershim/exec.go index 2855af3b0e..1d73a8a8d5 100644 --- a/pkg/kubelet/dockershim/exec.go +++ b/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 { diff --git a/pkg/kubelet/rkt/BUILD b/pkg/kubelet/rkt/BUILD index f80e2c6c83..35abb2b2b7 100644 --- a/pkg/kubelet/rkt/BUILD +++ b/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", diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index e4481e37d9..8a1ff5e9e7 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/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 ( @@ -2175,7 +2175,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 { diff --git a/pkg/util/BUILD b/pkg/util/BUILD index c7048bed48..4d03d9cde7 100644 --- a/pkg/util/BUILD +++ b/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", diff --git a/pkg/util/term/BUILD b/pkg/util/term/BUILD new file mode 100644 index 0000000000..0182b46ed2 --- /dev/null +++ b/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"], +) diff --git a/pkg/kubectl/util/term/setsize.go b/pkg/util/term/setsize.go similarity index 100% rename from pkg/kubectl/util/term/setsize.go rename to pkg/util/term/setsize.go diff --git a/pkg/kubectl/util/term/setsize_unsupported.go b/pkg/util/term/setsize_unsupported.go similarity index 100% rename from pkg/kubectl/util/term/setsize_unsupported.go rename to pkg/util/term/setsize_unsupported.go