github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29737 from andreykurilin/fix_kubectl_help_cmd

Browse Source 
Automatic merge from submit-queue

Fix kubectl help command

PR 48d47b1027 broke `kubectl help` command due
to wrong check `help for help cmd` .

Fixes #29736
This commit is contained in:
k8s-merge-robot 2016-07-28 19:07:55 -07:00 committed by GitHub
commit 96996985a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/help.go
View File

@ -41,7 +41,7 @@ func NewCmdHelp(f *cmdutil.Factory, out io.Writer) *cobra.Command {
} }
func RunHelp(cmd *cobra.Command, args []string) { func RunHelp(cmd *cobra.Command, args []string) {
foundCmd, a, err := cmd.Root().Find(args) foundCmd, _, err := cmd.Root().Find(args)
// NOTE(andreykurilin): actually, I did not find any cases when foundCmd can be nil, // NOTE(andreykurilin): actually, I did not find any cases when foundCmd can be nil,
// but let's make this check since it is included in original code of initHelpCmd // but let's make this check since it is included in original code of initHelpCmd
@ -69,10 +69,11 @@ func RunHelp(cmd *cobra.Command, args []string) {
// if nothing is found, just print usage // if nothing is found, just print usage
cmd.Root().Usage() cmd.Root().Usage()
} }
} else if len(a) == 0 {
// help message for help command :)
cmd.Root().Usage()
} else { } else {
if len(args) == 0 {
// help message for help command :)
foundCmd = cmd
}
helpFunc := foundCmd.HelpFunc() helpFunc := foundCmd.HelpFunc()
helpFunc(foundCmd, args) helpFunc(foundCmd, args)
} }