mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-14 21:53:52 +00:00
warning instead error when search kinds for resources
This commit is contained in:
@@ -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)
|
||||
|
1
pkg/master/thirdparty/thirdparty.go
vendored
1
pkg/master/thirdparty/thirdparty.go
vendored
@@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user