Merge pull request #3746 from gman0/drm-fix-scope

kcp-ci-bot · web-flow · commit ee31e908cb43 · 2025-12-08T17:41:22.000+01:00
Fix scope mappings in DynamicRESTMapper
diff --git a/pkg/reconciler/dynamicrestmapper/defaultrestmapper_mutable.go b/pkg/reconciler/dynamicrestmapper/defaultrestmapper_mutable.go
@@ -19,7 +19,6 @@ package dynamicrestmapper
 import (
 	"slices"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
@@ -42,7 +41,7 @@ func (m *DefaultRESTMapper) add(typeMeta typeMeta) {
 	m.resourceToKind[plural] = kind
 
 	m.kindToPluralResource[kind] = plural
-	m.kindToScope[kind] = meta.RESTScopeRoot
+	m.kindToScope[kind] = typeMeta.Scope
 
 	foundDefaultVersion := false
 	for i := range m.defaultGroupVersions {
diff --git a/pkg/reconciler/dynamicrestmapper/typemeta.go b/pkg/reconciler/dynamicrestmapper/typemeta.go
@@ -35,9 +35,9 @@ type typeMeta struct {
 
 func resourceScopeToRESTScope(scope apiextensionsv1.ResourceScope) meta.RESTScope {
 	if scope == apiextensionsv1.ClusterScoped {
-		return meta.RESTScopeNamespace
+		return meta.RESTScopeRoot
 	}
-	return meta.RESTScopeRoot
+	return meta.RESTScopeNamespace
 }
 
 func newTypeMeta(group, version, kind, singular, plural string, scope meta.RESTScope) typeMeta {

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ type typeMeta struct {`
`35`	`35`
`36`	`36`	`func resourceScopeToRESTScope(scope apiextensionsv1.ResourceScope) meta.RESTScope {`
`37`	`37`	`if scope == apiextensionsv1.ClusterScoped {`
`38`		`- return meta.RESTScopeNamespace`
	`38`	`+ return meta.RESTScopeRoot`
`39`	`39`	`}`
`40`		`- return meta.RESTScopeRoot`
	`40`	`+ return meta.RESTScopeNamespace`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func newTypeMeta(group, version, kind, singular, plural string, scope meta.RESTScope) typeMeta {`