Skip to content

[release-2.5] Cherry-pick a5f61ce71d1e38708c2f7bd3fc034fb5a72fd6a5 from upstream - #1938

Merged
openshift-merge-bot[bot] merged 1 commit into
rh-ecosystem-edge:release-2.5from
openshift-cherrypick-robot:cherry-pick-1935-to-release-2.5
Sep 24, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
rh-ecosystem-edge:release-2.5from
openshift-cherrypick-robot:cherry-pick-1935-to-release-2.5

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #1935

/assign TomerNewman

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
@TomerNewman

Copy link
Copy Markdown
Member

/ok-to-test
/approve

@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: openshift-cherrypick-robot, 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

@coderabbitai

coderabbitai Bot commented Sep 23, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 7500ee6f-0967-488e-a4df-892295e33dbe

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.

@TomerNewman

Copy link
Copy Markdown
Member

/override ci/prow/security

@openshift-ci

openshift-ci Bot commented Sep 23, 2026

Copy link
Copy Markdown

@TomerNewman: Overrode contexts on behalf of TomerNewman: ci/prow/security

Details

In response to this:

/override ci/prow/security

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

/retest

1 similar comment
@TomerNewman

Copy link
Copy Markdown
Member

/retest

@TomerNewman

Copy link
Copy Markdown
Member

/hold
/lgtm

@TomerNewman

Copy link
Copy Markdown
Member

/unhold

@TomerNewman

Copy link
Copy Markdown
Member

/override ci/prow/security

@openshift-ci

openshift-ci Bot commented Sep 24, 2026

Copy link
Copy Markdown

@TomerNewman: Overrode contexts on behalf of TomerNewman: ci/prow/security

Details

In response to this:

/override ci/prow/security

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.

@openshift-merge-bot
openshift-merge-bot Bot merged commit a7132a6 into rh-ecosystem-edge:release-2.5 Sep 24, 2026
15 checks passed
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