server: use type to identify Organization workspaces, not the lcluster

kcp-dev · Mar 23, 2022 · a506143 · a506143
1 parent a45b0d2
commit a506143
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/server/apiextensions.go b/pkg/server/apiextensions.go
@@ -112,8 +112,6 @@ func (p *systemCRDProvider) Keys(ctx context.Context, org, workspace string) set
 	switch {
 	case workspace == helper.RootCluster:
 		return p.rootCRDs
-	case org == helper.RootCluster:
-		return p.orgCRDs
 	case org == "system":
 		// fall through
 	case org != "":
@@ -124,8 +122,11 @@ func (p *systemCRDProvider) Keys(ctx context.Context, org, workspace string) set
 			klog.Errorf("error getting cluster workspace %q: %v", workspaceKey, err)
 			break
 		}
-		if clusterWorkspace.Spec.Type == "Universal" {
+		switch clusterWorkspace.Spec.Type {
+		case "Universal":
 			return p.universalCRDs
+		case "Organization":
+			return p.orgCRDs
 		}
 	}