github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

only construct shortcutmapper when we have the discovery client

Browse Source
This commit is contained in:
deads2k 2017-02-16 11:38:52 -05:00
parent 7d4383c6e1
commit 9b5acdbb88
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/util/factory_object_mapping.go
View File

@ -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)