Merge pull request kubernetes#86693 from sallyom/silence-usage-on-error

k8s-ci-robot · web-flow · commit c72d5fd2556f · 2020-01-02T08:47:40.000-08:00
silence usage when required flag is not passed
diff --git a/staging/src/k8s.io/kubectl/pkg/util/templates/templater.go b/staging/src/k8s.io/kubectl/pkg/util/templates/templater.go
@@ -45,6 +45,7 @@ func ActsAsRootCommand(cmd *cobra.Command, filters []string, groups ...CommandGr
 		Filtered:      filters,
 	}
 	cmd.SetFlagErrorFunc(templater.FlagErrorFunc())
+	cmd.SilenceUsage = true
 	cmd.SetUsageFunc(templater.UsageFunc())
 	cmd.SetHelpFunc(templater.HelpFunc())
 	return templater

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func ActsAsRootCommand(cmd *cobra.Command, filters []string, groups ...CommandGr`
`45`	`45`	`Filtered: filters,`
`46`	`46`	`}`
`47`	`47`	`cmd.SetFlagErrorFunc(templater.FlagErrorFunc())`
	`48`	`+ cmd.SilenceUsage = true`
`48`	`49`	`cmd.SetUsageFunc(templater.UsageFunc())`
`49`	`50`	`cmd.SetHelpFunc(templater.HelpFunc())`
`50`	`51`	`return templater`