fix crd resource etcd key path

openyurtio · Oct 10, 2023 · 54e05ea · 54e05ea
1 parent d89a805
commit 54e05ea
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pkg/yurthub/storage/etcd/key.go b/pkg/yurthub/storage/etcd/key.go
@@ -18,6 +18,7 @@ package etcd
 
 import (
 	"errors"
+	hubmeta "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/meta"
 	"path/filepath"
 
 	"k8s.io/apimachinery/pkg/api/validation/path"
@@ -72,6 +73,12 @@ func (s *etcdStorage) KeyFunc(info storage.KeyBuildInfo) (storage.Key, error) {
 
 	path := filepath.Join(s.prefix, resource, info.Namespace, info.Name)
 
+	gvr := schema.GroupVersionResource{Group: info.Group, Version: info.Version, Resource: info.Resources}
+	if isSchema := hubmeta.IsSchemeResource(gvr); !isSchema {
+		group := info.Group
+		path = filepath.Join(s.prefix, group, resource, info.Namespace, info.Name)
+	}
+
 	return storageKey{
 		comp: info.Component,
 		path: path,