From 9fae4df34e2ad1004cd8e0bcb88cef2ce27d0ea9 Mon Sep 17 00:00:00 2001 From: Somefive Date: Thu, 4 Aug 2022 17:26:31 +0800 Subject: [PATCH] Fix: compare resource without version (#4559) Signed-off-by: Somefive --- apis/core.oam.dev/v1beta1/resourcetracker_types.go | 5 +++-- apis/core.oam.dev/v1beta1/resourcetracker_types_test.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apis/core.oam.dev/v1beta1/resourcetracker_types.go b/apis/core.oam.dev/v1beta1/resourcetracker_types.go index 8f7637378..4fa1ef4ae 100644 --- a/apis/core.oam.dev/v1beta1/resourcetracker_types.go +++ b/apis/core.oam.dev/v1beta1/resourcetracker_types.go @@ -123,12 +123,13 @@ func (in ManagedResource) NamespacedName() types.NamespacedName { // ResourceKey computes the key for managed resource, resources with the same key points to the same resource func (in ManagedResource) ResourceKey() string { - gv, kind := in.GroupVersionKind().ToAPIVersionAndKind() + group := in.GroupVersionKind().Group + kind := in.GroupVersionKind().Kind cluster := in.Cluster if cluster == "" { cluster = velatypes.ClusterLocalName } - return strings.Join([]string{gv, kind, cluster, in.Namespace, in.Name}, "/") + return strings.Join([]string{group, kind, cluster, in.Namespace, in.Name}, "/") } // ComponentKey computes the key for the component which managed resource belongs to diff --git a/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go b/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go index 301e155a3..a75ae2145 100644 --- a/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go +++ b/apis/core.oam.dev/v1beta1/resourcetracker_types_test.go @@ -125,7 +125,7 @@ func TestManagedResourceKeys(t *testing.T) { }, } r.Equal("namespace/name", input.NamespacedName().String()) - r.Equal("apps/v1/Deployment/cluster/namespace/name", input.ResourceKey()) + r.Equal("apps/Deployment/cluster/namespace/name", input.ResourceKey()) r.Equal("env/component", input.ComponentKey()) r.Equal("Deployment name (Cluster: cluster, Namespace: namespace)", input.DisplayName()) var deploy1, deploy2 v12.Deployment