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.

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

fix(appset): preserve post-delete finalizers (#17181) #18003

Merged
merged 1 commit into from
Apr 26, 2024
Merged

fix(appset): preserve post-delete finalizers (#17181) #18003

merged 1 commit into from
Apr 26, 2024

Conversation

joebowbeer
Copy link
Contributor

@joebowbeer joebowbeer commented Apr 26, 2024 •
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).
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • 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 #17181

Fix suggested by @alexmt:

Application update replaces finalizers with the list of finalizers generated by the template. However post-delete-finalizer.argocd.argoproj.io and post-delete-finalizer.argocd.argoproj.io/cleanup are added dynamically and should not be touched. So the fix is to add special handling in the update method to preserve the post delete finalizers.

@joebowbeer
Fix post-delete finalizer in appset
d731152 
Signed-off-by: Joe Bowbeer <joe.bowbeer@gmail.com>
@joebowbeer joebowbeer requested a review from a team as a code owner April 26, 2024 21:52
alexmt
alexmt approved these changes Apr 26, 2024
View reviewed changes
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.

Awesome. Thank you for implementing test as well. LGTM

@alexmt alexmt merged commit 575575a into argoproj:master Apr 26, 2024
27 checks passed
@alexmt
Copy link
Collaborator

alexmt commented Apr 26, 2024

/cherry-pick release-2.11

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Apr 26, 2024
@joebowbeer
Fix post-delete finalizer in appset (#18003)
24f6911 
Signed-off-by: Joe Bowbeer <joe.bowbeer@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Apr 26, 2024
Merged
@alexmt
Copy link
Collaborator

alexmt commented Apr 26, 2024

/cherry-pick release-2.10

@gcp-cherry-pick-bot GCP Cherry-Pick Bot
Copy link

Cherry-pick failed with Merge error 575575a78a87c7fc97ce540124509f90c5733e05 into temp-cherry-pick-dc66be-release-2.10

alexmt pushed a commit that referenced this pull request Apr 26, 2024
@gcp-cherry-pick-bot @joebowbeer
Fix post-delete finalizer in appset (#18003) (#18005)
602f544 
Signed-off-by: Joe Bowbeer <joe.bowbeer@gmail.com>
Co-authored-by: Joe Bowbeer <joe.bowbeer@gmail.com>
@joebowbeer joebowbeer deleted the appset-post-delete-fix branch April 27, 2024 00:09
@joebowbeer joebowbeer mentioned this pull request May 7, 2024
Open
3 tasks
mkieweg pushed a commit to mkieweg/argo-cd that referenced this pull request Jun 11, 2024
@joebowbeer @mkieweg
Fix post-delete finalizer in appset (argoproj#18003)
1f62f46 
Signed-off-by: Joe Bowbeer <joe.bowbeer@gmail.com>
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
@joebowbeer @Hariharasuthan99
Fix post-delete finalizer in appset (argoproj#18003)
af3cacb 
Signed-off-by: Joe Bowbeer <joe.bowbeer@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexmt alexmt alexmt 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.

PostDelete Hook not work with Application generated from ApplicationSet
2 participants
@joebowbeer @alexmt