Skip to content

[release-5.0] OCPBUGS-114002: GCP-1074: feat(gcp-pd): enable HyperShift support for GCP PD CSI driver operator - #607

Open
ckandag wants to merge 1 commit into
openshift:release-5.0from
ckandag:cherry-pick-601-to-release-5.0-manual
Open

[release-5.0] OCPBUGS-114002: GCP-1074: feat(gcp-pd): enable HyperShift support for GCP PD CSI driver operator#607
ckandag wants to merge 1 commit into
openshift:release-5.0from
ckandag:cherry-pick-601-to-release-5.0-manual

Conversation

@ckandag

@ckandag ckandag commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Manual cherry-pick of #601 to release-5.0.

The automatic /cherry-pick bot flow was tried first (see #606, now closed) but per CSI team guidance a manual cherry-pick is safer here since the original PR (#601) was merged without a bug reference targeting 5.1, which could interact unpredictably with the bot's Jira-linking automation on the backport.

Changes

Same as #601:

  • Add --guest-kubeconfig flag so the operator can run against a HyperShift guest cluster.
  • Remove StandaloneOnly gating in GetGCPPDGeneratorConfig and generate the hypershift asset overlay alongside standalone.
  • Add controller_add_hypershift_controller_minter.yaml patch: wires the token-minter sidecar and hosted-kubeconfig volume, fixes the GOOGLE_APPLICATION_CREDENTIALS filename mismatch with HyperShift's WIF credentials secret, disables hostNetwork (blocked by GKE Autopilot), sets explicit ephemeral-storage requests per container (GKE Autopilot pod-level cap), and disables the node service on the controller (--run-node-service=false, since hostNetwork is off).
  • Remove the HyperShift-unsupported error in GetGCPPDOperatorControllerConfig and gate OldControllerPrivilegedBindingRemoval to Standalone only.
  • Add unit tests covering Standalone vs HyperShift controller config.

Note on generated assets

release-5.0's shared base templates (assets/base/controller.yaml, assets/base/node.yaml) still use the deprecated serviceAccount: field name, whereas main has since been updated to serviceAccountName:. Ran hack/update-generated-assets.sh against this branch (rather than copying main's regenerated output verbatim) so the two are equivalent — this avoids pulling in an unrelated base-template rename and keeps verify-generated-assets passing on release-5.0.

make verify and go test ./pkg/driver/gcp-pd/... pass locally.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-114002 (backport of GCP-1074)

Made with Cursor

…ft support for GCP PD CSI driver operator

Enables HyperShift asset generation and runtime support for the GCP PD
CSI driver operator:

- Add --guest-kubeconfig flag so the operator can run against a
  HyperShift guest cluster.
- Remove StandaloneOnly gating in GetGCPPDGeneratorConfig and generate
  the hypershift asset overlay alongside standalone.
- Add controller_add_hypershift_controller_minter.yaml patch: wires the
  token-minter sidecar and hosted-kubeconfig volume, fixes the
  GOOGLE_APPLICATION_CREDENTIALS filename mismatch with HyperShift's
  WIF credentials secret, disables hostNetwork (blocked by GKE
  Autopilot), sets explicit ephemeral-storage requests per container
  (GKE Autopilot pod-level cap), and disables the node service on the
  controller (--run-node-service=false, since hostNetwork is off).
- Remove the HyperShift-unsupported error in
  GetGCPPDOperatorControllerConfig and gate
  OldControllerPrivilegedBindingRemoval to Standalone only.
- Add unit tests covering Standalone vs HyperShift controller config.

make update run against release-5.0 to regenerate assets.

Co-authored-by: Cursor <cursoragent@cursor.com>
(cherry picked from commit 81451bc)
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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 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 26, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 26, 2026

Copy link
Copy Markdown

@ckandag: This pull request references Jira Issue OCPBUGS-114002, 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-114002 to depend on a bug targeting a version in 5.1.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:

Manual cherry-pick of #601 to release-5.0.

The automatic /cherry-pick bot flow was tried first (see #606, now closed) but per CSI team guidance a manual cherry-pick is safer here since the original PR (#601) was merged without a bug reference targeting 5.1, which could interact unpredictably with the bot's Jira-linking automation on the backport.

Changes

Same as #601:

  • Add --guest-kubeconfig flag so the operator can run against a HyperShift guest cluster.
  • Remove StandaloneOnly gating in GetGCPPDGeneratorConfig and generate the hypershift asset overlay alongside standalone.
  • Add controller_add_hypershift_controller_minter.yaml patch: wires the token-minter sidecar and hosted-kubeconfig volume, fixes the GOOGLE_APPLICATION_CREDENTIALS filename mismatch with HyperShift's WIF credentials secret, disables hostNetwork (blocked by GKE Autopilot), sets explicit ephemeral-storage requests per container (GKE Autopilot pod-level cap), and disables the node service on the controller (--run-node-service=false, since hostNetwork is off).
  • Remove the HyperShift-unsupported error in GetGCPPDOperatorControllerConfig and gate OldControllerPrivilegedBindingRemoval to Standalone only.
  • Add unit tests covering Standalone vs HyperShift controller config.

Note on generated assets

release-5.0's shared base templates (assets/base/controller.yaml, assets/base/node.yaml) still use the deprecated serviceAccount: field name, whereas main has since been updated to serviceAccountName:. Ran hack/update-generated-assets.sh against this branch (rather than copying main's regenerated output verbatim) so the two are equivalent — this avoids pulling in an unrelated base-template rename and keeps verify-generated-assets passing on release-5.0.

make verify and go test ./pkg/driver/gcp-pd/... pass locally.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-114002 (backport of GCP-1074)

Made with Cursor

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

coderabbitai Bot commented Aug 26, 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: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: ba26606d-8783-4059-bff2-9b8251c54f66

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
openshift-ci Bot requested review from gnufied and jsafrane August 26, 2026 13:34
@rhrmo

rhrmo commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@rhrmo: This pull request references Jira Issue OCPBUGS-114002, which is invalid:

  • expected dependent Jira Issue OCPBUGS-112748 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is Closed (Done) instead

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.

@rhrmo

rhrmo commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot 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 26, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@rhrmo: This pull request references Jira Issue OCPBUGS-114002, 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 ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-112748 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-112748 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:

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

@rhrmo

rhrmo commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

[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:

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

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

ckandag commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-azure-ovn-upgrade

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 8093776 and 2 for PR HEAD 71c236a in total

@ckandag

ckandag commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-azure-file-nfs-csi

@ckandag

ckandag commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-azure-file-csi

1 similar comment
@ckandag

ckandag commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-azure-file-csi

@ckandag

ckandag commented Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

/verified later @ckandag

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Aug 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@ckandag: This PR has been marked to be verified later by @ckandag.

Details

In response to this:

/verified later @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

ckandag commented Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

/test e2e-azure-file-csi

1 similar comment
@rhrmo

rhrmo commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

/test e2e-azure-file-csi

@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@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/e2e-azure-file-csi 71c236a link true /test e2e-azure-file-csi

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants