Skip to content

fix(hooks): always remove finalizers (#23226) #25916

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
Open
agaudreault wants to merge 22 commits into
base: master
Choose a base branch
from
Open

fix(hooks): always remove finalizers (#23226) #25916

agaudreault wants to merge 22 commits into from
+1,099 −332

Conversation

@agaudreault
Copy link
Member

@agaudreault agaudreault commented Jan 9, 2026 •
edited
Loading

  • Always terminate running hooks (remove the finalizer) when a sync fails, errors or succeeds.
  • Always terminate running hooks when a sync is explicitly terminated.
  • Wait for the completion of SyncFail hooks before completing the sync.
  • Add e2e and unit tests
    Closes ArgoCD fails on hook-finalizer (after upgrade to 3.x) #23226

@agaudreault
test(e2e): add assertions for hook finalizer removal after completion
1ef6bb2 
Add e2e test assertions to verify that hooks have their finalizers
removed after completion, both for successful and failed syncs.

This ensures:
- Hooks do not retain finalizers after sync operations complete
- Failed hooks also have finalizers properly removed
- The hook finalizer lifecycle is correctly managed

Also fixes comment typo: 'did not create' -> 'did create' in PostSyncHookFailure

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
Merge remote-tracking branch 'upstream/master' into fix/hook-finalize…
e4fb6e9 
…r-termination
@agaudreault
Merge branch 'master' of github.com:argoproj/argo-cd into fix/hook-fi…
464c1d0 
…nalizer-termination

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix merge
961dc17 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
invalid message for multi step sync
aa6101b 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
pod hook by name
36c53e1 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix invalid message after failed sync hook are ran
8ea4e3b 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
rewrite test
a9ef844 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
invalid message when sync has initial delete/prune task
782956e 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
update test
5a23dfb 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
update tests
1d77f42 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
delete hooks after syncWaveHook failed
52fe1eb 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
more executeSyncFailPhase tests
73da273 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
cleanup hook on Terminate()
c122e47 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@bunnyshell
Copy link

bunnyshell bot commented Jan 9, 2026 •
edited
Loading

🔴 Preview Environment stopped on Bunnyshell

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔵 /bns:start to start the environment
  • 🚀 /bns:deploy to redeploy the environment
  • ❌ /bns:delete to remove the environment

@agaudreault
cleanup
a889c27 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault changed the title Fix/hook finalizer termination fix(hooks): always remove finalizers Jan 9, 2026
@agaudreault agaudreault marked this pull request as ready for review January 12, 2026 18:08
@agaudreault agaudreault requested a review from a team as a code owner January 12, 2026 18:08
@agaudreault agaudreault changed the title fix(hooks): always remove finalizers fix(hooks): always remove finalizers (#23226) Jan 12, 2026
This was referenced Jan 12, 2026
Closed
Closed
@agaudreault agaudreault mentioned this pull request Jan 12, 2026
Open
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ArgoCD fails on hook-finalizer (after upgrade to 3.x)

1 participant

@agaudreault