mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-05 23:47:50 +00:00
Merge pull request #50584 from xilabao/fix-set-output-01
Automatic merge from submit-queue. 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>. fix kubectl set resource/selector/subject output **What this PR does / why we need it**: kubectl set resource/selector/subject -o yaml doesn't return the expected format **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/kubernetes/kubectl/issues/51 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
@@ -44,6 +44,7 @@ type SelectorOptions struct {
|
||||
all bool
|
||||
record bool
|
||||
changeCause string
|
||||
output string
|
||||
|
||||
resources []string
|
||||
selector *metav1.LabelSelector
|
||||
@@ -107,6 +108,7 @@ func (o *SelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
|
||||
o.all = cmdutil.GetFlagBool(cmd, "all")
|
||||
o.record = cmdutil.GetRecordFlag(cmd)
|
||||
o.dryrun = cmdutil.GetDryRunFlag(cmd)
|
||||
o.output = cmdutil.GetFlagString(cmd, "output")
|
||||
|
||||
cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
|
||||
if err != nil {
|
||||
@@ -206,7 +208,12 @@ func (o *SelectorOptions) RunSelector() error {
|
||||
}
|
||||
|
||||
info.Refresh(patched, true)
|
||||
cmdutil.PrintSuccess(o.mapper, false, o.out, info.Mapping.Resource, info.Name, o.dryrun, "selector updated")
|
||||
|
||||
shortOutput := o.output == "name"
|
||||
if len(o.output) > 0 && !shortOutput {
|
||||
return o.PrintObject(info.Object)
|
||||
}
|
||||
cmdutil.PrintSuccess(o.mapper, shortOutput, o.out, info.Mapping.Resource, info.Name, o.dryrun, "selector updated")
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user