github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21744 from ethernetdan/defaultrestmapper-pkg-path-check

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-01 04:25:23 -08:00
commit 47fda638b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/mapper.go
View File

@ -43,10 +43,10 @@ func NewDefaultRESTMapper(defaultGroupVersions []unversioned.GroupVersion, inter
for _, gv := range defaultGroupVersions { for _, gv := range defaultGroupVersions {
for kind, oType := range Scheme.KnownTypes(gv) { for kind, oType := range Scheme.KnownTypes(gv) {
gvk := gv.WithKind(kind) gvk := gv.WithKind(kind)
// TODO: Remove import path prefix check. // TODO: Remove import path check.
// We check the import path prefix because we currently stuff both "api" and "extensions" objects // We check the import path because we currently stuff both "api" and "extensions" objects
// into the same group within Scheme since Scheme has no notion of groups yet. // into the same group within Scheme since Scheme has no notion of groups yet.
if !strings.HasPrefix(oType.PkgPath(), importPathPrefix) || ignoredKinds.Has(kind) { if !strings.Contains(oType.PkgPath(), importPathPrefix) || ignoredKinds.Has(kind) {
continue continue
} }
scope := meta.RESTScopeNamespace scope := meta.RESTScopeNamespace