Skip to content

[release-4.22] OCPBUGS-100141: Add proxy env vars to AWS cloud-controller-manager deployment - #9156

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
redhat-chai-bot:backport-9053-fixed-release-4.22
Aug 5, 2026
Merged

[release-4.22] OCPBUGS-100141: Add proxy env vars to AWS cloud-controller-manager deployment#9156
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
redhat-chai-bot:backport-9053-fixed-release-4.22

Conversation

@redhat-chai-bot

Copy link
Copy Markdown
Contributor

Summary

Backport of #9053 to release-4.22, adapted to work with the existing support/util package instead of support/podspec (which only exists on main).

The automated cherry-pick (#9155) failed CI because it imported support/podspec, a package introduced on main as part of a larger refactor that hasn't been backported to release-4.22.

Changes

This PR adapts the original #9053 changes for release-4.22:

  • Added FindEnvVar helper to support/util/containers.go — this function existed on main but was missing on release-4.22
  • Created deployment.go — proxy env var injection logic for the AWS cloud-controller-manager, using support/util instead of support/podspec
  • Created deployment_test.go — 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarios
  • Modified component.go — wired adaptDeployment via .WithAdaptFunction()

Testing

  • make build passes (all 6 binaries)
  • go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/... — all 4 new tests pass

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053


@jparrill requested in Slack thread

…r deployment

The CCM deployment was missing HTTP_PROXY, HTTPS_PROXY, and NO_PROXY
environment variables when the management cluster is configured with a
proxy. This was a regression from the v1 to v2 component framework
migration where the proxy.SetEnvVars() call was not carried over.

Adapted for release-4.22: uses support/util instead of support/podspec
(which doesn't exist on this branch). Adds the missing FindEnvVar
helper to support/util/containers.go.

Includes test coverage for full proxy, partial proxy (HTTP_PROXY-only
and HTTPS_PROXY-only), no proxy, and env var preservation scenarios.

This is a manual backport of PR openshift#9053 (commits ec5ae7a, 4afcef2)
adapted for the release-4.22 branch.
@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 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 Jul 29, 2026
@openshift-ci

openshift-ci Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

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

Copy link
Copy Markdown

@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141, 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.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Backport of #9053 to release-4.22, adapted to work with the existing support/util package instead of support/podspec (which only exists on main).

The automated cherry-pick (#9155) failed CI because it imported support/podspec, a package introduced on main as part of a larger refactor that hasn't been backported to release-4.22.

Changes

This PR adapts the original #9053 changes for release-4.22:

  • Added FindEnvVar helper to support/util/containers.go — this function existed on main but was missing on release-4.22
  • Created deployment.go — proxy env var injection logic for the AWS cloud-controller-manager, using support/util instead of support/podspec
  • Created deployment_test.go — 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarios
  • Modified component.go — wired adaptDeployment via .WithAdaptFunction()

Testing

  • make build passes (all 6 binaries)
  • go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/... — all 4 new tests pass

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053


@jparrill requested in Slack thread

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 29, 2026
@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

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: Pro Plus

Run ID: 3e9f027e-329a-43b4-b9c5-585313e601b7

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot added do-not-merge/needs-area area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/aws PR/issue for AWS (AWSPlatform) platform and removed do-not-merge/needs-area labels Jul 29, 2026
@codecov

codecov Bot commented Jul 29, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 41.66667% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 36.66%. Comparing base (f4c055d) to head (05cc47d).
⚠️ Report is 13 commits behind head on release-4.22.

Files with missing lines Patch % Lines
support/util/containers.go 0.00% 6 Missing ⚠️
...plane/v2/cloud_controller_manager/aws/component.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-4.22    #9156      +/-   ##
================================================
+ Coverage         36.22%   36.66%   +0.44%     
================================================
  Files               774      776       +2     
  Lines             94888    95718     +830     
================================================
+ Hits              34374    35098     +724     
- Misses            57698    57793      +95     
- Partials           2816     2827      +11     
Files with missing lines Coverage Δ
...lane/v2/cloud_controller_manager/aws/deployment.go 100.00% <100.00%> (ø)
...plane/v2/cloud_controller_manager/aws/component.go 0.00% <0.00%> (ø)
support/util/containers.go 33.97% <0.00%> (-1.36%) ⬇️

... and 14 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/jira-refresh

@csrwng
csrwng marked this pull request as ready for review August 3, 2026 08:43
@openshift-ci 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 Aug 3, 2026
@openshift-ci
openshift-ci Bot requested review from csrwng and muraee August 3, 2026 08:43
@csrwng csrwng added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 3, 2026
@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: redhat-chai-bot

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

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/close

@openshift-ci openshift-ci Bot closed this Aug 4, 2026
@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

@PoornimaSingour: Closed this PR.

Details

In response to this:

/close

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.

@openshift-ci-robot

Copy link
Copy Markdown

@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

Summary

Backport of #9053 to release-4.22, adapted to work with the existing support/util package instead of support/podspec (which only exists on main).

The automated cherry-pick (#9155) failed CI because it imported support/podspec, a package introduced on main as part of a larger refactor that hasn't been backported to release-4.22.

Changes

This PR adapts the original #9053 changes for release-4.22:

  • Added FindEnvVar helper to support/util/containers.go — this function existed on main but was missing on release-4.22
  • Created deployment.go — proxy env var injection logic for the AWS cloud-controller-manager, using support/util instead of support/podspec
  • Created deployment_test.go — 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarios
  • Modified component.go — wired adaptDeployment via .WithAdaptFunction()

Testing

  • make build passes (all 6 binaries)
  • go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/... — all 4 new tests pass

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053


@jparrill requested in Slack thread

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

/open

1 similar comment
@PoornimaSingour

Copy link
Copy Markdown
Contributor

/open

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/reopen

@openshift-ci openshift-ci Bot reopened this Aug 4, 2026
@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

@PoornimaSingour: Reopened this PR.

Details

In response to this:

/reopen

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 4, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141, 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 text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-99288 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-99288 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Backport of #9053 to release-4.22, adapted to work with the existing support/util package instead of support/podspec (which only exists on main).

The automated cherry-pick (#9155) failed CI because it imported support/podspec, a package introduced on main as part of a larger refactor that hasn't been backported to release-4.22.

Changes

This PR adapts the original #9053 changes for release-4.22:

  • Added FindEnvVar helper to support/util/containers.go — this function existed on main but was missing on release-4.22
  • Created deployment.go — proxy env var injection logic for the AWS cloud-controller-manager, using support/util instead of support/podspec
  • Created deployment_test.go — 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarios
  • Modified component.go — wired adaptDeployment via .WithAdaptFunction()

Testing

  • make build passes (all 6 binaries)
  • go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/... — all 4 new tests pass

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053


@jparrill requested in Slack thread

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 openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 4, 2026
@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/jira refresh


AI-generated. Review for accuracy.

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/retest


AI-generated. Review for accuracy.

@openshift-ci-robot

Copy link
Copy Markdown

@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141, which is valid.

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 POST, 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-99288 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-99288 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

/jira refresh


AI-generated. Review for accuracy.

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.

@muraee

muraee commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

/lgtm

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

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/retest e2e-azure-self-managed


AI-generated. Review for accuracy.

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/test e2e-azure-self-managed

@vsolanki12

Copy link
Copy Markdown
Contributor

/verified by @vsolanki12

Verification Report — PR #9156

Environment

  • Management cluster: OCP 4.22.6, AWS IPI dual-stack, ap-south-1
  • Hosted cluster: pr9156, OCP 4.22.6, 2 worker nodes
  • CPO image: quay.io/vsolanki/hypershift:pr-9156-2026-08-05 (built from commit 05cc47d)
  1. Unit Tests — PASS (8/8)
  === RUN   TestConfig
  --- PASS: TestConfig (0.00s)
  === RUN   TestConfigErrorStates
  === RUN   TestConfigErrorStates/invalid_load_balancer_health_probe_mode
  --- PASS: TestConfigErrorStates (0.00s)
      --- PASS: TestConfigErrorStates/invalid_load_balancer_health_probe_mode (0.00s)
  === RUN   TestAdaptDeployment
  === RUN   TestAdaptDeployment/When_proxy_environment_variables_are_set,_it_should_add_proxy_env_vars_to_container
  === RUN   TestAdaptDeployment/When_only_HTTP_PROXY_is_set,_it_should_add_HTTP_PROXY_and_NO_PROXY_but_not_HTTPS_PROXY
  === RUN   TestAdaptDeployment/When_only_HTTPS_PROXY_is_set,_it_should_add_HTTPS_PROXY_and_NO_PROXY_but_not_HTTP_PROXY
  === RUN   TestAdaptDeployment/When_no_proxy_is_set,_it_should_not_add_proxy_env_vars
  --- PASS: TestAdaptDeployment (0.00s)
      --- PASS: TestAdaptDeployment/When_proxy_environment_variables_are_set,_it_should_add_proxy_env_vars_to_container (0.00s)
      --- PASS: TestAdaptDeployment/When_only_HTTP_PROXY_is_set,_it_should_add_HTTP_PROXY_and_NO_PROXY_but_not_HTTPS_PROXY (0.00s)
      --- PASS: TestAdaptDeployment/When_only_HTTPS_PROXY_is_set,_it_should_add_HTTPS_PROXY_and_NO_PROXY_but_not_HTTP_PROXY (0.00s)
      --- PASS: TestAdaptDeployment/When_no_proxy_is_set,_it_should_not_add_proxy_env_vars (0.00s)
  PASS
  ok    github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws   0.931s
  1. Live Cluster: No-proxy: PASS

Custom CPO image confirmed: quay.io/vsolanki/hypershift:pr-9156-2026-08-05

CCM has only original AWS env vars:

[
    {"name": "AWS_SHARED_CREDENTIALS_FILE", "value": "/etc/kubernetes/secrets/cloud-provider/credentials"},
    {"name": "AWS_SDK_LOAD_CONFIG", "value": "true"},
    {"name": "AWS_EC2_METADATA_DISABLED", "value": "true"}
]
  1. Live Cluster — Path B: Proxy Injection — PASS
  Patched CPO deployment with proxy env vars:
  oc set env deployment/control-plane-operator -n clusters-pr9156 -c control-plane-operator \
    HTTP_PROXY=http://test-proxy.example.com:3128 \
    HTTPS_PROXY=http://test-proxy.example.com:3128 \
NO_PROXY=localhost,127.0.0.1,.cluster.local,.svc,172.30.0.0/16,10.0.0.0/8,.amazonaws.com,quay.io,.quay.io,registry.redhat.io,.redhat.io,.redhat.com
 After CPO reconcile, CCM container has all 6 env vars:
  [
      {"name": "AWS_SHARED_CREDENTIALS_FILE", "value": "/etc/kubernetes/secrets/cloud-provider/credentials"},
      {"name": "AWS_SDK_LOAD_CONFIG", "value": "true"},
      {"name": "AWS_EC2_METADATA_DISABLED", "value": "true"},
      {"name": "HTTP_PROXY", "value": "http://test-proxy.example.com:3128"},
      {"name": "HTTPS_PROXY", "value": "http://test-proxy.example.com:3128"},
      {"name": "NO_PROXY", "value": ".amazonaws.com,.cluster.local,.quay.io,.redhat.com,.redhat.io,.svc,10.0.0.0/8,127.0.0.1,172.30.0.0/16,kube-apiserver,localhost,quay.io,registry.redhat.io"}
  ]
  1. Guest Cluster Health — PASS
  - Nodes: 2/2 Ready (v1.35.5)
  - Cluster operators: 22/22 Available=True, 0 Degraded

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

Copy link
Copy Markdown

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

Details

In response to this:

/verified by @vsolanki12

Verification Report — PR #9156

Environment

  • Management cluster: OCP 4.22.6, AWS IPI dual-stack, ap-south-1
  • Hosted cluster: pr9156, OCP 4.22.6, 2 worker nodes
  • CPO image: quay.io/vsolanki/hypershift:pr-9156-2026-08-05 (built from commit 05cc47d)
  1. Unit Tests — PASS (8/8)
 === RUN   TestConfig
 --- PASS: TestConfig (0.00s)
 === RUN   TestConfigErrorStates
 === RUN   TestConfigErrorStates/invalid_load_balancer_health_probe_mode
 --- PASS: TestConfigErrorStates (0.00s)
     --- PASS: TestConfigErrorStates/invalid_load_balancer_health_probe_mode (0.00s)
 === RUN   TestAdaptDeployment
 === RUN   TestAdaptDeployment/When_proxy_environment_variables_are_set,_it_should_add_proxy_env_vars_to_container
 === RUN   TestAdaptDeployment/When_only_HTTP_PROXY_is_set,_it_should_add_HTTP_PROXY_and_NO_PROXY_but_not_HTTPS_PROXY
 === RUN   TestAdaptDeployment/When_only_HTTPS_PROXY_is_set,_it_should_add_HTTPS_PROXY_and_NO_PROXY_but_not_HTTP_PROXY
 === RUN   TestAdaptDeployment/When_no_proxy_is_set,_it_should_not_add_proxy_env_vars
 --- PASS: TestAdaptDeployment (0.00s)
     --- PASS: TestAdaptDeployment/When_proxy_environment_variables_are_set,_it_should_add_proxy_env_vars_to_container (0.00s)
     --- PASS: TestAdaptDeployment/When_only_HTTP_PROXY_is_set,_it_should_add_HTTP_PROXY_and_NO_PROXY_but_not_HTTPS_PROXY (0.00s)
     --- PASS: TestAdaptDeployment/When_only_HTTPS_PROXY_is_set,_it_should_add_HTTPS_PROXY_and_NO_PROXY_but_not_HTTP_PROXY (0.00s)
     --- PASS: TestAdaptDeployment/When_no_proxy_is_set,_it_should_not_add_proxy_env_vars (0.00s)
 PASS
 ok    github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws   0.931s
  1. Live Cluster: No-proxy: PASS

Custom CPO image confirmed: quay.io/vsolanki/hypershift:pr-9156-2026-08-05

CCM has only original AWS env vars:

[
    {"name": "AWS_SHARED_CREDENTIALS_FILE", "value": "/etc/kubernetes/secrets/cloud-provider/credentials"},
    {"name": "AWS_SDK_LOAD_CONFIG", "value": "true"},
    {"name": "AWS_EC2_METADATA_DISABLED", "value": "true"}
]
  1. Live Cluster — Path B: Proxy Injection — PASS
 Patched CPO deployment with proxy env vars:
 oc set env deployment/control-plane-operator -n clusters-pr9156 -c control-plane-operator \
   HTTP_PROXY=http://test-proxy.example.com:3128 \
   HTTPS_PROXY=http://test-proxy.example.com:3128 \

NO_PROXY=localhost,127.0.0.1,.cluster.local,.svc,172.30.0.0/16,10.0.0.0/8,.amazonaws.com,quay.io,.quay.io,registry.redhat.io,.redhat.io,.redhat.com

After CPO reconcile, CCM container has all 6 env vars:
 [
     {"name": "AWS_SHARED_CREDENTIALS_FILE", "value": "/etc/kubernetes/secrets/cloud-provider/credentials"},
     {"name": "AWS_SDK_LOAD_CONFIG", "value": "true"},
     {"name": "AWS_EC2_METADATA_DISABLED", "value": "true"},
     {"name": "HTTP_PROXY", "value": "http://test-proxy.example.com:3128"},
     {"name": "HTTPS_PROXY", "value": "http://test-proxy.example.com:3128"},
     {"name": "NO_PROXY", "value": ".amazonaws.com,.cluster.local,.quay.io,.redhat.com,.redhat.io,.svc,10.0.0.0/8,127.0.0.1,172.30.0.0/16,kube-apiserver,localhost,quay.io,registry.redhat.io"}
 ]
  1. Guest Cluster Health — PASS
 - Nodes: 2/2 Ready (v1.35.5)
 - Cluster operators: 22/22 Available=True, 0 Degraded

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
openshift-merge-bot Bot merged commit 66b35d2 into openshift:release-4.22 Aug 5, 2026
30 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@redhat-chai-bot: Jira Issue Verification Checks: Jira Issue OCPBUGS-100141
✔️ 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-100141 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:

Summary

Backport of #9053 to release-4.22, adapted to work with the existing support/util package instead of support/podspec (which only exists on main).

The automated cherry-pick (#9155) failed CI because it imported support/podspec, a package introduced on main as part of a larger refactor that hasn't been backported to release-4.22.

Changes

This PR adapts the original #9053 changes for release-4.22:

  • Added FindEnvVar helper to support/util/containers.go — this function existed on main but was missing on release-4.22
  • Created deployment.go — proxy env var injection logic for the AWS cloud-controller-manager, using support/util instead of support/podspec
  • Created deployment_test.go — 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarios
  • Modified component.go — wired adaptDeployment via .WithAdaptFunction()

Testing

  • make build passes (all 6 binaries)
  • go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/... — all 4 new tests pass

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053


@jparrill requested in Slack thread

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

/jira backport release-4.21

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

Details

In response to this:

/jira backport release-4.21

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

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

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

In response to this:

/jira backport release-4.21

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.

@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: 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.

@PoornimaSingour

Copy link
Copy Markdown
Contributor

/jira backport release-4.20

@openshift-ci-robot

Copy link
Copy Markdown

@PoornimaSingour: Missing required branches for backport chain:

  • release-4.21 OR openshift-4.21,
Details

In response to this:

/jira backport release-4.20

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 4.22.0-0.nightly-2026-08-06-075052

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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/aws PR/issue for AWS (AWSPlatform) platform 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.

9 participants