From 9b5acdbb8838e50a6f80b18a97b34e0db32d9028 Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 16 Feb 2017 11:38:52 -0500 Subject: [PATCH] only construct shortcutmapper when we have the discovery client --- pkg/kubectl/cmd/util/factory_object_mapping.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/util/factory_object_mapping.go b/pkg/kubectl/cmd/util/factory_object_mapping.go index cae5b59d354..3e8db354fc3 100644 --- a/pkg/kubectl/cmd/util/factory_object_mapping.go +++ b/pkg/kubectl/cmd/util/factory_object_mapping.go @@ -72,11 +72,12 @@ func (f *ring1Factory) Object() (meta.RESTMapper, runtime.ObjectTyper) { api.Registry.RESTMapper(), // hardcoded fall back }, } - } - // wrap with shortcuts - mapper, err = NewShortcutExpander(mapper, discoveryClient) - CheckErr(err) + // wrap with shortcuts, they require a discoveryClient + mapper, err = NewShortcutExpander(mapper, discoveryClient) + // you only have an error on missing discoveryClient, so this shouldn't fail. Check anyway. + CheckErr(err) + } // wrap with output preferences cfg, err := f.clientAccessFactory.ClientConfigForVersion(nil)