Fix to get the resource key from the annoation

Signed-off-by: Yoshiki Fujikane <[email protected]>

pkg/app/piped/livestatestore/kubernetes/reflector.go

@@ -249,7 +249,11 @@ func (r *reflector) start(_ context.Context) error {
 
 func (r *reflector) onObjectAdd(obj interface{}) {
 	u := obj.(*unstructured.Unstructured)
-	key := provider.MakeResourceKey(u)
+	key := provider.GetResourceKeyFromActualResource(u)
+	if anoKey := u.GetAnnotations()[provider.LabelResourceKey]; anoKey != "" {
+		key, _ = provider.DecodeResourceKey(anoKey)
+
+	}
 
 	// Ignore all predefined ones.
 	if _, ok := ignoreResourceKeys[key.String()]; ok {
@@ -283,7 +287,7 @@ func (r *reflector) onObjectUpdate(oldObj, obj interface{}) {
 	oldU := oldObj.(*unstructured.Unstructured)
 
 	// Ignore all predefined ones.
-	key := provider.MakeResourceKey(u)
+	key := provider.GetResourceKeyFromActualResource(u)
 	if _, ok := ignoreResourceKeys[key.String()]; ok {
 		kubernetesmetrics.IncResourceEventsCounter(
 			kubernetesmetrics.LabelEventUpdate,
@@ -312,7 +316,7 @@ func (r *reflector) onObjectUpdate(oldObj, obj interface{}) {
 
 func (r *reflector) onObjectDelete(obj interface{}) {
 	u := obj.(*unstructured.Unstructured)
-	key := provider.MakeResourceKey(u)
+	key := provider.GetResourceKeyFromActualResource(u)
 
 	// Ignore all predefined ones.
 	if _, ok := ignoreResourceKeys[key.String()]; ok {

pkg/app/piped/livestatestore/kubernetes/store.go

@@ -73,7 +73,7 @@ func (s *store) initialize() {
 		}
 
 		// Add the missing resource into the dependedResources of the app.
-		key := provider.MakeResourceKey(an.resource)
+		key := provider.GetResourceKeyFromActualResource(an.resource)
 
 		// Ignore in case appNodes with appID not existed in store.
 		if s.apps[appID] == nil {
@@ -103,7 +103,7 @@ func (s *store) initialize() {
 func (s *store) addResource(obj *unstructured.Unstructured, appID string) {
 	var (
 		uid    = string(obj.GetUID())
-		key    = provider.MakeResourceKey(obj)
+		key    = provider.GetResourceKeyFromActualResource(obj)
 		owners = obj.GetOwnerReferences()
 		now    = time.Now()
 	)
@@ -189,7 +189,7 @@ func (s *store) onDeleteResource(obj *unstructured.Unstructured) {
 	var (
 		uid    = string(obj.GetUID())
 		appID  = obj.GetAnnotations()[provider.LabelApplication]
-		key    = provider.MakeResourceKey(obj)
+		key    = provider.GetResourceKeyFromActualResource(obj)
 		owners = obj.GetOwnerReferences()
 		now    = time.Now()
 	)

pkg/app/piped/platformprovider/kubernetes/resourcekey.go

@@ -246,6 +246,21 @@ func (k ResourceKey) IsEqualWithIgnoringNamespace(a ResourceKey) bool {
 	return true
 }
 
+// GetResourceKeyFromActualResource extracts the ResourceKey from the given resource object.
+// If the ResourceKey is not found in the annotations, it will create a new one.
+func GetResourceKeyFromActualResource(obj *unstructured.Unstructured) ResourceKey {
+	annotation, ok := obj.GetAnnotations()[LabelResourceKey]
+	if !ok {
+		return MakeResourceKey(obj)
+	}
+
+	key, err := DecodeResourceKey(annotation)
+	if err != nil {
+		return MakeResourceKey(obj)
+	}
+	return key
+}
+
 func MakeResourceKey(obj *unstructured.Unstructured) ResourceKey {
 	k := ResourceKey{
 		APIVersion: obj.GetAPIVersion(),