ROX-31829: Implement aggressive conflict resolution#64

Merged

mclasmeier merged 25 commits into

mainfrom

Nov 25, 2025

Commits on Nov 19, 2025

updater: Include logger.
Moritz Clasmeier
committed
updater: Include new option: EnableAggressiveConflictResolution.
Moritz Clasmeier
committed
updater: Implement aggressive conflict resolution.
Moritz Clasmeier
committed
reconciler: Prepare for aggressive conflict resolution
Moritz Clasmeier
committed
reconciler: use client.Patch() for setting uninstall finalizer
Moritz Clasmeier
committed
reconciler: configure new updater
Moritz Clasmeier
committed
New function (for tests): conditions.go: FromUnstructured
Moritz Clasmeier
committed
Updater tests
Moritz Clasmeier
committed
transient
Moritz Clasmeier
committed
updater.go: Move backoff definition for smaller diff.
Moritz Clasmeier
committed
Renamings of function names and log messages related to refreshing of the object
Moritz Clasmeier
committed
updater: Refactor attempt counting during retries
Moritz Clasmeier
committed
updater tests: seperate Expect() clause after calling retryOnTransientError
Moritz Clasmeier
committed
New reconciler method: newUpdater
Moritz Clasmeier
committed
updater tests: factor our coming init code into a shared JustBeforeEach.
Moritz Clasmeier
committed
Moved the code for extracting conditions from unstructured the
Moritz Clasmeier
committed
Clean up named imports
Moritz Clasmeier
committed

Commits on Nov 21, 2025

err scope
Moritz Clasmeier
committed
refactor tryRefresh* (#66)
porridge
authored
Merge remote-tracking branch 'refs/remotes/origin/mc/no-ssa-4' into mc/no-ssa-4
Moritz Clasmeier
committed
Update comment about conflict retries
Moritz Clasmeier
committed
Add tests for preserving finalizers
Moritz Clasmeier
committed
Rename function to retryOnceOnTransientError
Moritz Clasmeier
committed
reconciler tests: Added tests for WithAggressiveConflictResolution()
Moritz Clasmeier
committed
Revert change to uninstall finalizer adding
Moritz Clasmeier
committed