From e54d974a123c2b7e4452b4ba535873cacaeb81dc Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 5 Jul 2016 18:36:29 -0400 Subject: [PATCH] ResourcePrinter should pass all versions at once Rather than one at a time. --- pkg/kubectl/resource_printer.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index f4ee016daef..dcc958a33f2 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -195,20 +195,11 @@ func (p *VersionedPrinter) PrintObj(obj runtime.Object, w io.Writer) error { if len(p.versions) == 0 { return fmt.Errorf("no version specified, object cannot be converted") } - for _, version := range p.versions { - if version.IsEmpty() { - continue - } - converted, err := p.converter.ConvertToVersion(obj, version) - if runtime.IsNotRegisteredError(err) { - continue - } - if err != nil { - return err - } - return p.printer.PrintObj(converted, w) + converted, err := p.converter.ConvertToVersion(obj, unversioned.GroupVersions(p.versions)) + if err != nil { + return err } - return fmt.Errorf("the object cannot be converted to any of the versions: %v", p.versions) + return p.printer.PrintObj(converted, w) } // TODO: implement HandledResources()