OCPBUGS-65621: add dedicated service account to crb, cvo and version pod #1266

ehearne-redhat · 2025-11-28T09:42:22Z

What

Add dedicated service account to CVO and version pods in openshift-cluster-version namespace.
Add cluster role binding and attach dedicated service account to it.

Why

Default service account should not be used on OpenShift components.

coderabbitai · 2025-11-28T09:42:34Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Excluded labels (none allowed) (1)

do-not-merge/work-in-progress

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.

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

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci · 2025-11-28T09:43:02Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

OWNERS

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

ehearne-redhat · 2025-11-28T12:45:14Z

/retest

ehearne-redhat · 2025-11-28T12:46:37Z

/test e2e-aws-ovn-upgrade

openshift-ci · 2025-11-28T12:46:44Z

@ehearne-redhat: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-agnostic-operator

/test e2e-agnostic-operator-techpreview

/test e2e-agnostic-ovn

/test e2e-agnostic-ovn-upgrade-into-change

/test e2e-agnostic-ovn-upgrade-into-change-techpreview

/test e2e-agnostic-ovn-upgrade-out-of-change

/test e2e-agnostic-ovn-upgrade-out-of-change-techpreview

/test e2e-aws-ovn-techpreview

/test e2e-hypershift

/test e2e-hypershift-conformance

/test gofmt

/test images

/test lint

/test okd-scos-images

/test unit

/test verify-deps

/test verify-update

/test verify-yaml

The following commands are available to trigger optional jobs:

/test e2e-agnostic-operator-devpreview

/test e2e-extended-tests

/test okd-scos-e2e-aws-ovn

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-operator

pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn

pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-into-change

pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn-upgrade-out-of-change

pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview

pull-ci-openshift-cluster-version-operator-main-e2e-hypershift

pull-ci-openshift-cluster-version-operator-main-e2e-hypershift-conformance

pull-ci-openshift-cluster-version-operator-main-gofmt

pull-ci-openshift-cluster-version-operator-main-images

pull-ci-openshift-cluster-version-operator-main-lint

pull-ci-openshift-cluster-version-operator-main-okd-scos-images

pull-ci-openshift-cluster-version-operator-main-unit

pull-ci-openshift-cluster-version-operator-main-verify-deps

pull-ci-openshift-cluster-version-operator-main-verify-update

pull-ci-openshift-cluster-version-operator-main-verify-yaml

Details

In response to this:

/test e2e-aws-ovn-upgrade

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.

ehearne-redhat · 2025-11-28T12:52:20Z

/test e2e-aws-ovn-techpreview

ehearne-redhat · 2025-11-29T18:18:15Z

/retest

install/0000_00_cluster-version-operator_02_ZZ_roles.yaml

install/0000_00_cluster-version-operator_02_roles.yaml

ehearne-redhat · 2025-11-30T16:45:44Z

/retest

openshift-ci-robot · 2025-12-01T09:19:27Z

@ehearne-redhat: This pull request references Jira Issue OCPBUGS-65621, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

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:

WIP - do not merge.

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.

ehearne-redhat · 2025-12-01T09:20:04Z

/jira refresh

openshift-ci-robot · 2025-12-01T09:20:15Z

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @dis016

Details

In response to this:

/jira refresh

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 · 2025-12-01T09:24:14Z

@ehearne-redhat: This pull request references Jira Issue OCPBUGS-65621, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @dis016

Details

In response to this:

What

Add dedicated service account to CVO and version pods in openshift-cluster-version namespace.

Add cluster role binding and attach dedicated service account to it.

Why

Default service account should not be used on OpenShift components.

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.

ehearne-redhat · 2025-12-12T16:41:43Z

/retest

ehearne-redhat · 2025-12-15T11:54:14Z

/retest

ehearne-redhat · 2025-12-15T14:53:32Z

/retest

ehearne-redhat · 2025-12-18T09:10:24Z

/retest

ehearne-redhat · 2025-12-18T12:14:37Z

/retest

ehearne-redhat · 2025-12-18T15:52:11Z

/retest

ehearne-redhat · 2025-12-19T09:02:52Z

/retest

ehearne-redhat · 2025-12-19T13:08:17Z

/retest

ehearne-redhat · 2025-12-19T17:10:45Z

/retest

ehearne-redhat · 2026-01-05T09:14:07Z

/retest

ehearne-redhat · 2026-01-05T11:51:28Z

/retest

ehearne-redhat · 2026-01-06T17:26:47Z

/retest

ehearne-redhat · 2026-01-07T09:20:44Z

/retest

ehearne-redhat · 2026-01-07T14:49:05Z

/test e2e-aws-ovn-techpreview

ehearne-redhat · 2026-01-08T10:47:14Z

/test okd-scos-images

openshift-ci · 2026-02-01T18:16:59Z

@ehearne-redhat: all tests passed!

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.

wking · 2026-02-03T00:25:29Z

install/0000_00_cluster-version-operator_02_roles.yaml

-  name: cluster-version-operator
-  annotations:
-    kubernetes.io/description: Grant the cluster-version operator permission to perform cluster-admin actions while managing the OpenShift core.
-    include.release.openshift.io/self-managed-high-availability: "true"


You probably want to keep this manifest, but:

Shift it down to a later runlevel like 0000_90_cluster-version-operator_02_roles.yaml‎ to move it towards the end of an update.

Add the release.openshift.io/delete: "true" annotation (docs here).

That will remove the old default cred on update, instead of leaving it dangling in the cluster.

wking · 2026-02-03T00:26:08Z

install/0000_00_cluster-version-operator_02_service_account.yaml

+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: update-payload-dedicated-sa


We don't need -sa in the name, right? That's covered by the kind property a few lines up. I guess we don't need dedicated either; you cover that in the description annotation a few lines below.

wking · 2026-02-03T00:28:47Z

install/0000_00_cluster-version-operator_02_ZZ_roles.yaml

@@ -0,0 +1,44 @@
+apiVersion: rbac.authorization.k8s.io/v1


I'd rather avoid the ZZ just to sort these after the new ServiceAccount file. It's fine if you want to renumber sibling files to make more room. Ideally leave some space too, so other folks can add additional stuff later without having to renumber siling files again as soon.

wking · 2026-02-03T00:30:28Z

install/0000_00_cluster-version-operator_02_ZZ_roles.yaml

+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cluster-version-operator-1


Redundant vs. the cluster-version-operator you declare down at the end of this file?

wking · 2026-02-03T00:31:17Z

install/0000_00_cluster-version-operator_02_ZZ_roles.yaml

+  namespace: openshift-cluster-version
+roleRef:
+  kind: ClusterRole
+  name: cluster-admin


Update-payload Pod doesn't make Kube API calls at all, so I don't think we need this cluster-version-operator-payload ClusterRoleBinding.

wking · 2026-02-03T00:37:46Z

install/0000_00_cluster-version-operator_03_deployment.yaml

        k8s-app: cluster-version-operator
    spec:
      automountServiceAccountToken: false
+      serviceAccountName: cluster-version-operator


Can you either add this to the bootstrap manifest too, or have a commit message that mentions why we don't need a service account for that bootstrap manifest?

In that vein, you might want to reshuffle your existing commit stack to try and tell the transformation story in a more narrative arc. It is completely fine to take a bunch of commits, if you need more space to talk about each pivot in a series. But at the moment, there are things like fc55fa5, which sounds like useful context to include in a "why I did things this way..." commit message in a commit that adds the new role-bindings. But I don't see a benefit to keeping it completely separate, vs. having a single commit that brings in the finished roll bindings and then explains all the context you need to explain that finished shape.

add dedicated service account to crb, cvo and version pod

bf44d47

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 28, 2025

ehearne-redhat added 2 commits November 28, 2025 09:45

add new line to keep linter happy

29bce17

add sa to testrendermanifest

2982ece

add dedicated sa for update payload

ca25977

ehearne-redhat commented Nov 29, 2025

View reviewed changes

install/0000_00_cluster-version-operator_02_ZZ_roles.yaml Show resolved Hide resolved

add cluster-admin clusterrole

825ac61

ehearne-redhat commented Nov 29, 2025

View reviewed changes

install/0000_00_cluster-version-operator_02_roles.yaml Outdated Show resolved Hide resolved

ehearne-redhat added 2 commits November 30, 2025 20:05

remove cluster-admin role from file

446f19b

add new cluster role with watch feature gate

bb1602f

ehearne-redhat changed the title ~~WIP: add dedicated service account to crb, cvo and version pod~~ [WIP] OCPBUGS-65621: add dedicated service account to crb, cvo and version pod Dec 1, 2025

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 Dec 1, 2025

openshift-ci bot requested a review from dis016 December 1, 2025 09:20

re-add cluster-admin

d7e4cd0

add missing annotations

38530cd

ehearne-redhat added 2 commits December 16, 2025 10:03

allow cluster-version-operator service account to use hostaccess scc

a575e1c

simplify role bindings to resolve scc test failure

fc55fa5

ensure different names for crbs

7be8122

ehearne-redhat changed the title ~~[WIP] OCPBUGS-65621: add dedicated service account to crb, cvo and version pod~~ OCPBUGS-65621: add dedicated service account to crb, cvo and version pod Jan 7, 2026

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 7, 2026

ehearne-redhat requested review from DavidHurta and wking January 7, 2026 09:21

wking reviewed Feb 3, 2026

View reviewed changes

OCPBUGS-65621: add dedicated service account to crb, cvo and version pod #1266

Are you sure you want to change the base?

OCPBUGS-65621: add dedicated service account to crb, cvo and version pod #1266

Conversation

ehearne-redhat commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Why

Uh oh!

coderabbitai bot commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci bot commented Nov 28, 2025

Uh oh!

ehearne-redhat commented Nov 28, 2025

Uh oh!

ehearne-redhat commented Nov 28, 2025

Uh oh!

openshift-ci bot commented Nov 28, 2025

Uh oh!

ehearne-redhat commented Nov 28, 2025

Uh oh!

ehearne-redhat commented Nov 29, 2025

Uh oh!

Uh oh!

Uh oh!

ehearne-redhat commented Nov 30, 2025

Uh oh!

openshift-ci-robot commented Dec 1, 2025

Uh oh!

ehearne-redhat commented Dec 1, 2025

Uh oh!

openshift-ci-robot commented Dec 1, 2025

Uh oh!

openshift-ci-robot commented Dec 1, 2025

What

Why

Uh oh!

ehearne-redhat commented Dec 12, 2025

Uh oh!

ehearne-redhat commented Dec 15, 2025

Uh oh!

ehearne-redhat commented Dec 15, 2025

Uh oh!

ehearne-redhat commented Dec 18, 2025

Uh oh!

ehearne-redhat commented Dec 18, 2025

Uh oh!

ehearne-redhat commented Dec 18, 2025

Uh oh!

ehearne-redhat commented Dec 19, 2025

Uh oh!

ehearne-redhat commented Dec 19, 2025

Uh oh!

ehearne-redhat commented Dec 19, 2025

Uh oh!

ehearne-redhat commented Jan 5, 2026

Uh oh!

ehearne-redhat commented Jan 5, 2026

Uh oh!

ehearne-redhat commented Jan 6, 2026

Uh oh!

ehearne-redhat commented Jan 7, 2026

Uh oh!

ehearne-redhat commented Jan 7, 2026

Uh oh!

ehearne-redhat commented Jan 8, 2026

Uh oh!

openshift-ci bot commented Feb 1, 2026

Uh oh!

wking Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

wking Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wking Feb 3, 2026

Choose a reason for hiding this comment

ehearne-redhat commented Nov 28, 2025 •

edited

Loading

coderabbitai bot commented Nov 28, 2025 •

edited

Loading

wking Feb 3, 2026 •

edited

Loading