From b25873a4bc254a982d1fbbd4d67779394e1be044 Mon Sep 17 00:00:00 2001 From: zhouhaibing089 Date: Thu, 5 Jan 2017 10:53:51 +0800 Subject: [PATCH] warning instead error when search kinds for resources --- pkg/controller/garbagecollector/garbagecollector.go | 8 ++++++++ pkg/master/thirdparty/thirdparty.go | 1 + 2 files changed, 9 insertions(+) diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 93b4aeb7d58..e25cede1f98 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -564,6 +564,14 @@ func NewGarbageCollector(metaOnlyClientPool dynamic.ClientPool, clientPool dynam } kind, err := gc.restMapper.KindFor(resource) if err != nil { + if _, ok := err.(*meta.NoResourceMatchError); ok { + // ignore NoResourceMatchErrors for now because TPRs won't be registered + // and hence the RestMapper does not know about them. The deletableResources + // though are using discovery which included TPRs. + // TODO: use dynamic discovery for RestMapper and deletableResources + glog.Warningf("ignore NoResourceMatchError for %v", resource) + continue + } return nil, err } monitor, err := gc.monitorFor(resource, kind) diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index eea7aeec55b..b678967c1de 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -284,6 +284,7 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th m.genericAPIServer.HandlerContainer.Add(genericapi.NewGroupWebService(api.Codecs, path, apiGroup)) m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedataetcd.REST), apiGroup) + registered.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: group, Version: rsrc.Versions[0].Name}) return nil }