Skip to content

K
k3s
Commit adbf6c6e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39887 from juanvallejo/jvallejo/export-list-of-user-resources

Automatic merge from submit-queue (batch tested with PRs 39806, 39887, 39401) export list of user resources This patch exports the list of "userResources" found in `pkg/kubectl/cmd/util/shortcut_resmapper.go` to allow its use in external packages and clients. Related downstream PR: https://github.com/openshift/origin/pull/12147 **Release note**: ```release-note release-note-none ``` cc @deads2k
parents d2cbdbd7 95437a94
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
pkg/kubectl/cmd/util/shortcut_restmapper.go
View file @ adbf6c6e
...@@ -37,7 +37,7 @@ type ShortcutExpander struct { ...@@ -37,7 +37,7 @@ type ShortcutExpander struct {
var _ meta.RESTMapper = &ShortcutExpander{} var _ meta.RESTMapper = &ShortcutExpander{}
func NewShortcutExpander(delegate meta.RESTMapper, client discovery.DiscoveryInterface) ShortcutExpander { func NewShortcutExpander(delegate meta.RESTMapper, client discovery.DiscoveryInterface) ShortcutExpander {
return ShortcutExpander{All: userResources, RESTMapper: delegate, discoveryClient: client} return ShortcutExpander{All: UserResources, RESTMapper: delegate, discoveryClient: client}
} }
func (e ShortcutExpander) getAll() []schema.GroupResource { func (e ShortcutExpander) getAll() []schema.GroupResource {
...@@ -98,9 +98,11 @@ func (e ShortcutExpander) RESTMappings(gk schema.GroupKind, versions ...string) ...@@ -98,9 +98,11 @@ func (e ShortcutExpander) RESTMappings(gk schema.GroupKind, versions ...string)
return e.RESTMapper.RESTMappings(gk, versions...) return e.RESTMapper.RESTMappings(gk, versions...)
} }
// userResources are the resource names that apply to the primary, user facing resources used by // UserResources are the resource names that apply to the primary, user facing resources used by
// client tools. They are in deletion-first order - dependent resources should be last. // client tools. They are in deletion-first order - dependent resources should be last.
var userResources = []schema.GroupResource{ // Should remain exported in order to expose a current list of resources to downstream
// composition that wants to build on the concept of 'all' for their CLIs.
var UserResources = []schema.GroupResource{
{Group: "", Resource: "pods"}, {Group: "", Resource: "pods"},
{Group: "", Resource: "replicationcontrollers"}, {Group: "", Resource: "replicationcontrollers"},
{Group: "", Resource: "services"}, {Group: "", Resource: "services"},
...@@ -116,7 +118,7 @@ func (e ShortcutExpander) AliasesForResource(resource string) ([]string, bool) { ...@@ -116,7 +118,7 @@ func (e ShortcutExpander) AliasesForResource(resource string) ([]string, bool) {
if strings.ToLower(resource) == "all" { if strings.ToLower(resource) == "all" {
var resources []schema.GroupResource var resources []schema.GroupResource
if resources = e.getAll(); len(resources) == 0 { if resources = e.getAll(); len(resources) == 0 {
resources = userResources resources = UserResources
} }
aliases := []string{} aliases := []string{}
for _, r := range resources { for _, r := range resources {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment