fix(hooks): always remove finalizers #754
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #754 +/- ##
==========================================
- Coverage 54.26% 48.32% -5.95%
==========================================
Files 64 64
Lines 6164 6639 +475
==========================================
- Hits 3345 3208 -137
- Misses 2549 3170 +621
+ Partials 270 261 -9 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
agaudreault
commented
Aug 20, 2025
pkg/sync/helper_test.go
Outdated
There was a problem hiding this comment.
Move functions importing sync/common to a helper since they cannot be in utils/testing.
sync/common imports utils/kube for a type, utils/kube tests use utils/testing which would use sync/common creating a cycle.
agaudreault
commented
Aug 20, 2025
| @@ -439,7 +457,7 @@ func (sc *syncContext) Sync() { | |||
| // No need to perform a dry-run on the namespace creation, because if it fails we stop anyway | |||
| sc.log.WithValues("task", nsCreateTask).Info("Creating namespace") | |||
| if sc.runTasks(nsSyncTasks, false) == failed { | |||
| sc.setOperationFailed(syncTasks{}, nsSyncTasks, "the namespace failed to apply") | |||
| sc.executeSyncFailPhase(syncTasks{}, nsSyncTasks, "the namespace failed to apply") | |||
There was a problem hiding this comment.
setOperationFailed was renamed to executeSyncFailPhase
agaudreault
commented
Aug 20, 2025
| } else { | ||
| sc.setResourceResult(task, "", operationState, message) | ||
| sc.setResourceResult(task, task.syncStatus, operationState, message) |
There was a problem hiding this comment.
Always preserve the current syncStatus in resource results instead of deleting it.
agaudreault
commented
Aug 20, 2025
| // delete all completed hooks which have appropriate delete policy | ||
| sc.deleteHooks(hooksPendingDeletionSuccessful) | ||
| sc.setOperationPhase(common.OperationSucceeded, "successfully synced (all tasks run)") | ||
| } else { | ||
| sc.setRunningPhase(remainingTasks, false) | ||
| sc.setRunningPhase(tasks, false) |
There was a problem hiding this comment.
fixed the incorrect message. When we are running, we care about the current running task, not the remaining tasks that are still pending.
Signed-off-by: Alexandre Gaudreault <[email protected]>
agaudreault
commented
Aug 20, 2025
| } | ||
| } | ||
|
|
||
| func (sc *syncContext) GetState() (common.OperationPhase, string, []common.ResourceSyncResult) { |
There was a problem hiding this comment.
Moved GetState(), no changes
Signed-off-by: Alexandre Gaudreault <[email protected]>
agaudreault
commented
Aug 20, 2025
| terminateSuccessful := true | ||
| sc.log.V(1).Info("terminating") | ||
| tasks, _ := sc.getSyncTasks() | ||
| for _, task := range tasks { |
There was a problem hiding this comment.
Part of terminateHooksPreemptively now
agaudreault
commented
Aug 20, 2025
| @@ -687,40 +793,16 @@ func (sc *syncContext) removeHookFinalizer(task *syncTask) error { | |||
| }) | |||
| } | |||
|
|
|||
| func (sc *syncContext) updateResource(task *syncTask) error { | |||
Co-authored-by: Dan Garfield <[email protected]>
This was referenced Aug 22, 2025
Signed-off-by: Alexandre Gaudreault <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes argoproj/argo-cd#23226
Description
The new finalizer on hooks allow us to observe the hook state before Kubernetes tries to delete it. Multiple issue where found causing the finalizers not to be properly removed on hooks managed by the sync.
Changes
BeforeHookCreationhooks.Tests