bugfix: ReplaceComponentList should not delete resources of other gvr (…

…#1153) * bugfix: ReplaceComponentList should not delete resources of other gvr Signed-off-by: Congrool <[email protected]>
openyurtio · Jan 18, 2023 · e84c4f6 · e84c4f6
1 parent 735b40a
commit e84c4f6
Show file tree

Hide file tree

Showing 7 changed files with 679 additions and 282 deletions.
diff --git a/pkg/yurthub/poolcoordinator/resources/resources.go b/pkg/yurthub/poolcoordinator/resources/resources.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package resources
 
 import (

diff --git a/pkg/yurthub/poolcoordinator/resources/verifiable_pool_scope_resource.go b/pkg/yurthub/poolcoordinator/resources/verifiable_pool_scope_resource.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package resources
 
 import "k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/pkg/yurthub/storage/etcd/key.go b/pkg/yurthub/storage/etcd/key.go
@@ -42,6 +42,7 @@ var SpecialDefaultResourcePrefixes = map[schema.GroupResource]string{
 type storageKey struct {
 	comp string
 	path string
+	gvr  schema.GroupVersionResource
 }
 
 func (k storageKey) Key() string {
@@ -74,5 +75,10 @@ func (s *etcdStorage) KeyFunc(info storage.KeyBuildInfo) (storage.Key, error) {
 	return storageKey{
 		comp: info.Component,
 		path: path,
+		gvr: schema.GroupVersionResource{
+			Group:    info.Group,
+			Version:  info.Version,
+			Resource: info.Resources,
+		},
 	}, nil
 }