diff --git a/hack/.golint_failures b/hack/.golint_failures index c112d374c3..da8343b804 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -402,7 +402,6 @@ pkg/util/sysctl pkg/util/sysctl/testing pkg/util/system pkg/util/taints -pkg/util/term pkg/util/threading pkg/util/tolerations pkg/util/workqueue/prometheus diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 4e508d8a58..8849890665 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -61,7 +61,6 @@ filegroup( "//pkg/util/tail:all-srcs", "//pkg/util/taints:all-srcs", "//pkg/util/template:all-srcs", - "//pkg/util/term:all-srcs", "//pkg/util/threading:all-srcs", "//pkg/util/tolerations:all-srcs", "//pkg/util/workqueue/prometheus:all-srcs", diff --git a/pkg/util/term/BUILD b/pkg/util/term/BUILD deleted file mode 100644 index 851420acdb..0000000000 --- a/pkg/util/term/BUILD +++ /dev/null @@ -1,74 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "setsize.go", - "setsize_unsupported.go", - ], - importpath = "k8s.io/kubernetes/pkg/util/term", - deps = select({ - "@io_bazel_rules_go//go/platform:android": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:nacl": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", - ], - "@io_bazel_rules_go//go/platform:windows": [ - "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", - ], - "//conditions:default": [], - }), -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/util/term/setsize.go b/pkg/util/term/setsize.go deleted file mode 100644 index 8cccd431a8..0000000000 --- a/pkg/util/term/setsize.go +++ /dev/null @@ -1,29 +0,0 @@ -// +build !windows - -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package term - -import ( - "github.com/docker/docker/pkg/term" - "k8s.io/client-go/tools/remotecommand" -) - -// SetSize sets the terminal size associated with fd. -func SetSize(fd uintptr, size remotecommand.TerminalSize) error { - return term.SetWinsize(fd, &term.Winsize{Height: size.Height, Width: size.Width}) -} diff --git a/pkg/util/term/setsize_unsupported.go b/pkg/util/term/setsize_unsupported.go deleted file mode 100644 index 82220217a6..0000000000 --- a/pkg/util/term/setsize_unsupported.go +++ /dev/null @@ -1,28 +0,0 @@ -// +build windows - -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package term - -import ( - "k8s.io/client-go/tools/remotecommand" -) - -func SetSize(fd uintptr, size remotecommand.TerminalSize) error { - // NOP - return nil -}