Skip to content

🐛 Bypass PDBs during drain when node is unreachable#13509

Open
rafael-azevedo wants to merge 1 commit intokubernetes-sigs:mainfrom
rafael-azevedo:fix/drain-bypass-pdb-unreachable-node
Open

🐛 Bypass PDBs during drain when node is unreachable#13509
rafael-azevedo wants to merge 1 commit intokubernetes-sigs:mainfrom
rafael-azevedo:fix/drain-bypass-pdb-unreachable-node

Conversation

@rafael-azevedo
Copy link

@rafael-azevedo rafael-azevedo commented Mar 26, 2026

Fixes #13508

What this PR does / why we need it:

When a node becomes unreachable (e.g. the underlying instance is stopped), CAPI's machine drain gets stuck indefinitely. The drain uses the Kubernetes Eviction API which respects PDBs. When pods on the unreachable node have PDBs with minAvailable: 1 and currentHealthy: 0, the Eviction API returns 429 TooManyRequests and drain retries forever.

The existing code correctly detects unreachable nodes but relies on the taint manager to bypass PDBs. When the instance is stopped/terminated, kubelet is not running and cannot execute the taint manager's deletions and pods linger indefinitely.

This adds a DisableEviction option to the drain helper that uses direct pod deletion instead of the Eviction API. This is set when the node is unreachable, since pods are not actually running and PDB protection is not meaningful.

/area machine

@k8s-ci-robot k8s-ci-robot added the area/machine Issues or PRs related to machine lifecycle management label Mar 26, 2026
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Mar 26, 2026

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: rafael-azevedo / name: Rafael Azevedo (23ccb46)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign joelspeed for approval. For more information see the Code Review Process.

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

Details 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
Copy link
Contributor

Welcome @rafael-azevedo!

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 26, 2026
@k8s-ci-robot
Copy link
Contributor

Hi @rafael-azevedo. 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.

Details

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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/machine Issues or PRs related to machine lifecycle management cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Machine drain stuck indefinitely when node is unreachable and PDBs block eviction

2 participants