Skip to content

fix: remove bootstrap annotations from nodes when a bootstrap-only rule is deleted#248

Open
Karman580 wants to merge 1 commit into
kubernetes-sigs:mainfrom
Karman580:fix/cleanup-bootstrap-annotations-on-rule-deletion
Open

fix: remove bootstrap annotations from nodes when a bootstrap-only rule is deleted#248
Karman580 wants to merge 1 commit into
kubernetes-sigs:mainfrom
Karman580:fix/cleanup-bootstrap-annotations-on-rule-deletion

Conversation

@Karman580
Copy link
Copy Markdown

Description

reconcileDelete cleaned up managed taints but left bootstrap-completion
annotations (readiness.k8s.io/bootstrap-completed-<rule-name>) on node
objects indefinitely. Because the annotation key encodes only the rule
name, recreating a rule with the same name caused previously-bootstrapped
nodes to be skipped by isBootstrapCompleted, potentially leaving them
without the taint the new rule requires and allowing workloads to schedule
on nodes that should be gated.

This PR adds cleanupBootstrapAnnotationsForRule, called from
reconcileDelete after cleanupTaintsForRule for bootstrap-only rules.
It iterates all nodes matching the rule's selector and removes the
annotation via a RetryOnConflict MergeFrom patch, consistent with the
existing taint cleanup approach. The finalizer is not removed if any
annotation patch fails, so deletion is safely retried on the next cycle.

Related Issue

Fixes #247

Type of Change

/kind bug

Testing

  • Added integration test should remove bootstrap annotations from nodes when a bootstrap-only rule is deleted in nodereadinessrule_controller_test.go
  • Test verifies: annotation is removed after rule deletion, unrelated annotations are preserved
  • make test passes — all existing tests continue to pass

Checklist

  • make test passes
  • make lint passes

Does this PR introduce a user-facing change?

Fix: bootstrap-only rule deletion now removes completion annotations from
nodes so that recreating a rule with the same name evaluates all nodes
from scratch rather than skipping previously-bootstrapped nodes.

@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. kind/bug Categorizes issue or PR as related to a bug. labels May 13, 2026
@k8s-ci-robot k8s-ci-robot requested a review from dchen1107 May 13, 2026 19:28
@netlify
Copy link
Copy Markdown

netlify Bot commented May 13, 2026

Deploy Preview for node-readiness-controller canceled.

Name Link
🔨 Latest commit ea74209
🔍 Latest deploy log https://app.netlify.com/projects/node-readiness-controller/deploys/6a04d19de732b1000897fb96

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Karman580
Once this PR has been reviewed and has the lgtm label, please assign sergeykanzhelev 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

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla Bot commented May 13, 2026

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: Karman580 / name: KARMAN SINGH TALWAR (ea74209)

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Welcome @Karman580!

It looks like this is your first PR to kubernetes-sigs/node-readiness-controller 🎉. 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/node-readiness-controller 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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 13, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Hi @Karman580. 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 the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 13, 2026
@Karman580 Karman580 force-pushed the fix/cleanup-bootstrap-annotations-on-rule-deletion branch from f9429f3 to ea74209 Compare May 13, 2026 19:31
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 13, 2026
@ajaysundark
Copy link
Copy Markdown
Contributor

I added a comment here #247 (comment) - annotations are controller's metadata on the node, instead of cleaning up across the fleet for rule update, we could make the annotation reflect right state of the rule to decide whether this need another reconciliation.

@ajaysundark ajaysundark reopened this May 15, 2026
@ajaysundark
Copy link
Copy Markdown
Contributor

Instead of solving piecewise, we could plan for a better design for the annotation to address this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. 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.

Bootstrap-only rule deletion leaves stale completion annotations, causing evaluation bypass on rule recreation

3 participants