Merge pull request #74682 from soltysh/fix_flag_template

Fix flag template when both visible and explicit flags are specified

Merge pull request #74682 from soltysh/fix_flag_template
ce4229f2 · Kubernetes Prow Robot · GitHub · ccf33be0 · b4f81285 · ce4229f2
Unverified Commit ce4229f2 authored Feb 27, 2019 by Kubernetes Prow Robot Committed by GitHub Feb 27, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

templates.go pkg/kubectl/util/templates/templates.go +2 -1

No files found.
--- a/pkg/kubectl/util/templates/templates.go
+++ b/pkg/kubectl/util/templates/templates.go
@@ -49,7 +49,8 @@ const (

 	// SectionFlags is the help template section that displays the command's flags.
 	SectionFlags = `{{ if or $visibleFlags.HasFlags $explicitlyExposedFlags.HasFlags}}Options:
-{{ if $visibleFlags.HasFlags}}{{trimRight (flagsUsages $visibleFlags)}}{{end}}{{ if $explicitlyExposedFlags.HasFlags}}{{trimRight (flagsUsages $explicitlyExposedFlags)}}{{end}}
+{{ if $visibleFlags.HasFlags}}{{trimRight (flagsUsages $visibleFlags)}}{{end}}{{ if $explicitlyExposedFlags.HasFlags}}{{ if $visibleFlags.HasFlags}}
+{{end}}{{trimRight (flagsUsages $explicitlyExposedFlags)}}{{end}}

 {{end}}`