Skip to content

fix(applicationset_controller): requeue by ApplicationStatus changes #23043

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 2 commits into from
May 19, 2025
Merged

fix(applicationset_controller): requeue by ApplicationStatus changes #23043

merged 2 commits into from
May 19, 2025

Conversation

dshmelev
Copy link
Contributor

This PR addresses a case where the ApplicationSet controller does not requeue when an application's status changes. As a result, the sync process may stall and fail to progress to the next step in a progressive sync strategy.

Issue: #22558
Discussion: https://cloud-native.slack.com/archives/C01U45M2SVB/p1746622854063139

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).

@dshmelev
fix(applicationset_controller): requeue by ApplicationStatus changes
c46f6a3 
Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
@dshmelev dshmelev requested a review from a team as a code owner May 19, 2025 14:26
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented May 19, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@dshmelev dshmelev mentioned this pull request May 19, 2025
Closed
14 tasks
rumstead
rumstead reviewed May 19, 2025
View reviewed changes
@dshmelev @rumstead
Update applicationset/controllers/applicationset_controller.go
d1bb394 
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
@rumstead
Copy link
Member

It is a shame that progressive syncs rely on requeuing an applicationset CR repeatedly, but I understand why we are doing it to unblock progressive syncs getting stuck.

rumstead
rumstead approved these changes May 19, 2025
View reviewed changes
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.

Assuming codecoverage and build pass, LGTM

@codecov Codecov
Copy link

codecov bot commented May 19, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 60.00%. Comparing base (90408cb) to head (d1bb394).
⚠️ Report is 461 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #23043      +/-   ##
==========================================
- Coverage   60.02%   60.00%   -0.03%     
==========================================
  Files         343      343              
  Lines       57846    57850       +4     
==========================================
- Hits        34723    34710      -13     
- Misses      20353    20370      +17     
  Partials     2770     2770

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

@rumstead rumstead merged commit 25dc960 into argoproj:master May 19, 2025
27 checks passed
ranakan19 pushed a commit to ranakan19/argo-cd that referenced this pull request May 20, 2025
@dshmelev @rumstead @ranakan19
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
68966f5 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Kanika Rana <krana@redhat.com>
olivergondza pushed a commit to olivergondza/argo-cd that referenced this pull request May 20, 2025
@dshmelev @rumstead @olivergondza
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
b7103c3 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@rumstead
Copy link
Member

Will cherry pick these into 3.0 and 2.14 mid next week

LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 24, 2025
@dshmelev @rumstead @LyhengTep
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
955a5ba 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Lyheng <lyhengtep@gmail.com>
tylerrosnett pushed a commit to StateFarmIns/argo-cd that referenced this pull request May 27, 2025
@dshmelev @rumstead @tylerrosnett
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
ab52fa8 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
Copy link
Member

/cherry-pick release-3.0

@rumstead
Copy link
Member

/cherry-pick release-2.14

chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
@dshmelev @rumstead @chansuke
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
dde6ae2 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
Copy link
Member

/cherry-pick release-3.0
/cherry-pick release-2.14

rumstead added a commit to rumstead/argo-cd that referenced this pull request Jun 10, 2025
@dshmelev @rumstead
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
c1875b3 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@dshmelev @rumstead @dsuhinin
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
68f8d07 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
@dshmelev @rumstead @dsuhinin
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
defa905 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
rumstead added a commit to rumstead/argo-cd that referenced this pull request Jun 16, 2025
@dshmelev @rumstead
fix(applicationset_controller): requeue by ApplicationStatus changes (a…
6498558 
…rgoproj#23043)

Signed-off-by: Dmitry Shmelev <Dmitry.Shmelev@jetbrains.com>
Signed-off-by: Dmitry Shmelev <avikez@gmail.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
This was referenced Jun 16, 2025
Merged
Merged
@vierhein
Copy link

vierhein commented Aug 7, 2025

Thank you @dshmelev

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

@rumstead rumstead rumstead approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dshmelev @rumstead @vierhein