github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-01-16 13:41:35 -08:00 committed by GitHub
commit adbf6c6eb6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/util/shortcut_restmapper.go
View File

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