github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

use standard interface functions for printers

Browse Source
This commit is contained in:
David Eads
2018-04-12 16:02:30 -04:00
parent 39e9d1b483
commit 01609036c2
6 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ type ImageOptions struct {
Cmd *cobra.Command
ResolveImage func(in string) (string, error)
PrintObj func(runtime.Object) error
PrintObj printers.ResourcePrinterFunc
UpdatePodSpecForObject func(obj runtime.Object, fn func(*v1.PodSpec) error) (bool, error)
Resources []string
@@ -136,9 +136,7 @@ func (o *ImageOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
return err
}
o.PrintObj = func(obj runtime.Object) error {
return printer.PrintObj(obj, o.Out)
}
o.PrintObj = printer.PrintObj
cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
if err != nil {
@@ -258,7 +256,7 @@ func (o *ImageOptions) Run() error {
}
if o.Local || o.DryRun {
if err := o.PrintObj(patch.Info.AsVersioned()); err != nil {
if err := o.PrintObj(patch.Info.AsVersioned(), o.Out); err != nil {
return err
}
continue
@@ -283,7 +281,7 @@ func (o *ImageOptions) Run() error {
info.Refresh(obj, true)
if err := o.PrintObj(info.AsVersioned()); err != nil {
if err := o.PrintObj(info.AsVersioned(), o.Out); err != nil {
return err
}
}