Skip to content

Commit 85a5b23

Browse files
authored
remove resource discovery failures (#495) (#501)
* remove resource discovery failures * address review
1 parent 2f140ed commit 85a5b23

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

pkg/controller/queuejobresources/genericresource/genericresource.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3737
"k8s.io/apimachinery/pkg/runtime"
3838
"k8s.io/apimachinery/pkg/runtime/schema"
39+
"k8s.io/client-go/discovery"
3940
"k8s.io/client-go/dynamic"
4041
"k8s.io/client-go/kubernetes"
4142
"k8s.io/client-go/rest"
@@ -120,8 +121,12 @@ func (gr *GenericResources) Cleanup(aw *arbv1.AppWrapper, awr *arbv1.AppWrapperG
120121

121122
_, apiresourcelist, err := dd.ServerGroupsAndResources()
122123
if err != nil {
123-
klog.Errorf("Error getting supported groups and resources, err=%#v", err)
124-
return name, gvk, err
124+
if derr, ok := err.(*discovery.ErrGroupDiscoveryFailed); ok {
125+
klog.Warning("Discovery failed for some groups, %d failing: %v", len(derr.Groups), err)
126+
} else {
127+
klog.Errorf("Error getting supported groups and resources, err=%#v", err)
128+
return name, gvk, err
129+
}
125130
}
126131
rsrc := mapping.Resource
127132
for _, apiresourcegroup := range apiresourcelist {
@@ -231,8 +236,12 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra
231236

232237
_, apiresourcelist, err := dd.ServerGroupsAndResources()
233238
if err != nil {
234-
klog.Errorf("Error getting supported groups and resources, err=%#v", err)
235-
return []*v1.Pod{}, err
239+
if derr, ok := err.(*discovery.ErrGroupDiscoveryFailed); ok {
240+
klog.Warning("Discovery failed for some groups, %d failing: %v", len(derr.Groups), err)
241+
} else {
242+
klog.Errorf("Error getting supported groups and resources, err=%#v", err)
243+
return []*v1.Pod{}, err
244+
}
236245
}
237246

238247
rsrc := mapping.Resource

0 commit comments

Comments
 (0)