Skip to content

[occm] restore nodes delete on the CCM ClusterRole - #3228

Merged
kubernetes-prow[bot] merged 1 commit into
kubernetes:masterfrom
locker95:fix/occm-restore-node-delete
Sep 22, 2026
Merged

[occm] restore nodes delete on the CCM ClusterRole#3228
kubernetes-prow[bot] merged 1 commit into
kubernetes:masterfrom
locker95:fix/occm-restore-node-delete

Conversation

@locker95

@locker95 locker95 commented Sep 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

#3165 dropped create/delete on nodes because OCCM supposedly didn't need them. the node lifecycle controller still does — without delete, occm can't remove nodes whose openstack VMs are already gone, and they sit NotReady with DeletingNodeFailed.

put delete back on the chart ClusterRole and the raw manifest. create stays gone.

Fixes #3225

Restore nodes delete on the OCCM ClusterRole so gone OpenStack VMs can be removed from the cluster.

@locker95
[occm] restore nodes delete on the CCM ClusterRole
35ba700 
kubernetes#3165 dropped create/delete on nodes. the node lifecycle controller
still needs delete so OCCM can remove nodes whose OpenStack VMs are
already gone. without it, those nodes stay NotReady forever.

create stays omitted.

Signed-off-by: Dean Chen <862469039@qq.com>
@kubernetes-prow kubernetes-prow Bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Sep 15, 2026
@kubernetes-prow
kubernetes-prow Bot requested review from mandre and zetaab September 15, 2026 14:32
@kubernetes-prow kubernetes-prow Bot added 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. labels Sep 15, 2026
@kubernetes-prow

kubernetes-prow Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Hi @locker95. Thanks for your PR.

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

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

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.

@kubernetes-prow kubernetes-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 15, 2026
winiciusallan
winiciusallan approved these changes Sep 21, 2026
View reviewed changes

@winiciusallan winiciusallan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

good catch! also bringing your attention @stephenfin, considering your recent changes.

@cwrau cwrau mentioned this pull request Sep 22, 2026
Merged
1 task done
cwrau added a commit to teutonet/teutonet-helm-charts that referenced this pull request Sep 22, 2026
@cwrau
fix(t8s-cluster): re-add nodes delete RBAC to ccm ClusterRole via pos…
a6bc1f1 
…tRenderer

Upstream dropped delete on nodes in cloud-provider-openstack#PR3165, breaking
node cleanup when the openstack VM is already gone. Patched back in until
kubernetes/cloud-provider-openstack#3228 lands.
@kubernetes-prow kubernetes-prow Bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 22, 2026
@stephenfin

stephenfin commented Sep 22, 2026

Copy link
Copy Markdown
Member

/ok-to-test
/approve
/lgtm
/cherry-pick release-1.36

@kubernetes-prow kubernetes-prow Bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Sep 22, 2026
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Sep 22, 2026

Copy link
Copy Markdown

@stephenfin: once the present PR merges, I will cherry-pick it on top of release-1.36 in a new PR and assign it to you.

Details

In response to this:

/ok-to-test
/approve
/lgtm
/cherry-pick release-1.36

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.

@kubernetes-prow kubernetes-prow Bot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 22, 2026
@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 22, 2026
@kubernetes-prow

kubernetes-prow Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stephenfin

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

The pull request process is described 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

@kubernetes-prow kubernetes-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2026
@kubernetes-prow
kubernetes-prow Bot merged commit eaca9fb into kubernetes:master Sep 22, 2026
6 checks passed
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Sep 22, 2026

Copy link
Copy Markdown

@stephenfin: new pull request created: #3236

Details

In response to this:

/ok-to-test
/approve
/lgtm
/cherry-pick release-1.36

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-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Sep 22, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mandre mandre Awaiting requested review from mandre
@zetaab zetaab Awaiting requested review from zetaab
1 more reviewer
@winiciusallan winiciusallan winiciusallan approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@stephenfin stephenfin

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[occm] Change to clusterrole introduced in v2.36.2 prevents deletion of non-existing nodes

4 participants

@locker95 @stephenfin @k8s-infra-cherrypick-robot @winiciusallan