feat: rename app identifier (argoproj#7251)

feat: rename app identifier (argoproj#7251) Signed-off-by: pashavictorovich <[email protected]>
dajudge · Sep 28, 2021 · bb88a1c · bb88a1c
1 parent 917d079
commit bb88a1c
Show file tree

Hide file tree

Showing 26 changed files with 637 additions and 191 deletions.
diff --git a/assets/swagger.json b/assets/swagger.json
@@ -3660,6 +3660,9 @@
  "statusBadgeEnabled": {
  "type": "boolean"
  },
+ "trackingMethod": {
+ "type": "string"
+ },
  "uiBannerContent": {
  "type": "string"
  },

diff --git a/cmd/argocd/commands/admin/app.go b/cmd/argocd/commands/admin/app.go
@@ -10,6 +10,8 @@ import (
  "sort"
  "time"
 
+ "github.com/argoproj/argo-cd/v2/util/argo"
+
  "github.com/ghodss/yaml"
  "github.com/spf13/cobra"
  apiv1 "k8s.io/api/core/v1"
@@ -408,5 +410,5 @@ func reconcileApplications(
 }
 
 func newLiveStateCache(argoDB db.ArgoDB, appInformer kubecache.SharedIndexInformer, settingsMgr *settings.SettingsManager, server *metrics.MetricsServer) cache.LiveStateCache {
- return cache.NewLiveStateCache(argoDB, appInformer, settingsMgr, kubeutil.NewKubectl(), server, func(managedByApp map[string]bool, ref apiv1.ObjectReference) {}, nil)
+ return cache.NewLiveStateCache(argoDB, appInformer, settingsMgr, kubeutil.NewKubectl(), server, func(managedByApp map[string]bool, ref apiv1.ObjectReference) {}, nil, argo.NewResourceTracking())
 }
diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
@@ -733,8 +733,8 @@ func liveObjects(resources []*argoappv1.ResourceDiff) ([]*unstructured.Unstructu
 }
 
 func getLocalObjects(app *argoappv1.Application, local, localRepoRoot, appLabelKey, kubeVersion string, kustomizeOptions *argoappv1.KustomizeOptions,
- configManagementPlugins []*argoappv1.ConfigManagementPlugin) []*unstructured.Unstructured {
- manifestStrings := getLocalObjectsString(app, local, localRepoRoot, appLabelKey, kubeVersion, kustomizeOptions, configManagementPlugins)
+ configManagementPlugins []*argoappv1.ConfigManagementPlugin, trackingMethod string) []*unstructured.Unstructured {
+ manifestStrings := getLocalObjectsString(app, local, localRepoRoot, appLabelKey, kubeVersion, kustomizeOptions, configManagementPlugins, trackingMethod)
  objs := make([]*unstructured.Unstructured, len(manifestStrings))
  for i := range manifestStrings {
  obj := unstructured.Unstructured{}
@@ -746,7 +746,7 @@ func getLocalObjects(app *argoappv1.Application, local, localRepoRoot, appLabelK
 }
 
 func getLocalObjectsString(app *argoappv1.Application, local, localRepoRoot, appLabelKey, kubeVersion string, kustomizeOptions *argoappv1.KustomizeOptions,
- configManagementPlugins []*argoappv1.ConfigManagementPlugin) []string {
+ configManagementPlugins []*argoappv1.ConfigManagementPlugin, trackingMethod string) []string {
 
  res, err := repository.GenerateManifests(local, localRepoRoot, app.Spec.Source.TargetRevision, &repoapiclient.ManifestRequest{
  Repo: &argoappv1.Repository{Repo: app.Spec.Source.RepoURL},
@@ -757,6 +757,7 @@ func getLocalObjectsString(app *argoappv1.Application, local, localRepoRoot, app
  KustomizeOptions: kustomizeOptions,
  KubeVersion: kubeVersion,
  Plugins: configManagementPlugins,
+ TrackingMethod: trackingMethod,
  }, true)
  errors.CheckError(err)
 
@@ -842,7 +843,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
  defer argoio.Close(conn)
  cluster, err := clusterIf.Get(context.Background(), &clusterpkg.ClusterQuery{Name: app.Spec.Destination.Name, Server: app.Spec.Destination.Server})
  errors.CheckError(err)
- localObjs := groupObjsByKey(getLocalObjects(app, local, localRepoRoot, argoSettings.AppLabelKey, cluster.ServerVersion, argoSettings.KustomizeOptions, argoSettings.ConfigManagementPlugins), liveObjs, app.Spec.Destination.Namespace)
+ localObjs := groupObjsByKey(getLocalObjects(app, local, localRepoRoot, argoSettings.AppLabelKey, cluster.ServerVersion, argoSettings.KustomizeOptions, argoSettings.ConfigManagementPlugins, argoSettings.TrackingMethod), liveObjs, app.Spec.Destination.Namespace)
  items = groupObjsForDiff(resources, localObjs, items, argoSettings, appName)
  } else if revision != "" {
  var unstructureds []*unstructured.Unstructured
@@ -1377,7 +1378,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
  cluster, err := clusterIf.Get(context.Background(), &clusterpkg.ClusterQuery{Name: app.Spec.Destination.Name, Server: app.Spec.Destination.Server})
  errors.CheckError(err)
  argoio.Close(conn)
- localObjsStrings = getLocalObjectsString(app, local, localRepoRoot, argoSettings.AppLabelKey, cluster.ServerVersion, argoSettings.KustomizeOptions, argoSettings.ConfigManagementPlugins)
+ localObjsStrings = getLocalObjectsString(app, local, localRepoRoot, argoSettings.AppLabelKey, cluster.ServerVersion, argoSettings.KustomizeOptions, argoSettings.ConfigManagementPlugins, argoSettings.TrackingMethod)
  }
 
  syncReq := applicationpkg.ApplicationSyncRequest{

diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -195,7 +195,7 @@ func NewApplicationController(
  return nil, err
  }
  }
- stateCache := statecache.NewLiveStateCache(db, appInformer, ctrl.settingsMgr, kubectl, ctrl.metricsServer, ctrl.handleObjectUpdated, clusterFilter)
+ stateCache := statecache.NewLiveStateCache(db, appInformer, ctrl.settingsMgr, kubectl, ctrl.metricsServer, ctrl.handleObjectUpdated, clusterFilter, argo.NewResourceTracking())
  appStateManager := NewAppStateManager(db, applicationClientset, repoClientset, namespace, kubectl, ctrl.settingsMgr, stateCache, projInformer, ctrl.metricsServer, argoCache, ctrl.statusRefreshTimeout)
  ctrl.appInformer = appInformer
  ctrl.appLister = appLister

diff --git a/controller/cache/cache.go b/controller/cache/cache.go
@@ -105,7 +105,8 @@ func NewLiveStateCache(
  kubectl kube.Kubectl,
  metricsServer *metrics.MetricsServer,
  onObjectUpdated ObjectUpdatedHandler,
- clusterFilter func(cluster *appv1.Cluster) bool) LiveStateCache {
+ clusterFilter func(cluster *appv1.Cluster) bool,
+ resourceTracking argo.ResourceTracking) LiveStateCache {
 
  return &liveStateCache{
  appInformer: appInformer,
@@ -116,8 +117,9 @@ func NewLiveStateCache(
  settingsMgr: settingsMgr,
  metricsServer: metricsServer,
  // The default limit of 50 is chosen based on experiments.
- listSemaphore: semaphore.NewWeighted(50),
- clusterFilter: clusterFilter,
+ listSemaphore: semaphore.NewWeighted(50),
+ clusterFilter: clusterFilter,
+ resourceTracking: resourceTracking,
  }
 }
 
@@ -127,13 +129,14 @@ type cacheSettings struct {
 }
 
 type liveStateCache struct {
- db db.ArgoDB
- appInformer cache.SharedIndexInformer
- onObjectUpdated ObjectUpdatedHandler
- kubectl kube.Kubectl
- settingsMgr *settings.SettingsManager
- metricsServer *metrics.MetricsServer
- clusterFilter func(cluster *appv1.Cluster) bool
+ db db.ArgoDB
+ appInformer cache.SharedIndexInformer
+ onObjectUpdated ObjectUpdatedHandler
+ kubectl kube.Kubectl
+ settingsMgr *settings.SettingsManager
+ metricsServer *metrics.MetricsServer
+ clusterFilter func(cluster *appv1.Cluster) bool
+ resourceTracking argo.ResourceTracking
 
  // listSemaphore is used to limit the number of concurrent memory consuming operations on the
  // k8s list queries results across all clusters to avoid memory spikes during cache initialization.
@@ -285,6 +288,8 @@ 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)
+
  clusterCache = clustercache.NewClusterCache(cluster.RESTConfig(),
  clustercache.SetListSemaphore(c.listSemaphore),
  clustercache.SetResyncTimeout(K8SClusterResyncDuration),
@@ -295,7 +300,8 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
  res := &ResourceInfo{}
  populateNodeInfo(un, res)
  res.Health, _ = health.GetResourceHealth(un, cacheSettings.clusterSettings.ResourceHealthOverride)
- appName := kube.GetAppInstanceLabel(un, cacheSettings.appInstanceLabelKey)
+
+ appName := c.resourceTracking.GetAppName(un, cacheSettings.appInstanceLabelKey, trackingMethod)
  if isRoot && appName != "" {
  res.AppName = appName
  }

diff --git a/controller/state.go b/controller/state.go
@@ -148,6 +148,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, source v1alpha1
  if err != nil {
  return nil, nil, err
  }
+
  kustomizeOptions, err := kustomizeSettings.GetOptions(app.Spec.Source)
  if err != nil {
  return nil, nil, err
@@ -174,6 +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)),
  })
  if err != nil {
  return nil, nil, err