From 7c912f02c0bfe22e190602d0263a27f874cfe91d Mon Sep 17 00:00:00 2001 From: Abhishek Malvankar Date: Wed, 19 Jul 2023 15:44:16 -0400 Subject: [PATCH 1/2] remove resource discovery failures --- .../genericresource/genericresource.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/controller/queuejobresources/genericresource/genericresource.go b/pkg/controller/queuejobresources/genericresource/genericresource.go index 4b2879305..4c947f6a9 100644 --- a/pkg/controller/queuejobresources/genericresource/genericresource.go +++ b/pkg/controller/queuejobresources/genericresource/genericresource.go @@ -36,6 +36,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -120,8 +121,13 @@ func (gr *GenericResources) Cleanup(aw *arbv1.AppWrapper, awr *arbv1.AppWrapperG _, apiresourcelist, err := dd.ServerGroupsAndResources() if err != nil { - klog.Errorf("Error getting supported groups and resources, err=%#v", err) - return name, gvk, err + if derr, ok := err.(*discovery.ErrGroupDiscoveryFailed); ok { + klog.Warning("Discovery failed for some groups, %d failing: %v", len(derr.Groups), err) + } else { + klog.Errorf("Error getting supported groups and resources, err=%#v", err) + return name, gvk, err + } + } rsrc := mapping.Resource for _, apiresourcegroup := range apiresourcelist { @@ -233,8 +239,12 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra _, apiresourcelist, err := dd.ServerGroupsAndResources() if err != nil { - klog.Errorf("Error getting supported groups and resources, err=%#v", err) - return []*v1.Pod{}, err + if derr, ok := err.(*discovery.ErrGroupDiscoveryFailed); ok { + klog.Warning("Discovery failed for some groups, %d failing: %v", len(derr.Groups), err) + } else { + klog.Errorf("Error getting supported groups and resources, err=%#v", err) + return []*v1.Pod{}, err + } } rsrc := mapping.Resource From ec5133e1336234cc78e1467ef6a35f4b0e605385 Mon Sep 17 00:00:00 2001 From: Abhishek Malvankar Date: Thu, 20 Jul 2023 12:02:22 -0400 Subject: [PATCH 2/2] address review --- .../queuejobresources/genericresource/genericresource.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/controller/queuejobresources/genericresource/genericresource.go b/pkg/controller/queuejobresources/genericresource/genericresource.go index 4c947f6a9..1336b040d 100644 --- a/pkg/controller/queuejobresources/genericresource/genericresource.go +++ b/pkg/controller/queuejobresources/genericresource/genericresource.go @@ -127,7 +127,6 @@ func (gr *GenericResources) Cleanup(aw *arbv1.AppWrapper, awr *arbv1.AppWrapperG klog.Errorf("Error getting supported groups and resources, err=%#v", err) return name, gvk, err } - } rsrc := mapping.Resource for _, apiresourcegroup := range apiresourcelist {