github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

fix kubectl set resource/selector/subject output

Browse Source
This commit is contained in:
xilabao
2017-05-23 15:49:07 +08:00
committed by Chen Rong
parent 2820b45caa
commit 3e5dabbff1
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubectl/cmd/set/set_resources.go
View File

@@ -70,7 +70,7 @@ type ResourcesOptions struct {
Err io.Writer
Selector string
ContainerSelector string
ShortOutput bool
Output string
All bool
Record bool
ChangeCause string
@@ -129,7 +129,7 @@ func (o *ResourcesOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
o.Mapper, o.Typer = f.Object()
o.UpdatePodSpecForObject = f.UpdatePodSpecForObject
o.Encoder = f.JSONEncoder()
o.ShortOutput = cmdutil.GetFlagString(cmd, "output") == "name"
o.Output = cmdutil.GetFlagString(cmd, "output")
o.Record = cmdutil.GetRecordFlag(cmd)
o.Local = cmdutil.GetFlagBool(cmd, "local")
o.ChangeCause = f.Command(cmd, false)
@@ -243,7 +243,12 @@ func (o *ResourcesOptions) Run() error {
}
}
info.Refresh(obj, true)
cmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "resource requirements updated")
shortOutput := o.Output == "name"
if len(o.Output) > 0 && !shortOutput {
return o.PrintObject(o.Cmd, o.Local, o.Mapper, info.Object, o.Out)
}
cmdutil.PrintSuccess(o.Mapper, shortOutput, o.Out, info.Mapping.Resource, info.Name, false, "resource requirements updated")
}
return utilerrors.NewAggregate(allErrs)
}