add "DisableFlagsInUseLine: true" for all command

Signed-off-by: Alan Zhu <zg.zhu@daocloud.io>

cmd/helm/chart.go

@@ -32,6 +32,7 @@ The subcommands can be used to push, pull, tag, list, or remove Helm charts.
 func newChartCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "chart",
+		DisableFlagsInUseLine: true,
 		Short:                 "push, pull, tag, or remove Helm charts",
 		Long:                  chartHelp,
 		Hidden:                !FeatureGateOCI.IsEnabled(),

cmd/helm/chart_export.go

@@ -38,6 +38,7 @@ func newChartExportCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 
 	cmd := &cobra.Command{
 		Use:                   "export [ref]",
+		DisableFlagsInUseLine: true,
 		Short:                 "export a chart to directory",
 		Long:                  chartExportDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/chart_list.go

@@ -33,6 +33,7 @@ Charts are sorted by ref name, alphabetically.
 func newChartListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "list",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ls"},
 		Short:                 "list all saved charts",
 		Long:                  chartListDesc,

cmd/helm/chart_pull.go

@@ -34,6 +34,7 @@ This will store the chart in the local registry cache to be used later.
 func newChartPullCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "pull [ref]",
+		DisableFlagsInUseLine: true,
 		Short:                 "pull a chart from remote",
 		Long:                  chartPullDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/chart_push.go

@@ -36,6 +36,7 @@ Must first run "helm chart save" or "helm chart pull".
 func newChartPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "push [ref]",
+		DisableFlagsInUseLine: true,
 		Short:                 "push a chart to remote",
 		Long:                  chartPushDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/chart_remove.go

@@ -37,6 +37,7 @@ To remove all unlinked content, please run "helm chart prune". (TODO)
 func newChartRemoveCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "remove [ref]",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"rm"},
 		Short:                 "remove a chart",
 		Long:                  chartRemoveDesc,

cmd/helm/chart_save.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"io"
+	"k8s.io/kubectl/pkg/util/templates"
 	"path/filepath"
 
 	"github.com/spf13/cobra"
@@ -37,7 +38,8 @@ not change the item as it exists in the cache.
 func newChartSaveCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "save [path] [ref]",
-		Short:  "save a chart directory",
+		DisableFlagsInUseLine: true,
+		Short:                 templates.LongDesc("save a chart directory"),
 		Long:                  chartSaveDesc,
 		Args:                  require.MinimumNArgs(2),
 		Hidden:                !FeatureGateOCI.IsEnabled(),

cmd/helm/completion.go

@@ -52,6 +52,7 @@ func newCompletionCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "completion SHELL",
+		DisableFlagsInUseLine: true,
 		Short:                 "generate autocompletions script for the specified shell (bash or zsh)",
 		Long:                  completionDesc,
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/create.go

@@ -61,6 +61,7 @@ func newCreateCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "create NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "create a new chart with the given name",
 		Long:                  createDesc,
 		Args:                  require.ExactArgs(1),

cmd/helm/dependency.go

@@ -85,6 +85,7 @@ This will produce an error if the chart cannot be loaded.
 func newDependencyCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "dependency update|build|list",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"dep", "dependencies"},
 		Short:                 "manage a chart's dependencies",
 		Long:                  dependencyDesc,
@@ -103,6 +104,7 @@ func newDependencyListCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "list CHART",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ls"},
 		Short:                 "list the dependencies for the given chart",
 		Long:                  dependencyListDesc,

cmd/helm/dependency_build.go

@@ -45,6 +45,7 @@ func newDependencyBuildCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "build CHART",
+		DisableFlagsInUseLine: true,
 		Short:                 "rebuild the charts/ directory based on the Chart.lock file",
 		Long:                  dependencyBuildDesc,
 		Args:                  require.MaximumNArgs(1),

cmd/helm/dependency_update.go

@@ -48,6 +48,7 @@ func newDependencyUpdateCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "update CHART",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"up"},
 		Short:                 "update charts/ based on the contents of Chart.yaml",
 		Long:                  dependencyUpDesc,

cmd/helm/docs.go

@@ -48,6 +48,7 @@ func newDocsCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "docs",
+		DisableFlagsInUseLine: true,
 		Short:                 "generate documentation as markdown or man pages",
 		Long:                  docsDesc,
 		Hidden:                true,

cmd/helm/env.go

@@ -33,6 +33,7 @@ Env prints out all the environment information in use by Helm.
 func newEnvCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "env",
+		DisableFlagsInUseLine: true,
 		Short:                 "helm client environment information",
 		Long:                  envHelp,
 		Args:                  require.NoArgs,

cmd/helm/get.go

@@ -38,6 +38,7 @@ get extended information about the release, including:
 func newGetCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "get",
+		DisableFlagsInUseLine: true,
 		Short:                 "download extended information of a named release",
 		Long:                  getHelp,
 		Args:                  require.NoArgs,

cmd/helm/get_all.go

@@ -38,6 +38,7 @@ func newGetAllCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "all RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "download all information for a named release",
 		Long:                  getAllHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/get_hooks.go

@@ -38,6 +38,7 @@ func newGetHooksCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "hooks RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "download all hooks for a named release",
 		Long:                  getHooksHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/get_manifest.go

@@ -40,6 +40,7 @@ func newGetManifestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 
 	cmd := &cobra.Command{
 		Use:                   "manifest RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "download the manifest for a named release",
 		Long:                  getManifestHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/get_notes.go

@@ -36,6 +36,7 @@ func newGetNotesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "notes RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "download the notes for a named release",
 		Long:                  getNotesHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/get_values.go

@@ -43,6 +43,7 @@ func newGetValuesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "values RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "download the values file for a named release",
 		Long:                  getValuesHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/history.go

@@ -57,6 +57,7 @@ func newHistoryCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "history RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Long:                  historyHelp,
 		Short:                 "fetch release history",
 		Aliases:               []string{"hist"},

cmd/helm/install.go

@@ -110,6 +110,7 @@ func newInstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "install [NAME] [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "install a chart",
 		Long:                  installDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/lint.go

@@ -46,6 +46,7 @@ func newLintCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "lint PATH",
+		DisableFlagsInUseLine: true,
 		Short:                 "examine a chart for possible issues",
 		Long:                  longLintHelp,
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/list.go

@@ -65,6 +65,7 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "list",
+		DisableFlagsInUseLine: true,
 		Short:                 "list releases",
 		Long:                  listHelp,
 		Aliases:               []string{"ls"},

cmd/helm/options.go

@@ -27,6 +27,7 @@ import (
 func newCmdOptions(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "options",
+		DisableFlagsInUseLine: true,
 		Short:                 "print the list of flags inherited by all commands",
 		Long:                  "print the list of flags inherited by all commands",
 		Args:                  require.NoArgs,

cmd/helm/package.go

@@ -54,6 +54,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "package [CHART_PATH] [...]",
+		DisableFlagsInUseLine: true,
 		Short:                 "package a chart directory into a chart archive",
 		Long:                  packageDesc,
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/plugin.go

@@ -33,6 +33,7 @@ Manage client-side Helm plugins.
 func newPluginCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "plugin",
+		DisableFlagsInUseLine: true,
 		Short:                 "install, list, or uninstall Helm plugins",
 		Long:                  pluginHelp,
 	}

cmd/helm/plugin_install.go

@@ -39,6 +39,7 @@ func newPluginInstallCmd(out io.Writer) *cobra.Command {
 	o := &pluginInstallOptions{}
 	cmd := &cobra.Command{
 		Use:                   "install [options] <path|url>...",
+		DisableFlagsInUseLine: true,
 		Short:                 "install one or more Helm plugins",
 		Long:                  pluginInstallDesc,
 		Aliases:               []string{"add"},

cmd/helm/plugin_list.go

@@ -29,6 +29,7 @@ import (
 func newPluginListCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "list",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ls"},
 		Short:                 "list installed Helm plugins",
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/plugin_uninstall.go

@@ -37,6 +37,7 @@ func newPluginUninstallCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "uninstall <plugin>...",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"rm", "remove"},
 		Short:                 "uninstall one or more Helm plugins",
 		PreRunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/plugin_update.go

@@ -38,6 +38,7 @@ func newPluginUpdateCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "update <plugin>...",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"up"},
 		Short:                 "update one or more Helm plugins",
 		PreRunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/pull.go

@@ -47,6 +47,7 @@ func newPullCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "pull [chart URL | repo/chartname] [...]",
+		DisableFlagsInUseLine: true,
 		Short:                 "download a chart from a repository and (optionally) unpack it in local directory",
 		Aliases:               []string{"fetch"},
 		Long:                  pullDesc,

cmd/helm/registry.go

@@ -30,6 +30,7 @@ This command consists of multiple subcommands to interact with registries.
 func newRegistryCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "registry",
+		DisableFlagsInUseLine: true,
 		Short:                 "login to or logout from a registry",
 		Long:                  registryHelp,
 		Hidden:                !FeatureGateOCI.IsEnabled(),

cmd/helm/registry_login.go

@@ -42,6 +42,7 @@ func newRegistryLoginCmd(cfg *action.Configuration, out io.Writer) *cobra.Comman
 
 	cmd := &cobra.Command{
 		Use:                   "login [host]",
+		DisableFlagsInUseLine: true,
 		Short:                 "login to a registry",
 		Long:                  registryLoginDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/registry_logout.go

@@ -32,6 +32,7 @@ Remove credentials stored for a remote registry.
 func newRegistryLogoutCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "logout [host]",
+		DisableFlagsInUseLine: true,
 		Short:                 "logout from a registry",
 		Long:                  registryLogoutDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/repo.go

@@ -35,6 +35,7 @@ It can be used to add, remove, list, and index chart repositories.
 func newRepoCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "repo add|remove|list|index|update [ARGS]",
+		DisableFlagsInUseLine: true,
 		Short:                 "add, list, remove, update, and index chart repositories",
 		Long:                  repoHelm,
 		Args:                  require.NoArgs,

cmd/helm/repo_add.go

@@ -57,6 +57,7 @@ func newRepoAddCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "add [NAME] [URL]",
+		DisableFlagsInUseLine: true,
 		Short:                 "add a chart repository",
 		Args:                  require.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/repo_index.go

@@ -50,6 +50,7 @@ func newRepoIndexCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "index [DIR]",
+		DisableFlagsInUseLine: true,
 		Short:                 "generate an index file given a directory containing packaged charts",
 		Long:                  repoIndexDesc,
 		Args:                  require.ExactArgs(1),

cmd/helm/repo_list.go

@@ -33,6 +33,7 @@ func newRepoListCmd(out io.Writer) *cobra.Command {
 	var outfmt output.Format
 	cmd := &cobra.Command{
 		Use:                   "list",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ls"},
 		Short:                 "list chart repositories",
 		Args:                  require.NoArgs,

cmd/helm/repo_remove.go

@@ -42,6 +42,7 @@ func newRepoRemoveCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "remove [REPO1 [REPO2 ...]]",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"rm"},
 		Short:                 "remove one or more chart repositories",
 		Args:                  require.MinimumNArgs(1),

cmd/helm/repo_update.go

@@ -46,6 +46,7 @@ func newRepoUpdateCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "update",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"up"},
 		Short:                 "update information of available charts locally from chart repositories",
 		Long:                  updateDesc,

cmd/helm/rollback.go

@@ -44,6 +44,7 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "rollback <RELEASE> [REVISION]",
+		DisableFlagsInUseLine: true,
 		Short:                 "roll back a release to a previous revision",
 		Long:                  rollbackDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/root.go

@@ -72,12 +72,13 @@ By default, the default directories depend on the Operating System. The defaults
 func newRootCmd(actionConfig *action.Configuration, out io.Writer, args []string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "helm",
+		DisableFlagsInUseLine: true,
 		Short:                 "The Helm package manager for Kubernetes.",
 		Long:                  globalUsage,
 		Run: func(cmd *cobra.Command, args []string) {
 			cmd.Help()
 		},
-		SilenceUsage:           true,
+		SilenceUsage:           false,
 		BashCompletionFunction: completion.GetBashCustomFunction(),
 	}
 	flags := cmd.PersistentFlags()

cmd/helm/search.go

@@ -32,6 +32,7 @@ func newSearchCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "search [keyword]",
+		DisableFlagsInUseLine: true,
 		Short:                 "search for a keyword in charts",
 		Long:                  searchDesc,
 	}

cmd/helm/search_hub.go

@@ -52,6 +52,7 @@ func newSearchHubCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "hub [keyword]",
+		DisableFlagsInUseLine: true,
 		Short:                 "search for charts in the Helm Hub or an instance of Monocular",
 		Long:                  searchHubDesc,
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/search_repo.go

@@ -80,6 +80,7 @@ func newSearchRepoCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "repo [keyword]",
+		DisableFlagsInUseLine: true,
 		Short:                 "search repositories for a keyword in charts",
 		Long:                  searchRepoDesc,
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/helm/show.go

@@ -56,6 +56,7 @@ func newShowCmd(out io.Writer) *cobra.Command {
 
 	showCommand := &cobra.Command{
 		Use:                   "show",
+		DisableFlagsInUseLine: true,
 		Short:                 "show information of a chart",
 		Aliases:               []string{"inspect"},
 		Long:                  showDesc,
@@ -72,6 +73,7 @@ func newShowCmd(out io.Writer) *cobra.Command {
 
 	all := &cobra.Command{
 		Use:                   "all [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "show all information of the chart",
 		Long:                  showAllDesc,
 		Args:                  require.ExactArgs(1),
@@ -88,6 +90,7 @@ func newShowCmd(out io.Writer) *cobra.Command {
 
 	valuesSubCmd := &cobra.Command{
 		Use:                   "values [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "show the chart's values",
 		Long:                  showValuesDesc,
 		Args:                  require.ExactArgs(1),
@@ -104,6 +107,7 @@ func newShowCmd(out io.Writer) *cobra.Command {
 
 	chartSubCmd := &cobra.Command{
 		Use:                   "chart [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "show the chart's definition",
 		Long:                  showChartDesc,
 		Args:                  require.ExactArgs(1),
@@ -120,6 +124,7 @@ func newShowCmd(out io.Writer) *cobra.Command {
 
 	readmeSubCmd := &cobra.Command{
 		Use:                   "readme [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "show the chart's README",
 		Long:                  readmeChartDesc,
 		Args:                  require.ExactArgs(1),

cmd/helm/status.go

@@ -50,6 +50,7 @@ func newStatusCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "status RELEASE_NAME",
+		DisableFlagsInUseLine: true,
 		Short:                 "display the status of the named release",
 		Long:                  statusHelp,
 		Args:                  require.ExactArgs(1),

cmd/helm/template.go

@@ -53,6 +53,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "template [NAME] [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "locally render templates",
 		Long:                  templateDesc,
 		Args:                  require.MinimumNArgs(1),

cmd/helm/testdata/output/get-all-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm get all" requires 1 argument
 
-Usage:  helm get all RELEASE_NAME [flags]
+Usage:  helm get all RELEASE_NAME

cmd/helm/testdata/output/get-hooks-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm get hooks" requires 1 argument
 
-Usage:  helm get hooks RELEASE_NAME [flags]
+Usage:  helm get hooks RELEASE_NAME

cmd/helm/testdata/output/get-manifest-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm get manifest" requires 1 argument
 
-Usage:  helm get manifest RELEASE_NAME [flags]
+Usage:  helm get manifest RELEASE_NAME

cmd/helm/testdata/output/get-notes-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm get notes" requires 1 argument
 
-Usage:  helm get notes RELEASE_NAME [flags]
+Usage:  helm get notes RELEASE_NAME

cmd/helm/testdata/output/get-values-args.txt

@@ -1,3 +1,3 @@
 Error: "helm get values" requires 1 argument
 
-Usage:  helm get values RELEASE_NAME [flags]
+Usage:  helm get values RELEASE_NAME

cmd/helm/testdata/output/install-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm install" requires at least 1 argument
 
-Usage:  helm install [NAME] [CHART] [flags]
+Usage:  helm install [NAME] [CHART]

cmd/helm/testdata/output/rollback-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm rollback" requires at least 1 argument
 
-Usage:  helm rollback <RELEASE> [REVISION] [flags]
+Usage:  helm rollback <RELEASE> [REVISION]

cmd/helm/testdata/output/template-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm template" requires at least 1 argument
 
-Usage:  helm template [NAME] [CHART] [flags]
+Usage:  helm template [NAME] [CHART]

cmd/helm/testdata/output/uninstall-no-args.txt

@@ -1,3 +1,3 @@
 Error: "helm uninstall" requires at least 1 argument
 
-Usage:  helm uninstall RELEASE_NAME [...] [flags]
+Usage:  helm uninstall RELEASE_NAME [...]

cmd/helm/uninstall.go

@@ -43,6 +43,7 @@ func newUninstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "uninstall RELEASE_NAME [...]",
+		DisableFlagsInUseLine: true,
 		Aliases:               []string{"del", "delete", "un"},
 		SuggestFor:            []string{"remove", "rm"},
 		Short:                 "uninstall a release",

cmd/helm/upgrade.go

@@ -69,6 +69,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "upgrade [RELEASE] [CHART]",
+		DisableFlagsInUseLine: true,
 		Short:                 "upgrade a release",
 		Long:                  upgradeDesc,
 		Args:                  require.ExactArgs(2),

cmd/helm/verify.go

@@ -41,6 +41,7 @@ func newVerifyCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "verify PATH",
+		DisableFlagsInUseLine: true,
 		Short:                 "verify that a chart at the given path has been signed and is valid",
 		Long:                  verifyDesc,
 		Args:                  require.ExactArgs(1),

cmd/helm/verify_test.go

@@ -41,7 +41,7 @@ func TestVerifyCmd(t *testing.T) {
 		{
 			name:      "verify requires a chart",
 			cmd:       "verify",
-			expect:    "\"helm verify\" requires 1 argument\n\nUsage:  helm verify PATH [flags]",
+			expect:    "\"helm verify\" requires 1 argument\n\nUsage:  helm verify PATH",
 			wantError: true,
 		},
 		{

cmd/helm/version.go

@@ -59,6 +59,7 @@ func newVersionCmd(out io.Writer) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:                   "version",
+		DisableFlagsInUseLine: true,
 		Short:                 "print the client version information",
 		Long:                  versionDesc,
 		Args:                  require.NoArgs,