Skip to content
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.

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

fix(appset): add ApplicationSet ProgressiveSync handling to clean up old appStatus entries when Applications are removed or RollingSync is disabled #13419

Conversation

wmgroot
Copy link
Contributor

@wmgroot wmgroot commented May 2, 2023

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

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.
  • Optional. My organization is added to USERS.md.
  • 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.

Please see Contribution FAQs if you have questions about your pull-request.

Closes #13331

@codecov
Copy link

codecov bot commented May 3, 2023

Codecov Report

Patch coverage: 51.47% and project coverage change: +0.01 🎉

Comparison is base (d4714f3) 49.20% compared to head (5a167d1) 49.21%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13419      +/-   ##
==========================================
+ Coverage   49.20%   49.21%   +0.01%     
==========================================
  Files         248      248              
  Lines       42909    42839      -70     
==========================================
- Hits        21113    21084      -29     
+ Misses      19682    19656      -26     
+ Partials     2114     2099      -15     
Impacted Files Coverage Δ
...cationset/controllers/applicationset_controller.go 63.11% <37.14%> (-0.27%) ⬇️
util/helm/client.go 50.32% <66.66%> (+2.80%) ⬆️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@crenshaw-dev
Copy link
Collaborator

@wmgroot how far back should we cherry-pick this?

@wmgroot
Copy link
Contributor Author

wmgroot commented May 4, 2023

This bug is present in the initial release of Progressive Syncs, so it could be cherrypicked to the next patch release of 2.6. Do you think that's necessary for an alpha feature though?

@crenshaw-dev
Copy link
Collaborator

As long as it's safe, and the cherry pick isn't gnarly, I'm in favor of cherry-picking.

@wmgroot
Copy link
Contributor Author

wmgroot commented May 4, 2023

That sounds fine to me, I think the change should be clean. What's the process for a cherry-pick? Should I open a second PR against the release-2.6 branch?

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.6

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.7

@crenshaw-dev
Copy link
Collaborator

We'll see how the bot copes 😄

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.

I was able to test the PR with ProgressiveSyncs and was able to see the application statuses getting cleaned up.

I also went through the code and didn't spot anything weird. Just a minor nit.

applicationset/controllers/applicationset_controller.go Outdated Show resolved Hide resolved
…ntries when Applications are removed or RollingSync is disabled

Signed-off-by: wmgroot <wmgroot@gmail.com>
@wmgroot wmgroot force-pushed the wmgroot/fix-appset-progressive-sync-old-appstatus branch from 3efed78 to 5a167d1 Compare May 11, 2023 15:55
@wmgroot
Copy link
Contributor Author

wmgroot commented May 11, 2023

Updated and rebased.

@crenshaw-dev crenshaw-dev merged commit 8260465 into argoproj:master May 27, 2023
24 checks passed
@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 82604652ee08d1357cc86323d8cb0705d0c6f508 into temp-cherry-pick-48adc3-release-2.6

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 27, 2023
… old appStatus entries when Applications are removed or RollingSync is disabled (#13419)

Signed-off-by: wmgroot <wmgroot@gmail.com>
crenshaw-dev pushed a commit that referenced this pull request May 27, 2023
… old appStatus entries when Applications are removed or RollingSync is disabled (#13419) (#13759)

Signed-off-by: wmgroot <wmgroot@gmail.com>
Co-authored-by: wmgroot <wmgroot@gmail.com>
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Jul 24, 2023
… old appStatus entries when Applications are removed or RollingSync is disabled (argoproj#13419) (argoproj#13759)

Signed-off-by: wmgroot <wmgroot@gmail.com>
Co-authored-by: wmgroot <wmgroot@gmail.com>
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
… old appStatus entries when Applications are removed or RollingSync is disabled (argoproj#13419)

Signed-off-by: wmgroot <wmgroot@gmail.com>
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
… old appStatus entries when Applications are removed or RollingSync is disabled (argoproj#13419)

Signed-off-by: wmgroot <wmgroot@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.

RollingSync in AppSets not removing deleted apps from status.applicationStatus
3 participants