GCP-958: re-enable GCP PD CSI driver in HyperShift path by ckandag · Pull Request #742 · openshift/cluster-storage-operator

ckandag · 2026-09-09T02:54:11Z

What

Re-registers the GCP PD CSI driver in HyperShiftStarter.populateConfigs() so CSO activates the driver operator on GCP HostedClusters again. This un-comments the single line that was temporarily disabled in #739 (commit 26ededa83).

 		csioperatorclient.GetAWSEBSCSIOperatorConfig(true),
-		// GCP PD HyperShift support is temporarily disabled: .
-		// Re-enable once openshift/hypershift#9450 (or its follow-ups) lands.
-		// csioperatorclient.GetGCPPDCSIOperatorConfig(true),
+		csioperatorclient.GetGCPPDCSIOperatorConfig(true),
 		csioperatorclient.GetOpenStackManilaOperatorConfig(true, clients, hsr.eventRecorder),

Why now

#739 disabled GCP PD on the HyperShift path because the HostedCluster/CVO-side wiring had not yet landed in openshift/hypershift, and the csi-operator applied a set of prerequisite RBAC assets via the management-cluster client that it lacked permission for — which crash-looped the operator and hung ClusterVersion.

Both root causes are now addressed:

The openshift/hypershift CVO-exclusion wiring has landed.
The csi-operator prerequisite-assets fix is in (HyperShift path now applies only controller_sa.yaml).

Verification

End-to-end dynamic provisioning was verified on a GCP HyperShift hosted cluster running a CSO build with GCP PD enabled:

storage ClusterOperator Available=True, Progressing=False, Degraded=False
gcp-pd-csi-driver-node DaemonSet running on all workers (3/3 per pod)
PVC (standard-csi, pd.csi.storage.gke.io) → Bound; PV dynamically provisioned
Backing GCP Persistent Disk created (READY, attached to the scheduled worker node)
Test pod mounted the volume and successfully wrote and read back data
ClusterVersion reached Completed / Available=True

This reverts the temporary disable from 26ededa83 (GCP-958). Standalone GCP PD support is unaffected.

Summary by CodeRabbit

New Features
- Added configuration support for the GCP Persistent Disk CSI operator in HyperShift.
Bug Fixes
- Restored the GCP Persistent Disk configuration path.

The HostedCluster/CVO side wiring (CVO resource exclusion and the control-plane sub-deployment image env var) has landed in openshift/hypershift, and end-to-end dynamic PD provisioning has been verified on a HyperShift hosted cluster. Re-register GCP PD in HyperShiftStarter.populateConfigs() so CSO activates the driver operator on GCP HostedClusters again. This reverts the temporary disable from 26ededa (GCP-958). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

openshift-merge-bot · 2026-09-09T02:54:13Z

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

openshift-ci-robot · 2026-09-09T02:54:15Z

@ckandag: This pull request references GCP-958 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.1.0" version, but no target version was set.

Details

In response to this:

What

Re-registers the GCP PD CSI driver in HyperShiftStarter.populateConfigs() so CSO activates the driver operator on GCP HostedClusters again. This un-comments the single line that was temporarily disabled in #739 (commit 26ededa83).
		csioperatorclient.GetAWSEBSCSIOperatorConfig(true),
-		// GCP PD HyperShift support is temporarily disabled: .
-		// Re-enable once openshift/hypershift#9450 (or its follow-ups) lands.
-		// csioperatorclient.GetGCPPDCSIOperatorConfig(true),
+		csioperatorclient.GetGCPPDCSIOperatorConfig(true),
		csioperatorclient.GetOpenStackManilaOperatorConfig(true, clients, hsr.eventRecorder),
Why now

#739 disabled GCP PD on the HyperShift path because the HostedCluster/CVO-side wiring (CVO resource exclusion for the driver operator/controller, and the control-plane sub-deployment image env var) had not yet landed in openshift/hypershift, and the csi-operator applied a set of prerequisite RBAC assets via the management-cluster client that it lacked permission for — which crash-looped the operator and hung ClusterVersion.

Both root causes are now addressed:

The openshift/hypershift CVO-exclusion wiring has landed.

The csi-operator prerequisite-assets fix is in (HyperShift path now applies only controller_sa.yaml).

Verification

End-to-end dynamic provisioning was verified on a GCP HyperShift hosted cluster running a CSO build with GCP PD enabled:

storage ClusterOperator Available=True, Progressing=False, Degraded=False

gcp-pd-csi-driver-node DaemonSet running on all workers (3/3 per pod)

PVC (standard-csi, pd.csi.storage.gke.io) → Bound; PV dynamically provisioned

Backing GCP Persistent Disk created (READY, attached to the scheduled worker node)

Test pod mounted the volume and successfully wrote and read back data

ClusterVersion reached Completed / Available=True

This reverts the temporary disable from 26ededa83 (GCP-958). Standalone GCP PD support is unaffected.

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-09-09T02:54:43Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: cfa724c2-2a3a-4ac7-99eb-1fca81005f5a

📥 Commits

Reviewing files that changed from the base of the PR and between c3a4da0 and 7d5b80f.

📒 Files selected for processing (1)

pkg/operator/operator_starter.go

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.

Walkthrough

HyperShift now enables the GCP Persistent Disk CSI operator configuration in the operator starter.

Changes

GCP PD CSI operator

Layer / File(s)	Summary
Enable GCP PD CSI configuration `pkg/operator/operator_starter.go`	The configuration population now enables `GetGCPPDCSIOperatorConfig(true)`.

Priority: ➖ Normal

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 7d5b8

HyperShift GCP clusters will again enable the GCP Persistent Disk CSI driver; no current merge-blocking risk remains.

Suggested reviewers: rvagner78

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	PASS. The exact pull-request diff changes only `pkg/operator/operator_starter.go`. It restores `GetGCPPDCSIOperatorConfig(true)` in `HyperShiftStarter.populateConfigs()` and adds no test files or test…
Test Structure And Quality	✅ Passed	PASS: The pull request changes only `pkg/operator/operator_starter.go` and restores one production configuration call. It adds no Ginkgo tests or test setup, cleanup, waits, or assertions. Therefore, …
Microshift Test Compatibility	✅ Passed	PASS: The pull request changes only `pkg/operator/operator_starter.go`. The diff restores `GetGCPPDCSIOperatorConfig(true)` and adds no Ginkgo tests or test declarations (`It`, `Describe`, `Context`, …
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PASS: The pull request changes only `pkg/operator/operator_starter.go`. It restores `GetGCPPDCSIOperatorConfig(true)` in `HyperShiftStarter.populateConfigs()`. The diff adds no Ginkgo e2e tests, test …
Topology-Aware Scheduling Compatibility	✅ Passed	The PR changes only `HyperShiftStarter.populateConfigs()` by re-registering the GCP PD configuration. The GCP PD HyperShift deployment and guest assets already existed before the PR and were not modif…
Ote Binary Stdout Contract	✅ Passed	The PR changes only `pkg/operator/operator_starter.go`: it enables `GetGCPPDCSIOperatorConfig(true)` in `HyperShiftStarter.populateConfigs()`. The called configuration path reads environment variables…
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PASS: The pull request changes only `pkg/operator/operator_starter.go`. It re-enables `GetGCPPDCSIOperatorConfig(true)` in `HyperShiftStarter.populateConfigs()`. The diff adds no Ginkgo tests and intr…
No-Weak-Crypto	✅ Passed	PASS. The pull request changes only `pkg/operator/operator_starter.go` and restores `csioperatorclient.GetGCPPDCSIOperatorConfig(true)`. The changed code introduces no MD5, SHA1, DES, RC4, 3DES, Blowf…
Container-Privileges	✅ Passed	The PR changes only `pkg/operator/operator_starter.go` by enabling the existing GCP PD configuration. The activated HyperShift deployment sets `allowPrivilegeEscalation: false`, drops all capabilities…
No-Sensitive-Data-In-Logs	✅ Passed	PASS: The pull request adds only the existing `GetGCPPDCSIOperatorConfig(true)` registration. It adds no logging statements, log formatting, credentials, tokens, or personal data. The enabled configur…
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and concisely describes the main change: re-enabling the GCP Persistent Disk CSI driver in the HyperShift path.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

ckandag · 2026-09-09T03:22:29Z

/pipeline required

openshift-merge-bot · 2026-09-09T03:22:32Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-upgrade
/test e2e-azure-csi
/test e2e-azure-file-csi
/test e2e-gcp-csi
/test e2e-vsphere-csi

ckandag · 2026-09-09T03:23:40Z

/verified by @ckandag

openshift-ci-robot · 2026-09-09T03:23:52Z

@ckandag: This PR has been marked as verified by @ckandag.

Details

In response to this:

/verified by @ckandag

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.

ckandag · 2026-09-09T03:46:09Z

We had to earlier disable GCP in CSO because Hypershift repo changes for GCP-PD needed to go in first.

With both Hypershift changes and RBAC fix in csi-driver merged, reenabling GCP in CSO.

cc @rhrmo PTAL

rhrmo · 2026-09-09T06:49:34Z

/test hypershift-aws-e2e-external

rhrmo · 2026-09-09T06:51:20Z

/lgtm
/approve

openshift-ci · 2026-09-09T06:51:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ckandag, rhrmo

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

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

openshift-merge-bot · 2026-09-09T08:08:49Z

/retest-required

Remaining retests: 0 against base HEAD c3a4da0 and 2 for PR HEAD 7d5b80f in total

ckandag · 2026-09-09T12:20:22Z

/test hypershift-aws-e2e-external

ckandag · 2026-09-09T18:48:30Z

/test hypershift-aws-e2e-external

ckandag · 2026-09-10T00:06:47Z

/test hypershift-aws-e2e-external

openshift-ci · 2026-09-10T01:09:54Z

@ckandag: The following test 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/hypershift-aws-e2e-external	`7d5b80f`	link	true	`/test hypershift-aws-e2e-external`

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.

ckandag · 2026-09-10T02:14:09Z

@rhrmo: aws test appears to be in perm fail situation, would it be possible to get an override for this test.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 9, 2026

openshift-ci Bot requested review from dobsonj and gnufied September 9, 2026 02:54

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

openshift-ci Bot assigned rhrmo Sep 9, 2026

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

openshift-ci Bot assigned radeore Sep 9, 2026

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

Uh oh!

Conversation

ckandag commented Sep 9, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Why now

Verification

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Sep 9, 2026

Uh oh!

openshift-ci-robot commented Sep 9, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Why now

Verification

Uh oh!

coderabbitai Bot commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

ckandag commented Sep 9, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 9, 2026

Uh oh!

ckandag commented Sep 9, 2026

Uh oh!

openshift-ci-robot commented Sep 9, 2026

Uh oh!

ckandag commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rhrmo commented Sep 9, 2026

Uh oh!

rhrmo commented Sep 9, 2026

Uh oh!

openshift-ci Bot commented Sep 9, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 9, 2026

Uh oh!

ckandag commented Sep 9, 2026

Uh oh!

ckandag commented Sep 9, 2026

Uh oh!

ckandag commented Sep 10, 2026

Uh oh!

openshift-ci Bot commented Sep 10, 2026

Uh oh!

ckandag commented Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ckandag commented Sep 9, 2026 •

edited by coderabbitai Bot

Loading

openshift-ci-robot commented Sep 9, 2026 •

edited by openshift-ci Bot

Loading

coderabbitai Bot commented Sep 9, 2026 •

edited

Loading

ckandag commented Sep 9, 2026 •

edited

Loading