scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 03:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51335 from luxas/kubeadm_cut_kubectl_dep

Browse Source 
Automatic merge from submit-queue

kubeadm: Cut unnecessary kubectl dependency

**What this PR does / why we need it**:

Removes unnecessary dep

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@kubernetes/sig-cli-pr-reviews
This commit is contained in:
Kubernetes Submit Queue
2017-09-02 17:41:16 -07:00
committed by GitHub
parent 2dd659d3a7 cb00bf904e
commit 23238d882b
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/visible_to/BUILD
View File

@@ -81,7 +81,6 @@ package_group(
package_group( package_group(
name = "KUBEADM_BAD", name = "KUBEADM_BAD",
packages = [ packages = [
"//cmd/kubeadm/app",
"//cmd/kubeadm/app/cmd", "//cmd/kubeadm/app/cmd",
], ],
) )

1
cmd/kubeadm/app/BUILD
View File

@@ -11,7 +11,6 @@ go_library(
deps = [ deps = [
"//cmd/kubeadm/app/apis/kubeadm/install:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/install:go_default_library",
"//cmd/kubeadm/app/cmd:go_default_library", "//cmd/kubeadm/app/cmd:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library",
], ],
) )

3
cmd/kubeadm/app/cmd/cmd.go
View File

@@ -25,10 +25,9 @@ import (
"k8s.io/apiserver/pkg/util/flag" "k8s.io/apiserver/pkg/util/flag"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
) )
func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cobra.Command { func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command {
cmds := &cobra.Command{ cmds := &cobra.Command{
Use: "kubeadm", Use: "kubeadm",
Short: "kubeadm: easily bootstrap a secure Kubernetes cluster", Short: "kubeadm: easily bootstrap a secure Kubernetes cluster",

3
cmd/kubeadm/app/kubeadm.go
View File

@@ -23,7 +23,6 @@ import (
_ "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/install" _ "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/install"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd" "k8s.io/kubernetes/cmd/kubeadm/app/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
) )
func Run() error { func Run() error {
@@ -31,6 +30,6 @@ func Run() error {
pflag.CommandLine.MarkHidden("google-json-key") pflag.CommandLine.MarkHidden("google-json-key")
pflag.CommandLine.MarkHidden("log-flush-frequency") pflag.CommandLine.MarkHidden("log-flush-frequency")
cmd := cmd.NewKubeadmCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr) cmd := cmd.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr)
return cmd.Execute() return cmd.Execute()
} }