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 undo function of cluster annotation setter wiping annotations #3229

Merged
merged 1 commit into from
Dec 21, 2024

Conversation

ntnn
Copy link
Contributor

@ntnn ntnn commented Dec 20, 2024

Summary

The undo function of the admission webhook wiped annotations if the cluster annotation was not present.

Related issue(s)

Fixes #3182 introduced in #3124

Release Notes

Fix external modifications to annotations being reverted by admission webhook

@kcp-ci-bot kcp-ci-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API dco-signoff: no Indicates the PR's author has not signed the DCO. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 20, 2024
@kcp-ci-bot
Copy link
Contributor

Hi @ntnn. Thanks for your PR.

I'm waiting for a kcp-dev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kcp-ci-bot kcp-ci-bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 20, 2024
@kcp-ci-bot kcp-ci-bot added dco-signoff: yes Indicates the PR's author has signed the DCO. and removed dco-signoff: no Indicates the PR's author has not signed the DCO. labels Dec 20, 2024
@kcp-ci-bot kcp-ci-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 20, 2024
@kcp-ci-bot kcp-ci-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 20, 2024
@ntnn ntnn marked this pull request as ready for review December 20, 2024 14:01
@kcp-ci-bot kcp-ci-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2024
@embik
Copy link
Member

embik commented Dec 20, 2024

/ok-to-test

Thank you for the contribution @ntnn! Can you please also add a release note to the PR description (something like "Stop removing annotations added by mutating webhooks" that describes what is fixed here)?

@kcp-ci-bot kcp-ci-bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: no Indicates the PR's author has not signed the DCO. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the DCO. labels Dec 20, 2024
Signed-off-by: Nelo-T. Wallus <ntnn@ntnn.de>
@kcp-ci-bot kcp-ci-bot removed the dco-signoff: no Indicates the PR's author has not signed the DCO. label Dec 20, 2024
@kcp-ci-bot kcp-ci-bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Dec 20, 2024
@ntnn
Copy link
Contributor Author

ntnn commented Dec 20, 2024

/retest

@mjudeikis
Copy link
Contributor

/lgtm
/approve

thanks for this!

@kcp-ci-bot kcp-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2024
@kcp-ci-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 20f7a5ad321b50c0f98989b8049fce57a4545174

@kcp-ci-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mjudeikis

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

@kcp-ci-bot kcp-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 21, 2024
@kcp-ci-bot kcp-ci-bot merged commit 2f70c89 into kcp-dev:main Dec 21, 2024
16 checks passed
@ntnn ntnn deleted the kcp3182 branch December 21, 2024 12:43
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. dco-signoff: yes Indicates the PR's author has signed the DCO. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: Patched annotations by admission controller get removed by KCP
5 participants