Merge pull request #585 from darkdoc/fix-uninstall

fix: Correct the prefix for tracking id annotation on applications

Author: openshift-merge-bot[bot]

internal/controller/argo.go

@@ -1277,7 +1277,7 @@ func getChildApplications(client argoclient.Interface, parentApp *argoapi.Applic
 	expectedPrefix := fmt.Sprintf(
 		"%s:argoproj.io/Application:%s/",
 		parentApp.Name,
-		parentApp.Namespace,
+		parentApp.Name,
 	)
 
 	for _, app := range appList.Items { //nolint:gocritic // rangeValCopy: each iteration copies 992 bytes

internal/controller/argo_test.go

@@ -1391,7 +1391,7 @@ var _ = Describe("getChildApplications", func() {
 					Name:      "child-app",
 					Namespace: namespace,
 					Annotations: map[string]string{
-						"argocd.argoproj.io/tracking-id": fmt.Sprintf("parent-app:argoproj.io/Application:%s/child-app", namespace),
+						"argocd.argoproj.io/tracking-id": "parent-app:argoproj.io/Application:parent-app/child-app",
 					},
 				},
 			}
@@ -2276,7 +2276,7 @@ var _ = Describe("getChildApplications", func() {
 					Name:      "child-app",
 					Namespace: getClusterWideArgoNamespace(),
 					Annotations: map[string]string{
-						"argocd.argoproj.io/tracking-id": fmt.Sprintf("parent-app:argoproj.io/Application:%s/child-app", getClusterWideArgoNamespace()),
+						"argocd.argoproj.io/tracking-id": "parent-app:argoproj.io/Application:parent-app/child-app",
 					},
 				},
 			}