[release-5.0] OCPBUGS-112659: Remove the CRB for the default openshift-cluster-version SA by openshift-cherrypick-robot · Pull Request #1454 · openshift/cluster-version-operator

openshift-cherrypick-robot · 2026-08-21T17:53:19Z

This is an automated cherry-pick of #1366

/assign wking

To ensure the default SA does not have cluster admin permissions. To achieve this, rendering logic needs to be updated as well. During cluster bootstrap, the installer calls rendering commands of specific components required for the bootstrap [1]. These rendered manifests are then applied by the cluster-bootstrap component [2]. The cluster-bootstrap component applies all the non-bootstrap manifests as they are [3]. At no stage is the delete annotation [4] taken into account, and thus the CRB would keep getting applied during installations and getting removed only during cluster upgrades due to the annotation. This would prohibit us from ever removing the manifest file from the repository, as a freshly installed cluster upgrading to a version where manifest does not exist would result in the CRB being applied till manually removed, causing a security concern. Teach the rendering command to respect the delete annotation to allow us to remove such manifests. Add the delete annotation and move the CRB into a lower run-level where we can safely remove manifests and not take up space in the used levels. [1]: https://github.com/openshift/installer/blob/c93ae9fc74d7fa0f478fa250de2ba702f84a0a21/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template [2]: https://github.com/openshift/installer/blob/c93ae9fc74d7fa0f478fa250de2ba702f84a0a21/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template#L576 [3]: https://github.com/openshift/cluster-bootstrap/blob/b23c6ce3df43aed15158e999239694ec75371f18/pkg/start/start.go#L142 [4]: https://github.com/openshift/enhancements/blob/master/enhancements/update/object-removal-manifest-annotation.md

The installer renders the CVO bootstrap manifests into its bootstrap-manifests directory [1], where bootstrap manifests of other related componenets are rendered as well by their respective bootstrap commands. The directory is then consumed by the cluster-bootstrap component [2]. The cluster-bootstrap component copies these manifests to the static Pod path of the node's kubelet [3]. As such, static Pods have some notable details, such as: > The spec of a static Pod cannot refer to other API objects > (e.g., ServiceAccount, ConfigMap, Secret, etc). [4] Mention this in the manifest to save some time for future developers. [1]: https://github.com/openshift/installer/blob/c93ae9fc74d7fa0f478fa250de2ba702f84a0a21/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template#L192 [2]: https://github.com/openshift/installer/blob/c93ae9fc74d7fa0f478fa250de2ba702f84a0a21/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template#L576 [3]: https://github.com/openshift/cluster-bootstrap/blob/dc0d4a5cdaf8a7477cab584208dc99352f46efe2/pkg/start/bootstrap.go#L52-L60 [4]: https://kubernetes.io/docs/tasks/configure-pod-container/static-pod/

openshift-merge-bot · 2026-08-21T17:53:21Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

coderabbitai · 2026-08-21T17:53:27Z

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: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: b0317820-abc4-47f3-90ca-30e36a1dcb85

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.}

openshift-ci-robot · 2026-08-21T17:54:29Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-80925 has been cloned as Jira Issue OCPBUGS-112659. Will retitle bug to link to clone.
/retitle [release-5.0] OCPBUGS-112659: Remove the CRB for the default openshift-cluster-version SA

Details

In response to this:

This is an automated cherry-pick of #1366

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-08-21T17:54:41Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-112659, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1366

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

wking

/lgtm
/jira refresh
/label backport-risk-assessed

openshift-ci-robot · 2026-08-21T18:03:24Z

@wking: This pull request references Jira Issue OCPBUGS-112659, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (5.0.0) matches configured target version for branch (5.0.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-80925 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-80925 targets the "5.1.0" version, which is one of the valid target versions: 5.1.0
bug has dependents

Details

In response to this:

/lgtm
/jira refresh
/label backport-risk-assessed

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-merge-bot · 2026-08-21T18:04:00Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-agnostic-operator
/test e2e-agnostic-ovn
/test e2e-agnostic-ovn-techpreview-serial-1of3
/test e2e-agnostic-ovn-techpreview-serial-2of3
/test e2e-agnostic-ovn-techpreview-serial-3of3
/test e2e-agnostic-ovn-upgrade-into-change
/test e2e-agnostic-ovn-upgrade-out-of-change
/test e2e-aws-ovn-techpreview
/test e2e-hypershift
/test e2e-hypershift-conformance

openshift-ci · 2026-08-21T18:04:09Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, wking

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:

~~OWNERS~~ [wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

wking · 2026-08-21T18:24:40Z

Verification to follow this precedent once the CI runs have completed.

openshift-merge-bot · 2026-08-21T22:09:15Z

/retest-required

Remaining retests: 0 against base HEAD f94dc81 and 2 for PR HEAD cf31784 in total

openshift-ci · 2026-08-22T01:35:50Z

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-agnostic-ovn-techpreview-serial-1of3	`cf31784`	link	true	`/test e2e-agnostic-ovn-techpreview-serial-1of3`
ci/prow/e2e-aws-ovn-techpreview	`cf31784`	link	true	`/test e2e-aws-ovn-techpreview`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

DavidHurta added 2 commits August 21, 2026 17:53

openshift-cherrypick-robot assigned wking Aug 21, 2026

openshift-cherrypick-robot mentioned this pull request Aug 21, 2026

OCPBUGS-80925: Remove the CRB for the default openshift-cluster-version SA #1366

Merged

openshift-ci Bot changed the title ~~[release-5.0] OCPBUGS-80925: Remove the CRB for the default openshift-cluster-version SA~~ [release-5.0] OCPBUGS-112659: Remove the CRB for the default openshift-cluster-version SA Aug 21, 2026

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 21, 2026

wking approved these changes Aug 21, 2026

View reviewed changes

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 21, 2026

openshift-ci Bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. lgtm Indicates that a PR is ready to be merged. labels Aug 21, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 21, 2026

Navigation Menu

Uh oh!

[release-5.0] OCPBUGS-112659: Remove the CRB for the default openshift-cluster-version SA - #1454

[release-5.0] OCPBUGS-112659: Remove the CRB for the default openshift-cluster-version SA#1454
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-1366-to-release-5.0

openshift-cherrypick-robot commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

coderabbitai Bot commented Aug 21, 2026

Review skipped

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

wking left a comment

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

openshift-ci Bot commented Aug 21, 2026

Uh oh!

wking commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

openshift-ci Bot commented Aug 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

openshift-cherrypick-robot commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

coderabbitai Bot commented Aug 21, 2026

Review skipped

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

wking left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

openshift-ci Bot commented Aug 21, 2026

Uh oh!

wking commented Aug 21, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 21, 2026

Uh oh!

openshift-ci Bot commented Aug 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants