Skip to content

Cherry-pick a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5 from upstream - #1935

Merged
openshift-merge-bot[bot] merged 1 commit into
mainfrom
gs-a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5
Sep 23, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
mainfrom
gs-a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This is an automated cherry-pick by gitstream of a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5 from https://github.com/kubernetes-sigs/kernel-module-management.

Commit message:

Fix race leaving contains-modules namespace label stuck

tryRemovingLabel() decided whether to strip the
kmm.node.k8s.io/contains-modules namespace label by counting *all*
Modules still present in the namespace, including sibling Modules
that were themselves mid-deletion (DeletionTimestamp set, finalizer
not yet removed).

When several Modules in the same namespace were deleted around the
same time, each one's reconcile could see its still-terminating
siblings in that count and skip removing the label - while still
unconditionally finalizing itself right after. Once all Modules
finished terminating this way, nothing was left to ever retrigger
the cleanup, leaving the label - and the namespace-deletion webhook
denial - stuck permanently even though no Modules remained.

Only count Modules without a DeletionTimestamp (i.e. not themselves
being deleted) when deciding whether to keep the label, since a
terminating sibling can't be relied on to perform the cleanup later.


Upstream-Commit: a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5

tryRemovingLabel() decided whether to strip the
kmm.node.k8s.io/contains-modules namespace label by counting *all*
Modules still present in the namespace, including sibling Modules
that were themselves mid-deletion (DeletionTimestamp set, finalizer
not yet removed).

When several Modules in the same namespace were deleted around the
same time, each one's reconcile could see its still-terminating
siblings in that count and skip removing the label - while still
unconditionally finalizing itself right after. Once all Modules
finished terminating this way, nothing was left to ever retrigger
the cleanup, leaving the label - and the namespace-deletion webhook
denial - stuck permanently even though no Modules remained.

Only count Modules without a DeletionTimestamp (i.e. not themselves
being deleted) when deciding whether to keep the label, since a
terminating sibling can't be relied on to perform the cleanup later.


Upstream-Commit: a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5
@coderabbitai

coderabbitai Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: b27a9dab-4e71-4650-b1c2-f9a558613094

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@netlify

netlify Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for openshift-kmm ready!

Name Link
🔨 Latest commit b50fbc4
🔍 Latest deploy log https://app.netlify.com/projects/openshift-kmm/deploys/6ab37b4fc15bbf000880ada7
😎 Deploy Preview https://deploy-preview-1935--openshift-kmm.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@openshift-ci

openshift-ci Bot commented Sep 23, 2026

Copy link
Copy Markdown

Hi @github-actions[bot]. Thanks for your PR.

I'm waiting for a rh-ecosystem-edge 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.

@TomerNewman

Copy link
Copy Markdown
Member

/approve
/ok-to-test

@TomerNewman
TomerNewman marked this pull request as ready for review September 23, 2026 07:32
@openshift-ci

openshift-ci Bot commented Sep 23, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: github-actions[bot], TomerNewman

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

@TomerNewman

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Sep 23, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit d1e9947 into main Sep 23, 2026
22 checks passed
@TomerNewman
TomerNewman deleted the gs-a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5 branch September 23, 2026 13:16
@TomerNewman

Copy link
Copy Markdown
Member

/cherry-pick release-2.7

@openshift-cherrypick-robot

Copy link
Copy Markdown

@TomerNewman: new pull request created: #1936

Details

In response to this:

/cherry-pick release-2.7

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.

@TomerNewman

Copy link
Copy Markdown
Member

/cherry-pick release-2.6

@openshift-cherrypick-robot

Copy link
Copy Markdown

@TomerNewman: new pull request created: #1937

Details

In response to this:

/cherry-pick release-2.6

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.

@TomerNewman

Copy link
Copy Markdown
Member

/cherry-pick release-2.5

@openshift-cherrypick-robot

Copy link
Copy Markdown

@TomerNewman: new pull request created: #1938

Details

In response to this:

/cherry-pick release-2.5

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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants