Improve Namespace-awareness for CRDs (#4189)

* add new page for cluster-scoped crds * add routeparamscount for cluster-scoped object route * use namespaceifscoped
kubernetes · Aug 20, 2019 · 1707373 · 1707373
1 parent 6ffa91d
commit 1707373
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/app/backend/resource/customresourcedefinition/objects.go b/src/app/backend/resource/customresourcedefinition/objects.go
@@ -21,6 +21,7 @@ import (
 	"github.com/kubernetes/dashboard/src/app/backend/errors"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/common"
 	"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
+	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
@@ -103,7 +104,7 @@ func GetCustomResourceObjectList(client apiextensionsclientset.Interface, config
 	}
 
 	raw, err := restClient.Get().
-		Namespace(namespace.ToRequestParam()).
+		NamespaceIfScoped(namespace.ToRequestParam(), customResourceDefinition.Spec.Scope == apiextensions.NamespaceScoped).
 		Resource(customResourceDefinition.Spec.Names.Plural).
 		Do().Raw()
 	nonCriticalErrors, criticalError = errors.AppendError(err, nonCriticalErrors)
@@ -149,8 +150,8 @@ func GetCustomResourceObjectDetail(client apiextensionsclientset.Interface, name
 	}
 
 	raw, err := restClient.Get().
-		Namespace(namespace.ToRequestParam()).
-		Resource(customResourceDefinition.Status.AcceptedNames.Plural).
+		NamespaceIfScoped(namespace.ToRequestParam(), customResourceDefinition.Spec.Scope == apiextensions.NamespaceScoped).
+		Resource(customResourceDefinition.Spec.Names.Plural).
 		Name(name).Do().Raw()
 	nonCriticalErrors, criticalError = errors.AppendError(err, nonCriticalErrors)
 	if criticalError != nil {

diff --git a/src/app/frontend/crd/routing.ts b/src/app/frontend/crd/routing.ts
@@ -32,18 +32,25 @@ const CRD_DETAIL_ROUTE: Route = {
   data: {breadcrumb: '{{ crdName }}', parent: CRD_LIST_ROUTE},
 };
 
-const CRD_OBJECT_DETAIL_ROUTE: Route = {
+const CRD_NAMESPACED_OBJECT_DETAIL_ROUTE: Route = {
   path: ':crdName/:namespace/:objectName',
   component: CRDObjectDetailComponent,
   data: {breadcrumb: '{{ objectName }}', routeParamsCount: 2, parent: CRD_DETAIL_ROUTE},
 };
 
+const CRD_CLUSTER_OBJECT_DETAIL_ROUTE: Route = {
+  path: ':crdName/:objectName',
+  component: CRDObjectDetailComponent,
+  data: {breadcrumb: '{{ objectName }}', routeParamsCount: 1, parent: CRD_DETAIL_ROUTE},
+};
+
 @NgModule({
   imports: [
     RouterModule.forChild([
       CRD_LIST_ROUTE,
       CRD_DETAIL_ROUTE,
-      CRD_OBJECT_DETAIL_ROUTE,
+      CRD_NAMESPACED_OBJECT_DETAIL_ROUTE,
+      CRD_CLUSTER_OBJECT_DETAIL_ROUTE,
       DEFAULT_ACTIONBAR,
     ]),
   ],