Unverified Commit 5c17bec9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #57140 from niuzhenguo/noheaders-linebreak

Automatic merge from submit-queue (batch tested with PRs 56947, 56349, 57140, 53686, 57314). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Kubectl: Move no-headers flag get out of for loop **What this PR does / why we need it**: This makes no-headers flag get before the for loop happen, there's no need to get the flag multiple times. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents b6b1762a 7cccb94e
...@@ -308,6 +308,7 @@ func (options *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []str ...@@ -308,6 +308,7 @@ func (options *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []str
} }
filteredResourceCount := 0 filteredResourceCount := 0
noHeaders := cmdutil.GetFlagBool(cmd, "no-headers")
for ix := range objs { for ix := range objs {
var mapping *meta.RESTMapping var mapping *meta.RESTMapping
var original runtime.Object var original runtime.Object
...@@ -350,7 +351,6 @@ func (options *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []str ...@@ -350,7 +351,6 @@ func (options *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []str
// TODO: this doesn't belong here // TODO: this doesn't belong here
// add linebreak between resource groups (if there is more than one) // add linebreak between resource groups (if there is more than one)
// skip linebreak above first resource group // skip linebreak above first resource group
noHeaders := cmdutil.GetFlagBool(cmd, "no-headers")
if lastMapping != nil && !noHeaders { if lastMapping != nil && !noHeaders {
fmt.Fprintf(options.ErrOut, "%s\n", "") fmt.Fprintf(options.ErrOut, "%s\n", "")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment