diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD index 35f502bd7d..73a6613efc 100644 --- a/cmd/kubectl/BUILD +++ b/cmd/kubectl/BUILD @@ -34,10 +34,7 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//cmd/kubectl/app:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], visibility = [ "//build/visible_to:cmd_kubectl_CONSUMERS", diff --git a/cmd/kubectl/app/BUILD b/cmd/kubectl/app/BUILD deleted file mode 100644 index ea19ac1d73..0000000000 --- a/cmd/kubectl/app/BUILD +++ /dev/null @@ -1,36 +0,0 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["kubectl.go"], - importpath = "k8s.io/kubernetes/cmd/kubectl/app", - visibility = [ - "//build/visible_to:cmd_kubectl_app_CONSUMERS", - ], - deps = [ - "//pkg/client/metrics/prometheus:go_default_library", - "//pkg/kubectl/cmd:go_default_library", - "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/logs:go_default_library", - "//pkg/version/prometheus:go_default_library", - "//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = [ - "//build/visible_to:cmd_kubectl_app_CONSUMERS", - ], -) diff --git a/cmd/kubectl/app/kubectl.go b/cmd/kubectl/app/kubectl.go deleted file mode 100644 index ddcdfb9227..0000000000 --- a/cmd/kubectl/app/kubectl.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -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 app - -import ( - "os" - - _ "k8s.io/client-go/plugin/pkg/client/auth" // kubectl auth providers. - _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration - "k8s.io/kubernetes/pkg/kubectl/cmd" - cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/logs" - _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration -) - -/* -WARNING: this logic is duplicated, with minor changes, in cmd/hyperkube/kubectl.go -Any salient changes here will need to be manually reflected in that file. -*/ - -// Run runs the kubectl program (creates and executes a new cobra command). -func Run() error { - logs.InitLogs() - defer logs.FlushLogs() - - cmd := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr) - return cmd.Execute() -}