Fix merge annotations #794
Closed
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
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
karmada-bot
added
the
size/S
pigletfly
force-pushed
the
fix-annotation
branch
from
4b6df88 to
4afcc61
Compare
Signed-off-by: pigletfly <wangbing.adam@gmail.com>
pigletfly
force-pushed
the
fix-annotation
branch
from
4afcc61 to
f05d2c5
Compare
karmada-bot
added
size/XS
| @@ -34,7 +34,7 @@ func RetainClusterFields(desiredObj, clusterObj *unstructured.Unstructured) erro | |||
| desiredObj.SetFinalizers(clusterObj.GetFinalizers()) | |||
| // Merge annotations since they will typically be set by controllers in a member cluster | |||
| // and be set by user in karmada-controller-plane. | |||
| util.MergeAnnotations(desiredObj, clusterObj) | |||
| util.MergeAnnotations(clusterObj, desiredObj) | |||
There was a problem hiding this comment.
This does not work as expected, because the last update is desireObj.
Need to be modified in the MergeAnnotation method.
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes ##650
Special notes for your reviewer:
Does this PR introduce a user-facing change?: