Merge Annotations and Labels in CreateOrPatch #343
Merged
Conversation
This file contains 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
Identified in OCP4.13 where metallb adds an annotation to the service when handling it, it resulted in reconcile loop since the current service CreateOrPatch did not expect that annotations will be altered outside the owner. This changes the different functions to merge Labels and Annotations in CreateOr Patch instead of assigning.
gibizer
reviewed
Sep 27, 2023
There was a problem hiding this comment.
I agree that we needed to do this but I wan't to note that we lost one use case by this change. Before this change we could remove a label or annotation from our CR and then it was removed from the underlying secret/cm/service resource. Now it is not possible to remove labels or annotations as Merge can always add but never remove entity.
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.
Identified in OCP4.13 where metallb adds an annotation to the service when handling it, it resulted in reconcile loop since the current service CreateOrPatch did not expect that annotations will be altered outside the owner.
This changes the different functions to merge Labels and Annotations in CreateOr Patch instead of assigning.