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

🐛 Align "random" deletion policy behavior regarding deletion annotations #11431

Conversation

elizabeth-dev
Copy link
Contributor

@elizabeth-dev elizabeth-dev commented Nov 17, 2024

What this PR does / why we need it:
Right now, the oldest and newest deletion policies prioritize machines that have the cluster.x-k8s.io/delete-machine annotation over unhealthy machines when deciding which machines need to be deleted. This wasn't the case with the random deletion policy. This change aligns the latter to the rest, making it honor the deletion annotation.

The unit tests for that part of the code have also been modified to be more strict when comparing machines with this annotation, always comparing them with unhealthy machines.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #11387

/area machineset

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. area/machineset Issues or PRs related to machinesets cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 17, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @elizabeth-dev!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 17, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @elizabeth-dev. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 17, 2024
…ion annotations

Right now, the `oldest` and `newest` deletion policies prioritize machines that have the `cluster.x-k8s.io/delete-machine` annotation over unhealthy machines when deciding which machines need to be deleted. This wasn't the case with the `random` deletion policy. This change aligns the latter to the rest, making it honor the deletion annotation.
@elizabeth-dev elizabeth-dev force-pushed the make-random-deletion-policy-prioritize-annotated-machines branch from 3a7b4ac to 0eab29e Compare November 17, 2024 12:41
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Nov 17, 2024
@elizabeth-dev
Copy link
Contributor Author

Not sure if this could technically qualify as a breaking change. I've inquired the Slack channel to know other people's opinions, will update the PR if deemed necessary.

@enxebre
Copy link
Member

enxebre commented Nov 18, 2024

/ok-to-test
/lgtm

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 18, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 18, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d649f193592ce017d6501950665b018bfe656a71

@elizabeth-dev elizabeth-dev changed the title 🐛 Align random deletion policy behavior regarding deletion annotations 🐛 Align "random" deletion policy behavior regarding deletion annotations Nov 19, 2024
@sbueringer
Copy link
Member

Not sure if this could technically qualify as a breaking change. I've inquired the Slack channel to know other people's opinions, will update the PR if deemed necessary.

I think we're good. It's fine to flag it as bugfix. It seems a comparatively minor change so I wouldn't mark it as breaking change. I just wouldn't backport it, so that this change will only be picked up by a minor release and not via a patch release.

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2024
@k8s-ci-robot k8s-ci-robot merged commit bf63a73 into kubernetes-sigs:main Nov 19, 2024
29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Nov 19, 2024
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. area/machineset Issues or PRs related to machinesets cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", 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. 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.

Unexpected Delete Annotation / Deletion Policy Behavior
4 participants