diff --git a/pkg/printers/BUILD b/pkg/printers/BUILD index 64df3d8c88a..e40d3a4fd8b 100644 --- a/pkg/printers/BUILD +++ b/pkg/printers/BUILD @@ -40,7 +40,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/client-go/util/jsonpath:go_default_library", ], diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index f338893cb3b..b8f001d8764 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -390,10 +390,25 @@ func TestNamePrinter(t *testing.T) { }, Items: []runtime.RawExtension{ { - Raw: []byte(`{"kind": "Pod", "apiVersion": "v1", "metadata": { "name": "foo"}}`), + Object: &v1.Pod{ + TypeMeta: metav1.TypeMeta{ + Kind: "Pod", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "foo", + }, + }, }, { - Raw: []byte(`{"kind": "Pod", "apiVersion": "v1", "metadata": { "name": "bar"}}`), + Object: &unstructured.Unstructured{ + Object: map[string]interface{}{ + "kind": "Pod", + "apiVersion": "v1", + "metadata": map[string]interface{}{ + "name": "bar", + }, + }, + }, }, }, }, @@ -574,8 +589,7 @@ func TestPrinters(t *testing.T) { "template2": templatePrinter2, "jsonpath": jsonpathPrinter, "name": &printers.NamePrinter{ - Typer: legacyscheme.Scheme, - Decoders: []runtime.Decoder{legacyscheme.Codecs.UniversalDecoder(), unstructured.UnstructuredJSONScheme}, + Typer: legacyscheme.Scheme, }, } objects := map[string]runtime.Object{ diff --git a/pkg/printers/name.go b/pkg/printers/name.go index 30fb06e150f..ba6b6905e67 100644 --- a/pkg/printers/name.go +++ b/pkg/printers/name.go @@ -26,7 +26,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - utilerrors "k8s.io/apimachinery/pkg/util/errors" ) // NamePrinter is an implementation of ResourcePrinter which outputs "resource/name" pair of an object. @@ -39,8 +38,7 @@ type NamePrinter struct { // finalized "successful" message. Operation string - Decoders []runtime.Decoder - Typer runtime.ObjectTyper + Typer runtime.ObjectTyper } // PrintObj is an implementation of ResourcePrinter.PrintObj which decodes the object @@ -58,9 +56,6 @@ func (p *NamePrinter) PrintObj(obj runtime.Object, w io.Writer) error { if err != nil { return err } - if errs := runtime.DecodeList(items, p.Decoders...); len(errs) > 0 { - return utilerrors.NewAggregate(errs) - } for _, obj := range items { if err := p.PrintObj(obj, w); err != nil { return err diff --git a/pkg/printers/name_flags.go b/pkg/printers/name_flags.go index 01501703ea3..dc9e4ac4047 100644 --- a/pkg/printers/name_flags.go +++ b/pkg/printers/name_flags.go @@ -22,7 +22,6 @@ import ( "github.com/spf13/cobra" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/kubectl/scheme" @@ -50,11 +49,9 @@ func (f *NamePrintFlags) Complete(successTemplate string) error { // Returns false if the specified outputFormat does not match a supported format. // Supported format types can be found in pkg/printers/printers.go func (f *NamePrintFlags) ToPrinter(outputFormat string) (ResourcePrinter, error) { - decoders := []runtime.Decoder{scheme.Codecs.UniversalDecoder(), unstructured.UnstructuredJSONScheme} namePrinter := &NamePrinter{ Operation: f.Operation, Typer: scheme.Scheme, - Decoders: decoders, } outputFormat = strings.ToLower(outputFormat)