Force apply changes on patches for unresolvable conflicts #141
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
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.
Feature or Problem
When, for instance, updating the replica count of the downstream deployment of a
WasmCloudHostConfigto not match thehost_replicas, the operator will fail to reconcile the deployment back to the desired replicas due to a field manager conflict. As the controller owns the resource, it should be able to always apply patches to it and recover ownership of the fields that were modified.Related Issues
See #140
Release Information
Next.
Consumer Impact
Should result in less inconsistencies when people accidentally modify resources that are technically managed by the operator.
Testing
Unit Test(s)
None.
Acceptance or Integration
None.
Manual Verification
Deployed a new version and performed various manual changes to the setup to see if the operator would reconcile them.