fix(platform): api-resources failed group error (#1701)

Co-authored-by: xdonggao <[email protected]>
tkestack · Dec 7, 2021 · 310e18e · 310e18e
1 parent b614049
commit 310e18e
Show file tree

Hide file tree

Showing 8 changed files with 416 additions and 354 deletions.
diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -1397,6 +1397,8 @@ type ClusterGroupAPIResourceItemsList struct {
 	metav1.ListMeta
 	// List of ClusterAPIResource
 	Items []ClusterGroupAPIResourceItems
+	// Failed Group Error
+	FailedGroupError string
 }
 
 // +genclient

diff --git a/api/platform/v1/generated.pb.go b/api/platform/v1/generated.pb.go
diff --git a/api/platform/v1/generated.proto b/api/platform/v1/generated.proto
diff --git a/api/platform/v1/types.go b/api/platform/v1/types.go
@@ -1422,6 +1422,8 @@ type ClusterGroupAPIResourceItemsList struct {
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,3,opt,name=metadata"`
 	// List of ClusterGroupAPIResourceItems
 	Items []ClusterGroupAPIResourceItems `protobuf:"bytes,2,rep,name=items"`
+	// Failed Group Error
+	FailedGroupError string `json:"failedGroupError" protobuf:"bytes,4,rep,name=failedGroupError"`
 }
 
 // +genclient

diff --git a/api/platform/v1/types_swagger_doc_generated.go b/api/platform/v1/types_swagger_doc_generated.go
diff --git a/api/platform/v1/zz_generated.conversion.go b/api/platform/v1/zz_generated.conversion.go
diff --git a/pkg/platform/registry/cluster/storage/api_resources.go b/pkg/platform/registry/cluster/storage/api_resources.go
@@ -20,6 +20,7 @@ package storage
 
 import (
 	"context"
+
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -68,8 +69,9 @@ func (r *APIResourcesREST) Get(ctx context.Context, clusterName string, options
 		return nil, err
 	}
 	lists, err := discoveryclient.ServerPreferredResources()
+	failedGroup := ""
 	if err != nil {
-		return nil, err
+		failedGroup = err.Error()
 	}
 	items := make([]platform.ClusterGroupAPIResourceItems, 0)
 	for _, list := range lists {
@@ -96,6 +98,7 @@ func (r *APIResourcesREST) Get(ctx context.Context, clusterName string, options
 		})
 	}
 	return &platform.ClusterGroupAPIResourceItemsList{
-		Items: items,
+		Items:            items,
+		FailedGroupError: failedGroup,
 	}, nil
 }