feat: tracking method in app

assets/swagger.json

@@ -5041,6 +5041,10 @@
         },
         "syncPolicy": {
           "$ref": "#/definitions/v1alpha1SyncPolicy"
+        },
+        "trackingMethod": {
+          "type": "string",
+          "title": "TrackingMethod is ability configure way how to track resources on application level"
         }
       }
     },

controller/cache/cache.go

@@ -261,6 +261,16 @@ func skipAppRequeuing(key kube.ResourceKey) bool {
 	return ignoredRefreshResources[key.Group+"/"+key.Kind]
 }
 
+// Get application name from label first, if it is exist and same as defined tracking method, this app name is taken
+// In case if application name can't be retrieve or not same as tracking method inside retrieved app, we do same flow but with annotations
+func (c *liveStateCache) retrieveApplicationName(un *unstructured.Unstructured) string {
+	appNameFromLabels := c.resourceTracking.GetApplicationNameIfResourceBelongApp(un, c.cacheSettings.appInstanceLabelKey, c.appInformer, argo.TrackingMethodLabel)
+	if appNameFromLabels != "" {
+		return appNameFromLabels
+	}
+	return c.resourceTracking.GetApplicationNameIfResourceBelongApp(un, c.cacheSettings.appInstanceLabelKey, c.appInformer, argo.TrackingMethodAnnotation)
+}
+
 func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, error) {
 	c.lock.RLock()
 	clusterCache, ok := c.clusters[server]
@@ -288,7 +298,7 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
 		return nil, fmt.Errorf("controller is configured to ignore cluster %s", cluster.Server)
 	}
 
-	trackingMethod := argo.GetTrackingMethod(c.settingsMgr)
+	trackingMethod := argo.GetTrackingMethodFromSettings(c.settingsMgr)
 
 	clusterCache = clustercache.NewClusterCache(cluster.RESTConfig(),
 		clustercache.SetListSemaphore(c.listSemaphore),
@@ -301,7 +311,13 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
 			populateNodeInfo(un, res)
 			res.Health, _ = health.GetResourceHealth(un, cacheSettings.clusterSettings.ResourceHealthOverride)
 
-			appName := c.resourceTracking.GetAppName(un, cacheSettings.appInstanceLabelKey, trackingMethod)
+			appName := c.retrieveApplicationName(un)
+
+			// if application not exist in labels and annotations with related tracking method, application should be retrieved with settings level tracking method
+			if appName == "" {
+				appName = c.resourceTracking.GetAppName(un, cacheSettings.appInstanceLabelKey, trackingMethod)
+			}
+
 			if isRoot && appName != "" {
 				res.AppName = appName
 			}

controller/state.go

@@ -175,7 +175,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, source v1alpha1
 		ApiVersions:       argo.APIGroupsToVersions(apiGroups),
 		VerifySignature:   verifySignature,
 		HelmRepoCreds:     permittedHelmCredentials,
-		TrackingMethod:    string(argo.GetTrackingMethod(m.settingsMgr)),
+		TrackingMethod:    string(argo.GetTrackingMethod(m.settingsMgr, app)),
 	})
 	if err != nil {
 		return nil, nil, err

manifests/core-install.yaml

@@ -792,6 +792,10 @@ spec:
                       type: string
                     type: array
                 type: object
+              trackingMethod:
+                description: TrackingMethod is ability configure way how to track
+                  resources on application level
+                type: string
             required:
             - destination
             - project

manifests/crds/application-crd.yaml

@@ -791,6 +791,10 @@ spec:
                       type: string
                     type: array
                 type: object
+              trackingMethod:
+                description: TrackingMethod is ability configure way how to track
+                  resources on application level
+                type: string
             required:
             - destination
             - project

manifests/ha/install.yaml

@@ -792,6 +792,10 @@ spec:
                       type: string
                     type: array
                 type: object
+              trackingMethod:
+                description: TrackingMethod is ability configure way how to track
+                  resources on application level
+                type: string
             required:
             - destination
             - project

manifests/install.yaml

@@ -792,6 +792,10 @@ spec:
                       type: string
                     type: array
                 type: object
+              trackingMethod:
+                description: TrackingMethod is ability configure way how to track
+                  resources on application level
+                type: string
             required:
             - destination
             - project