Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only construct shortcutmapper when we have the discovery client #41570

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkg/kubectl/cmd/util/factory_object_mapping.go
Expand Up @@ -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)
Expand Down