Skip to content

[release-5.0] OCPBUGS-111893: Add proxy hook for HyperShift CSI driver controller deployments - #599

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-594-to-release-5.0
Aug 20, 2026
Merged

[release-5.0] OCPBUGS-111893: Add proxy hook for HyperShift CSI driver controller deployments#599
openshift-merge-bot[bot] merged 2 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-594-to-release-5.0

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #594

/assign openshift-ci-robot

…ler deployments

  The HyperShift mode was missing a proxy hook in NewDefaultOperatorControllerConfig,
  leaving CSI driver controller containers without HTTP_PROXY, HTTPS_PROXY, and
  NO_PROXY when the management cluster requires a proxy for external access.
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-105392 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-5.0] OCPBUGS-111893: Add proxy hook for HyperShift CSI driver controller deployments

Details

In response to this:

This is an automated cherry-pick of #594

/assign openshift-ci-robot

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

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

@coderabbitai

coderabbitai Bot commented Aug 18, 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: d34404c7-dba3-40de-8e4c-2d2899e0ac39

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 changed the title [release-5.0] OCPBUGS-105392: Add proxy hook for HyperShift CSI driver controller deployments [release-5.0] OCPBUGS-111893: Add proxy hook for HyperShift CSI driver controller deployments Aug 18, 2026
@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 18, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-111893, 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 dependent Jira Issue OCPBUGS-105392 to target a version in 5.1.0, but it targets "5.0" 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.

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

/assign openshift-ci-robot

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
openshift-ci Bot requested review from gnufied and jsafrane August 18, 2026 12:51
@jsafrane

Copy link
Copy Markdown
Contributor

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 18, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 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 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 18, 2026
@jsafrane

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@jsafrane: This pull request references Jira Issue OCPBUGS-111893, 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 dependent Jira Issue OCPBUGS-105392 to target a version in 5.1.0, but it targets "5.0" 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.

@jsafrane

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@jsafrane: This pull request references Jira Issue OCPBUGS-111893, 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.

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.

@jsafrane

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

Copy link
Copy Markdown

@jsafrane: This pull request references Jira Issue OCPBUGS-111893, 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 text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-105392 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-105392 targets the "5.1" 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.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD b967312 and 2 for PR HEAD fb99434 in total

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/retest

1 similar comment
@PoornimaSingour

Copy link
Copy Markdown
Contributor

/retest

@vsolanki12

Copy link
Copy Markdown

/verified by @vsolanki

Test result:
Step 1: CPO sets proxy on CSO

    $ oc get deployment cluster-storage-operator -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
    Container: cluster-storage-operator
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost

Step 2: CSO sets proxy on aws-ebs-csi-driver-operator

    $ oc get deployment aws-ebs-csi-driver-operator -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
    Container: aws-ebs-csi-driver-operator
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost
    Container: token-minter
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost

Step 3: aws-ebs-csi-driver-operator sets proxy on aws-ebs-csi-driver-controller (all 12 containers)

  $ oc get deployment aws-ebs-csi-driver-controller -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
    Container: csi-driver
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128

    Container: csi-provisioner
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    Container: csi-attacher
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    Container: csi-resizer
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    Container: csi-snapshotter
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    Container: csi-liveness-probe
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    Container: token-minter
      HTTP_PROXY=http://<PROXY_IP>:3128
      HTTPS_PROXY=http://<PROXY_IP>:3128
      NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

    (+ 5 kube-rbac-proxy sidecar containers, all with same proxy vars)

  PVC Provisioning Test (end-to-end proof)
  Guest cluster nodes
    $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get nodes
    NAME                          STATUS   ROLES    AGE   VERSION
    ip-10-0-128-46.ec2.internal   Ready    worker   10m   v1.35.3
    ip-10-0-133-12.ec2.internal   Ready    worker   10m   v1.35.3

    PVC status — Bound
    $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pvc -n default
    NAME             STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS   AGE
    proxy-test-pvc   Bound    pvc-c3bd0113-9f67-4a2b-be7d-07a3b323c869   1Gi        RWO            gp3-csi        48m

  PV details — gp3 EBS volume provisioned
   $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pv
   NAME                                       CAPACITY   ACCESS MODES   RECLAIM POLICY   STATUS   CLAIM
   STORAGECLASS   AGE
   pvc-c3bd0113-9f67-4a2b-be7d-07a3b323c869   1Gi        RWO            Delete           Bound    default/proxy-test-pvc
   gp3-csi        8m56s

  Pod status — Running
    $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pod proxy-test-pod -n default
    NAME             READY   STATUS    RESTARTS   AGE
    proxy-test-pod   1/1     Running   0          48m

This proves aws-ebs-csi-driver-controller now reach AWS STS through proxy, assume IAM role, call EC2 CreateVolume ok.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 20, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@vsolanki12: This PR has been marked as verified by @vsolanki.

Details

In response to this:

/verified by @vsolanki

Test result:
Step 1: CPO sets proxy on CSO

   $ oc get deployment cluster-storage-operator -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
   Container: cluster-storage-operator
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost

Step 2: CSO sets proxy on aws-ebs-csi-driver-operator

   $ oc get deployment aws-ebs-csi-driver-operator -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
   Container: aws-ebs-csi-driver-operator
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost
   Container: token-minter
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.proxy-mgmt.india.aws.cee.support,kube-apiserver,localhost

Step 3: aws-ebs-csi-driver-operator sets proxy on aws-ebs-csi-driver-controller (all 12 containers)

 $ oc get deployment aws-ebs-csi-driver-controller -n local-cluster-proxy-test-full -o json | grep -A1 PROXY
   Container: csi-driver
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128

   Container: csi-provisioner
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   Container: csi-attacher
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   Container: csi-resizer
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   Container: csi-snapshotter
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   Container: csi-liveness-probe
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   Container: token-minter
     HTTP_PROXY=http://<PROXY_IP>:3128
     HTTPS_PROXY=http://<PROXY_IP>:3128
     NO_PROXY=.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,...

   (+ 5 kube-rbac-proxy sidecar containers, all with same proxy vars)

 PVC Provisioning Test (end-to-end proof)
 Guest cluster nodes
   $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get nodes
   NAME                          STATUS   ROLES    AGE   VERSION
   ip-10-0-128-46.ec2.internal   Ready    worker   10m   v1.35.3
   ip-10-0-133-12.ec2.internal   Ready    worker   10m   v1.35.3

   PVC status — Bound
   $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pvc -n default
   NAME             STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS   AGE
   proxy-test-pvc   Bound    pvc-c3bd0113-9f67-4a2b-be7d-07a3b323c869   1Gi        RWO            gp3-csi        48m

 PV details — gp3 EBS volume provisioned
  $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pv
  NAME                                       CAPACITY   ACCESS MODES   RECLAIM POLICY   STATUS   CLAIM
  STORAGECLASS   AGE
  pvc-c3bd0113-9f67-4a2b-be7d-07a3b323c869   1Gi        RWO            Delete           Bound    default/proxy-test-pvc
  gp3-csi        8m56s

 Pod status — Running
   $ oc --kubeconfig=/tmp/guest-kubeconfig.yaml get pod proxy-test-pod -n default
   NAME             READY   STATUS    RESTARTS   AGE
   proxy-test-pod   1/1     Running   0          48m

This proves aws-ebs-csi-driver-controller now reach AWS STS through proxy, assume IAM role, call EC2 CreateVolume ok.

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.

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/retest

2 similar comments
@PoornimaSingour

Copy link
Copy Markdown
Contributor

/retest

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/retest

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/test e2e-azure

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit 8093776 into openshift:release-5.0 Aug 20, 2026
24 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-111893
✔️ 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-111893 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 #594

/assign openshift-ci-robot

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-robot

Copy link
Copy Markdown
Contributor

Fix included in release 5.0.0-0.nightly-2026-08-21-033959

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/jira backport release-4.22

@openshift-ci-robot

Copy link
Copy Markdown

@PoornimaSingour: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22

Details

In response to this:

/jira backport release-4.22

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

Copy link
Copy Markdown
Author

@openshift-ci-robot: new pull request created: #619

Details

In response to this:

@PoornimaSingour: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.22

In response to this:

/jira backport release-4.22

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.

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants