OCPBUGS-94184: OCPBUGS-65582: [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests by openshift-cherrypick-robot · Pull Request #484 · openshift/cluster-cloud-controller-manager-operator

openshift-cherrypick-robot · 2026-07-07T12:55:02Z

This is an automated cherry-pick of #478

/assign theobarberbany

…tialsRequests Avoid issues like [1]: level=error msg=Cluster operator cloud-controller-manager Degraded is True with SyncingFailed: Failed to resync for operator: 5.0.0-0.ci-2026-06-24-223845-test-ci-op-bf1k8ci7-latest because &{%!e(string=failed to sync operands: deployment gcp-cloud-controller-manager rollout stalled: ProgressDeadlineExceeded) %!e(*errors.errorString=&{deployment gcp-cloud-controller-manager rollout stalled: ProgressDeadlineExceeded})} level=error msg=Bootstrap failed to complete: timed out waiting for the condition where the gcp-cloud-controller-manager rollout was stuck on a missing Secret: $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_installer/10344/pull-ci-openshift-installer-main-e2e-gcp-ovn/2069899190707687424/artifacts/e2e-gcp-ovn/gather-must-gather/artifacts/must-gather/inspect.local.678963955700434997/namespaces/openshift-cloud-controller-manager/core/events.yaml | grep -i secret | sort | uniq message: 'error calculating configuration hash: Secret "gcp-ccm-cloud-credentials" message: 'MountVolume.SetUp failed for volume "cloud-sa-volume" : secret "gcp-ccm-cloud-credentials" The missing Secret is because of a missing openshift-gcp-ccm CredentialsRequest: $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_installer/10344/pull-ci-openshift-installer-main-e2e-gcp-ovn/2069899190707687424/artifacts/e2e-gcp-ovn/gather-must-gather/artifacts/must-gather/inspect.local.678963955700434997/namespaces/openshift-cloud-credential-operator/cloudcredential.openshift.io/credentialsrequests/ | grep -o '[^/ ]*[.]yaml' | grep gcp | sort | uniq cloud-credential-operator-gcp-ro-creds.yaml openshift-cloud-network-config-controller-gcp.yaml openshift-gcp-pd-csi-driver-operator.yaml openshift-ingress-gcp.yaml openshift-machine-api-gcp.yaml and the missing CredentialsRequest was because this repository's manifests are out of order, and the sad ClusterOperator blocks the cluster-version operator from continuing on past 12_clusteroperator.yaml to apply 16_credentialsrequest-gcp.yaml: $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_installer/10344/pull-ci-openshift-installer-main-e2e-gcp-ovn/2069899190707687424/artifacts/e2e-gcp-ovn/ipi-install-install/artifacts/log-bundle-20260624233936/bootstrap/containers/cluster-version-operator-c5eae39febef6f1c173b5dd93acddedf470263070e47ef2bbe51a9302cacba13.log | grep 'cloud-controller-manager' | grep -B10 'Result of work' | grep -v 'Result of work' | tail I0624 23:38:39.982212 1 sync_worker.go:1092] Running sync for service "openshift-cloud-controller-manager-operator/cloud-controller-manager-operator" (198 of 1023) I0624 23:38:40.206632 1 sync_worker.go:1109] Done syncing for service "openshift-cloud-controller-manager-operator/cloud-controller-manager-operator" (198 of 1023) I0624 23:38:40.206693 1 sync_worker.go:1092] Running sync for networkpolicy "openshift-cloud-controller-manager-operator/default-deny" (199 of 1023) I0624 23:38:40.432739 1 sync_worker.go:1109] Done syncing for networkpolicy "openshift-cloud-controller-manager-operator/default-deny" (199 of 1023) I0624 23:38:40.432800 1 sync_worker.go:1092] Running sync for networkpolicy "openshift-cloud-controller-manager/default-deny" (200 of 1023) I0624 23:38:40.657161 1 sync_worker.go:1109] Done syncing for networkpolicy "openshift-cloud-controller-manager/default-deny" (200 of 1023) I0624 23:38:40.657237 1 sync_worker.go:1092] Running sync for deployment "openshift-cloud-controller-manager-operator/cluster-cloud-controller-manager-operator" (201 of 1023) I0624 23:38:40.882838 1 sync_worker.go:1109] Done syncing for deployment "openshift-cloud-controller-manager-operator/cluster-cloud-controller-manager-operator" (201 of 1023) I0624 23:38:40.882898 1 sync_worker.go:1092] Running sync for clusteroperator "cloud-controller-manager" (202 of 1023) E0624 23:38:40.883156 1 task.go:128] "Unhandled Error" err="error running apply for clusteroperator \"cloud-controller-manager\" (202 of 1023): Cluster operator cloud-controller-manager is not available" logger="UnhandledError" By re-ordering the manifests, the CredentialRequests needed for a happy ClusterOperator now all come before the operator Deployment, so well before the operand Deployment, and they will be consistently pushed into the cluster, regardless of how happy this ClusterOperator is. The old misordering dates back to the ealiest CredentialsRequest manifests here in 05d4fff (Add Azure creds injector binary into CCCMO image and bits for run it in initContainer, 2021-08-12, openshift#106). But for reasons I haven't completely pinned down, e05d774 (Updates clusteroperator_controller progressing, 2026-06-16, openshift#473) seems to have blown the longstanding race open, at least on Azure and GCP. [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_installer/10344/pull-ci-openshift-installer-main-e2e-gcp-ovn/2069899190707687424

openshift-ci-robot · 2026-07-07T12:55:06Z

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-64852 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests

Details

In response to this:

This is an automated cherry-pick of #478

/assign theobarberbany

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.

coderabbitai · 2026-07-07T12:55:13Z

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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 7f48763f-8835-4527-9cd4-5ee3b39e2d47

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

openshift-ci-robot · 2026-07-07T12:55:21Z

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

expected the bug to be open, but it isn't
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
expected Jira Issue OCPBUGS-65582 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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 #478

/assign theobarberbany

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.

damdo

/approve
/lgtm

openshift-ci · 2026-07-07T14:23:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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~~ [damdo]

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

openshift-ci · 2026-07-07T16:00:43Z

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

damdo · 2026-07-07T16:16:24Z

/label backport-risk-assessed

damdo · 2026-07-07T16:16:43Z

@wking leaving the verification to you

nrb · 2026-07-07T18:30:56Z

/verified by passing CI; this is a preemptive fix to catch issues with some other operator logic.
/jira refresh

openshift-ci-robot · 2026-07-07T18:31:09Z

@nrb: This PR has been marked as verified by passing CI; this is a preemptive fix to catch issues with some other operator logic..

Details

In response to this:

/verified by passing CI; this is a preemptive fix to catch issues with some other operator logic.
/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 · 2026-07-07T18:31:11Z

@nrb: This pull request references Jira Issue OCPBUGS-65582, which is invalid:

expected the bug to be open, but it isn't
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead
expected Jira Issue OCPBUGS-65582 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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.

Details

In response to this:

/verified by passing CI; this is a preemptive fix to catch issues with some other operator logic.
/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.

theobarberbany · 2026-07-08T08:40:41Z

sigh the jira bot got confused.

theobarberbany · 2026-07-08T14:46:21Z

/jira cherry-pick OCPBUGS-64852

openshift-ci-robot · 2026-07-08T14:46:25Z

@theobarberbany: Detected clone of Jira Issue OCPBUGS-64852 with correct target version. Will retitle the PR to link to the clone.
/retitle OCPBUGS-65582: [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests

Details

In response to this:

/jira cherry-pick OCPBUGS-64852

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.

theobarberbany · 2026-07-08T14:51:21Z

/jira cherry-pick OCPBUGS-64852

openshift-ci-robot · 2026-07-08T14:51:26Z

@theobarberbany: Detected clone of Jira Issue OCPBUGS-64852 with correct target version. Will retitle the PR to link to the clone.
/retitle OCPBUGS-94184: OCPBUGS-65582: [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests

Details

In response to this:

/jira cherry-pick OCPBUGS-64852

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-07-08T14:51:34Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-94184, 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.
expected Jira Issue OCPBUGS-94184 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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 #478

/assign theobarberbany

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.

theobarberbany · 2026-07-08T14:55:13Z

/jira refresh

openshift-ci-robot · 2026-07-08T14:55:17Z

@theobarberbany: This pull request references Jira Issue OCPBUGS-94184, which is invalid:

expected Jira Issue OCPBUGS-94184 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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.

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.

theobarberbany · 2026-07-08T14:57:22Z

/jira refresh

openshift-ci-robot · 2026-07-08T14:57:29Z

@theobarberbany: This pull request references Jira Issue OCPBUGS-94184, 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 (4.22.0) matches configured target version for branch (4.22.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-64852 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-64852 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

Requesting review from QA contact:
/cc @miyadav

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 · 2026-07-08T15:00:45Z

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-94184
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-94184 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #478

/assign theobarberbany

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-cherrypick-robot assigned theobarberbany Jul 7, 2026

openshift-cherrypick-robot mentioned this pull request Jul 7, 2026

OCPBUGS-64852: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests #478

Merged

openshift-ci Bot changed the title ~~[release-4.22] OCPBUGS-64852: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests~~ [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests Jul 7, 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 Jul 7, 2026

openshift-ci Bot requested review from RadekManak and damdo July 7, 2026 12:55

damdo reviewed Jul 7, 2026

View reviewed changes

openshift-ci Bot assigned damdo Jul 7, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2026

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

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 7, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 7, 2026

openshift-ci Bot changed the title ~~[release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests~~ OCPBUGS-65582: [release-4.22] OCPBUGS-65582: manifests: Shift operator Deployment and ClusterOperator after CredentialsRequests Jul 8, 2026

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 Jul 8, 2026

openshift-ci Bot requested a review from miyadav July 8, 2026 14:57

openshift-merge-bot Bot merged commit b99c3d8 into openshift:release-4.22 Jul 8, 2026
12 checks passed

theobarberbany mentioned this pull request Jul 8, 2026

OCPBUGS-94183, OCPBUGS-94184: [release-4.22] Add transient error handling across all three controllers, fix progressing=true #485

Open

Uh oh!

Conversation

openshift-cherrypick-robot commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

coderabbitai Bot commented Jul 7, 2026

Review skipped

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jul 7, 2026

Uh oh!

openshift-ci Bot commented Jul 7, 2026

Uh oh!

damdo commented Jul 7, 2026

Uh oh!

damdo commented Jul 7, 2026

Uh oh!

nrb commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

theobarberbany commented Jul 8, 2026

Uh oh!

theobarberbany commented Jul 8, 2026

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

theobarberbany commented Jul 8, 2026

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

theobarberbany commented Jul 8, 2026

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

theobarberbany commented Jul 8, 2026

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants