Skip to content

Conversation

agaudreault
Copy link
Member

This PR fixes a loop when auto-sync is on and the application is configured to FailOnSharedResource.

Auto-sync will try to compare the revisions in the sync results. However, the syncResult is not initialized on errors returned this early in SyncAppState.

In general, the errors happening early are validation also performed before auto-sync runs, but not in this case.

The real fix to prevent this from happening is #23356

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault agaudreault requested a review from a team as a code owner June 11, 2025 14:07
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Copy link
Member

@rumstead rumstead left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

codecov bot commented Jun 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.35%. Comparing base (3c68b26) to head (63e75d6).
Report is 2 commits behind head on release-2.14.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-2.14   #23357      +/-   ##
================================================
+ Coverage         55.31%   55.35%   +0.04%     
================================================
  Files               339      339              
  Lines             57374    57373       -1     
================================================
+ Hits              31735    31760      +25     
+ Misses            22942    22926      -16     
+ Partials           2697     2687      -10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@agaudreault agaudreault merged commit da2ef7d into argoproj:release-2.14 Jun 12, 2025
21 of 22 checks passed
@agaudreault
Copy link
Member Author

/cherry-pick release-3.0

Copy link

Cherry-pick failed with Merge error da2ef7db670c4863a59f287f34aeeee1b3033bc1 into temp-cherry-pick-af9562-release-3.0

agaudreault added a commit to agaudreault/argo-cd that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault added a commit to agaudreault/argo-cd that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault added a commit to agaudreault/argo-cd that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault added a commit that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault added a commit that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
agaudreault added a commit that referenced this pull request Jul 2, 2025
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jul 9, 2025
…rgoproj#23641)

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
…rgoproj#23641)

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: enneitex <etienne.divet@gmail.com>
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