Skip to content

feat: tracking method in app#7322

Closed
pasha-codefresh wants to merge 41 commits intoargoproj:masterfrom
pasha-codefresh:tracking-method-in-app
Closed

feat: tracking method in app#7322
pasha-codefresh wants to merge 41 commits intoargoproj:masterfrom
pasha-codefresh:tracking-method-in-app

Conversation

@pasha-codefresh
Copy link
Member

Continuation for #7251

Provide ability override tracking method on application level

Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…resh/argo-cd into rename-app-id

� Conflicts:
�	reposerver/apiclient/repository.pb.go
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…resh/argo-cd into rename-app-id

� Conflicts:
�	util/settings/settings.go
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…f github.com:pasha-codefresh/argo-cd into rename-app-id-value-convention
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…ue-convention-e2e

Tracking method app id value convention e2e
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…pasha-codefresh/argo-cd into tracking-method-in-app

� Conflicts:
�	controller/cache/cache.go
�	controller/state.go
�	reposerver/repository/repository.go
�	server/application/application.go
�	util/argo/argo.go
�	util/argo/resource_tracking.go
�	util/argo/resource_tracking_test.go
�	util/settings/settings.go
Signed-off-by: pashavictorovich <pavel@codefresh.io>
Signed-off-by: pashavictorovich <pavel@codefresh.io>
…sha-codefresh/argo-cd into tracking-method-in-app

� Conflicts:
�	util/argo/resource_tracking.go
�	util/argo/resource_tracking_test.go
@codecov
Copy link

codecov bot commented Sep 29, 2021

Codecov Report

Merging #7322 (1a10216) into master (94372ad) will decrease coverage by 0.01%.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7322      +/-   ##
==========================================
- Coverage   41.17%   41.16%   -0.02%     
==========================================
  Files         161      161              
  Lines       21612    21632      +20     
==========================================
+ Hits         8899     8904       +5     
- Misses      11446    11460      +14     
- Partials     1267     1268       +1     
Impacted Files Coverage Δ
controller/cache/cache.go 10.28% <0.00%> (-0.23%) ⬇️
pkg/apis/application/v1alpha1/types.go 57.51% <ø> (ø)
util/argo/resource_tracking.go 75.40% <35.71%> (-11.83%) ⬇️
server/application/application.go 32.80% <50.00%> (ø)
controller/state.go 67.77% <100.00%> (ø)
util/argo/argo.go 63.63% <100.00%> (ø)
util/settings/settings.go 46.70% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 94372ad...1a10216. Read the comment docs.

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jessesuen suggested a great idea about how to make transition seamless and avoid adding app-level config. Instead we can add programmatically ignore the difference if missing annotation and extract tracking label is the only detected difference. We leverage "diff normalizers" to archive it: https://github.com/argoproj/argo-cd/tree/master/util/argo/normalizers

The normalizer is supposed to remove fields which should not be compared from the resource. You can use https://github.com/argoproj/argo-cd/blob/master/util/argo/normalizers/diff_normalizer.go as an example

@pasha-codefresh
Copy link
Member Author

Thank you @alexmt @jessesuen , i will implement it in few days

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants