Skip to content

fix(appset): add default retry limit for operations triggered via RollingSync when syncPolicy.retry is not defined (#20428) #23335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jun 13, 2025
Merged

fix(appset): add default retry limit for operations triggered via RollingSync when syncPolicy.retry is not defined (#20428) #23335

merged 3 commits into from
Jun 13, 2025

Conversation

mikeshng
Copy link
Contributor

@mikeshng mikeshng commented Jun 9, 2025 •
edited
Loading

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Fixes #20428

Extending @StupidScience 's fix in #20429 by adding a comment and unit testing. When sync operations are triggered from the ApplicationSet RollingSync strategy, apply a default retry limit of 5 if the ApplicationSet's Application template does not define syncPolicy.retry. This aligns with the default value used by the appcontroller auto-sync: https://github.com/argoproj/argo-cd/blob/v3.0.5/controller/appcontroller.go#L2126

In the future, this could be made configurable via the ApplicationSet spec.

@mikeshng
fix(appset): add default retry limit for operations triggered via Rol…
53354c0 
…lingSync when syncPolicy.retry is not defined

Signed-off-by: Mike Ng <ming@redhat.com>
@mikeshng mikeshng requested a review from a team as a code owner June 9, 2025 20:45
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Jun 9, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@mikeshng
Copy link
Contributor Author

mikeshng commented Jun 9, 2025

Hi @StupidScience, since there was no response to @andrii-korotkov-verkada initial review feedback from last year and the original PR #20429 has been stale for some time, I've opened this PR instead. It's based on @crenshaw-dev 's #20429 (comment) Thanks again for bringing this to the community’s attention and for providing the initial fix.

@codecov Codecov
Copy link

codecov bot commented Jun 9, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.03%. Comparing base (2ae9f43) to head (f74d798).
Report is 3 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #23335      +/-   ##
==========================================
+ Coverage   59.96%   60.03%   +0.07%     
==========================================
  Files         342      342              
  Lines       58807    58811       +4     
==========================================
+ Hits        35263    35309      +46     
+ Misses      20671    20632      -39     
+ Partials     2873     2870       -3

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

ishitasequeira
ishitasequeira approved these changes Jun 12, 2025
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

It would be good to make this configurable via config parameter. But based on @crenshaw-dev's comment from previous MR, the change looks good!!

agaudreault
agaudreault reviewed Jun 13, 2025
View reviewed changes
@agaudreault
Update applicationset/controllers/applicationset_controller.go
f822a36 
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault agaudreault enabled auto-merge (squash) June 13, 2025 20:33
@agaudreault agaudreault added this to the v3.1 milestone Jun 13, 2025
@agaudreault agaudreault merged commit 7a06400 into argoproj:master Jun 13, 2025
27 checks passed
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@mikeshng @agaudreault @dsuhinin
fix(appset): add default retry limit for operations triggered via Rol…
8f4d0d4 
…lingSync (argoproj#20428) (argoproj#23335)

Signed-off-by: Mike Ng <ming@redhat.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
jcogilvie pushed a commit to Sanyaku/argo-cd that referenced this pull request Jun 16, 2025
@mikeshng @agaudreault @jcogilvie
fix(appset): add default retry limit for operations triggered via Rol…
5cbfec2 
…lingSync (argoproj#20428) (argoproj#23335)

Signed-off-by: Mike Ng <ming@redhat.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Signed-off-by: Jonathan Ogilvie <jonathan.ogilvie@sumologic.com>
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
@mikeshng @agaudreault @enneitex
fix(appset): add default retry limit for operations triggered via Rol…
a665534 
…lingSync (argoproj#20428) (argoproj#23335)

Signed-off-by: Mike Ng <ming@redhat.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-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
Reviewers

@ishitasequeira ishitasequeira ishitasequeira approved these changes

@agaudreault agaudreault agaudreault approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.1
Development

Successfully merging this pull request may close these issues.

Application operation from progressive sync do not have retries by default
3 participants
@mikeshng @ishitasequeira @agaudreault