github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

collapse printing paths

Browse Source
This commit is contained in:
David Eads
2018-02-20 20:14:21 -05:00
parent 799a0bf410
commit be04e7c1b1
95 changed files with 594 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/set/set_env.go
View File

@@ -122,7 +122,6 @@ type EnvOptions struct {
Cmd *cobra.Command
UpdatePodSpecForObject func(obj runtime.Object, fn func(*v1.PodSpec) error) (bool, error)
PrintObject func(cmd *cobra.Command, obj runtime.Object, out io.Writer) error
}
// NewCmdEnv implements the OpenShift cli env command
@@ -199,7 +198,6 @@ func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []stri
o.From = cmdutil.GetFlagString(cmd, "from")
o.Prefix = cmdutil.GetFlagString(cmd, "prefix")
o.DryRun = cmdutil.GetDryRunFlag(cmd)
o.PrintObject = f.PrintObject
o.EnvArgs = envArgs
o.Resources = resources
@@ -413,8 +411,8 @@ func (o *EnvOptions) RunEnv(f cmdutil.Factory) error {
continue
}
if o.PrintObject != nil && (o.Local || o.DryRun) {
if err := o.PrintObject(o.Cmd, patch.Info.AsVersioned(), o.Out); err != nil {
if o.Local || o.DryRun {
if err := cmdutil.PrintObject(o.Cmd, patch.Info.AsVersioned(), o.Out); err != nil {
return err
}
continue
@@ -434,13 +432,13 @@ func (o *EnvOptions) RunEnv(f cmdutil.Factory) error {
}
if len(o.Output) > 0 {
if err := o.PrintObject(o.Cmd, info.AsVersioned(), o.Out); err != nil {
if err := cmdutil.PrintObject(o.Cmd, info.AsVersioned(), o.Out); err != nil {
return err
}
continue
}
f.PrintSuccess(o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "env updated")
cmdutil.PrintSuccess(o.ShortOutput, o.Out, info.Object, false, "env updated")
}
return utilerrors.NewAggregate(allErrs)
}