[release-4.22] OCPBUGS-100141: Add proxy env vars to AWS cloud-controller-manager deployment - #9156
Conversation
…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.
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
|
Skipping CI for Draft Pull Request. |
|
@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
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. Comment |
Codecov Report❌ Patch coverage is
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
🚀 New features to boost your workflow:
|
|
/jira-refresh |
|
[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 DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
/close |
|
@PoornimaSingour: Closed this PR. DetailsIn response to this:
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. |
|
@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. DetailsIn response to this:
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. |
|
/open |
1 similar comment
|
/open |
|
/reopen |
|
@PoornimaSingour: Reopened this PR. DetailsIn response to this:
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. |
|
@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
The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
/jira refresh AI-generated. Review for accuracy. |
|
/retest AI-generated. Review for accuracy. |
|
@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100141, which is valid. 7 validation(s) were run on this bug
DetailsIn response to this:
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. |
|
/lgtm |
|
Scheduling tests matching the |
|
/retest e2e-azure-self-managed AI-generated. Review for accuracy. |
|
/test e2e-azure-self-managed |
|
/verified by @vsolanki12 Verification Report — PR #9156 Environment
Custom CPO image confirmed: quay.io/vsolanki/hypershift:pr-9156-2026-08-05 CCM has only original AWS env vars:
|
|
@vsolanki12: This PR has been marked as verified by DetailsIn response to this:
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. |
66b35d2
into
openshift:release-4.22
|
@redhat-chai-bot: Jira Issue Verification Checks: Jira Issue OCPBUGS-100141 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. 🕓 DetailsIn response to this:
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. |
|
/jira backport release-4.21 |
|
@PoornimaSingour: The following backport issues have been created:
Queuing cherrypicks to the requested branches to be created after this PR merges: DetailsIn response to this:
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: new pull request created: #9224 DetailsIn response to this:
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. |
|
@redhat-chai-bot: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
/jira backport release-4.20 |
|
@PoornimaSingour: Missing required branches for backport chain:
DetailsIn response to this:
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. |
|
Fix included in release 4.22.0-0.nightly-2026-08-06-075052 |
Summary
Backport of #9053 to
release-4.22, adapted to work with the existingsupport/utilpackage instead ofsupport/podspec(which only exists onmain).The automated cherry-pick (#9155) failed CI because it imported
support/podspec, a package introduced onmainas part of a larger refactor that hasn't been backported torelease-4.22.Changes
This PR adapts the original #9053 changes for
release-4.22:FindEnvVarhelper tosupport/util/containers.go— this function existed onmainbut was missing onrelease-4.22deployment.go— proxy env var injection logic for the AWS cloud-controller-manager, usingsupport/utilinstead ofsupport/podspecdeployment_test.go— 4 test cases covering full proxy, HTTP-only, HTTPS-only, and no-proxy scenarioscomponent.go— wiredadaptDeploymentvia.WithAdaptFunction()Testing
make buildpasses (all 6 binaries)go test ./control-plane-operator/controllers/hostedcontrolplane/v2/cloud_controller_manager/aws/...— all 4 new tests passFixes: https://redhat.atlassian.net/browse/OCPBUGS-100141
Backport of: #9053
@jparrill requested in Slack thread