Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix wrong annotation marks on resource #4751

Merged

Conversation

XiShanYongYe-Chang
Copy link
Member

@XiShanYongYe-Chang XiShanYongYe-Chang commented Mar 26, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Using the MergeAnnotation function will filter out existing keys. When the key value that needs to be marked changes, such as policy preemption, resource recovery, we need to use the ReplaceAnnotation function to replace the value of the key in the annotation.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

`karmada-controller-manager`: Fixed incorrect annotation markup when policy preemption occurs.

Signed-off-by: changzhen <changzhen5@huawei.com>
@karmada-bot karmada-bot added the kind/bug Categorizes issue or PR as related to a bug. label Mar 26, 2024
@karmada-bot karmada-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 26, 2024
@XiShanYongYe-Chang
Copy link
Member Author

Copy link
Member

@whitewindmills whitewindmills left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good finding!
/lgtm

@karmada-bot karmada-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2024
Copy link
Member

@RainbowMango RainbowMango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@karmada-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RainbowMango

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@karmada-bot karmada-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 27, 2024
@karmada-bot karmada-bot merged commit b0889c5 into karmada-io:master Mar 27, 2024
12 checks passed
karmada-bot added a commit that referenced this pull request Mar 28, 2024
…k-of-#4751-upstream-release-1.7

Automated cherry pick of #4751: fix wrong annotation marks on resource
karmada-bot added a commit that referenced this pull request Mar 28, 2024
…k-of-#4751-upstream-release-1.8

Automated cherry pick of #4751: fix wrong annotation marks on resource
karmada-bot added a commit that referenced this pull request Mar 28, 2024
…k-of-#4751-upstream-release-1.9

Automated cherry pick of #4751: fix wrong annotation marks on resource
@XiShanYongYe-Chang XiShanYongYe-Chang deleted the fix-worng-annotation-marks branch June 7, 2024 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants