github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make RESTMapper.KindFor

Browse Source
This commit is contained in:
deads2k
2015-11-16 15:14:27 -05:00
parent 581a1ad1af
commit 5c4fb5bcbe
11 changed files with 41 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/resource/builder.go
View File

@@ -426,11 +426,11 @@ func (b *Builder) resourceMappings() ([]*meta.RESTMapping, error) {
}
mappings := []*meta.RESTMapping{}
for _, r := range b.resources {
version, kind, err := b.mapper.VersionAndKindForResource(r)
gvk, err := b.mapper.KindFor(r)
if err != nil {
return nil, err
}
mapping, err := b.mapper.RESTMapping(kind, version)
mapping, err := b.mapper.RESTMapping(gvk.Kind, gvk.GroupVersion().String())
if err != nil {
return nil, err
}
@@ -446,11 +446,11 @@ func (b *Builder) resourceTupleMappings() (map[string]*meta.RESTMapping, error)
if _, ok := mappings[r.Resource]; ok {
continue
}
version, kind, err := b.mapper.VersionAndKindForResource(r.Resource)
gvk, err := b.mapper.KindFor(r.Resource)
if err != nil {
return nil, err
}
mapping, err := b.mapper.RESTMapping(kind, version)
mapping, err := b.mapper.RESTMapping(gvk.Kind, gvk.GroupVersion().String())
if err != nil {
return nil, err
}