diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index 1ea5866b0f8..364938f96d4 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -14,42 +14,7 @@ go_library( "runtime_cache.go", "runtime_cache_fake.go", "sync_result.go", - ] + select({ - "@io_bazel_rules_go//go/platform:android": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "pty_linux.go", - ], - "@io_bazel_rules_go//go/platform:nacl": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:windows": [ - "pty_unsupported.go", - ], - "//conditions:default": [], - }), + ], importpath = "k8s.io/kubernetes/pkg/kubelet/container", visibility = ["//visibility:public"], deps = [ @@ -71,12 +36,7 @@ go_library( "//vendor/k8s.io/client-go/tools/reference:go_default_library", "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", - ] + select({ - "@io_bazel_rules_go//go/platform:linux": [ - "//vendor/github.com/kr/pty:go_default_library", - ], - "//conditions:default": [], - }), + ], ) go_test( diff --git a/pkg/kubelet/container/pty_linux.go b/pkg/kubelet/container/pty_linux.go deleted file mode 100644 index 40906ce99b6..00000000000 --- a/pkg/kubelet/container/pty_linux.go +++ /dev/null @@ -1,30 +0,0 @@ -// +build linux - -/* -Copyright 2015 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 container - -import ( - "os" - "os/exec" - - "github.com/kr/pty" -) - -func StartPty(c *exec.Cmd) (*os.File, error) { - return pty.Start(c) -} diff --git a/pkg/kubelet/container/pty_unsupported.go b/pkg/kubelet/container/pty_unsupported.go deleted file mode 100644 index 24ea2f787f8..00000000000 --- a/pkg/kubelet/container/pty_unsupported.go +++ /dev/null @@ -1,28 +0,0 @@ -// +build !linux - -/* -Copyright 2015 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 container - -import ( - "os" - "os/exec" -) - -func StartPty(c *exec.Cmd) (pty *os.File, err error) { - return nil, nil -}