From ca9982dc1529b45eeb63703f5fdbd098e071276b Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Thu, 11 Sep 2025 12:43:03 -0600 Subject: [PATCH] Folders: Fix panic in unified storage only mode (#110979) --- pkg/registry/apis/folders/register.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/registry/apis/folders/register.go b/pkg/registry/apis/folders/register.go index 93537deca30..092dbfcf792 100644 --- a/pkg/registry/apis/folders/register.go +++ b/pkg/registry/apis/folders/register.go @@ -143,6 +143,10 @@ func (b *FolderAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserver.API storage := map[string]rest.Storage{} if b.ignoreLegacy { + opts.StorageOptsRegister(resourceInfo.GroupResource(), apistore.StorageOptions{ + EnableFolderSupport: true, + RequireDeprecatedInternalID: true}) + store, err := grafanaregistry.NewRegistryStore(opts.Scheme, resourceInfo, opts.OptsGetter) if err != nil { return err @@ -150,6 +154,7 @@ func (b *FolderAPIBuilder) UpdateAPIGroupInfo(apiGroupInfo *genericapiserver.API storage[resourceInfo.StoragePath()] = store apiGroupInfo.VersionedResourcesStorageMap[folders.VERSION] = storage b.storage = storage[resourceInfo.StoragePath()].(grafanarest.Storage) + b.parents = newParentsGetter(store, folder.MaxNestedFolderDepth) return nil }