Skip to content

Revert "Added no_proxy for step (#80679)"#80785

Open
jcaamano wants to merge 1 commit into
openshift:mainfrom
jcaamano:d01df702bbe-revert
Open

Revert "Added no_proxy for step (#80679)"#80785
jcaamano wants to merge 1 commit into
openshift:mainfrom
jcaamano:d01df702bbe-revert

Conversation

@jcaamano

@jcaamano jcaamano commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

This reverts commit d01df70.

This reason this change was done is to add ...workers.dev to no_proxy but it seems that the pre-step defining the proxy configuration should be doing that. For example, #80666

Summary by CodeRabbit

This PR reverts the addition of hardcoded no_proxy environment variable configuration from the deploy-konflux-operator CI step.

The change modifies the set_proxy function in the deploy-konflux-operator step to source proxy settings from a shared configuration file (${SHARED_DIR}/proxy-conf.sh) when available, rather than exporting proxy bypass lists directly within the step script. This approach delegates proxy configuration to a dedicated pre-step that establishes these settings globally across related CI steps, following the pattern demonstrated in PR #80666.

This affects the OpenShift CI infrastructure's handling of proxy configurations for the Konflux operator deployment step, making proxy management more centralized and maintainable.

@coderabbitai

coderabbitai Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

In deploy-konflux-operator-commands.sh, the set_proxy function no longer exports hardcoded no_proxy/NO_PROXY bypass lists. Instead, it sources ${SHARED_DIR}/proxy-conf.sh when that file exists, delegating proxy environment configuration to the shared file.

Changes

Proxy Configuration Refactor

Layer / File(s) Summary
Replace hardcoded proxy exports with shared file source
ci-operator/step-registry/deploy-konflux-operator/deploy-konflux-operator-commands.sh
Removes the two hardcoded no_proxy/NO_PROXY export lines from set_proxy and sources ${SHARED_DIR}/proxy-conf.sh conditionally instead.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

  • openshift/release#80666: Updates NO_PROXY/no_proxy values (adds workers.dev) in the shared proxy configuration that deploy-konflux-operator will now consume via the sourced proxy-conf.sh.

Suggested labels

lgtm

Suggested reviewers

  • smg247
  • xueqzhan
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title 'Revert "Added no_proxy for step (#80679)"' directly matches the PR objective, which is to revert a previous commit that added no_proxy configuration. The title clearly identifies the primary change.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 Custom check is not applicable to this PR. The check addresses Ginkgo test names in Go code, but this PR modifies a bash shell script in a CI/CD pipeline configuration. The repository contains no G...
Test Structure And Quality ✅ Passed Pull request contains only shell script changes, not Ginkgo test code. Custom check for Ginkgo test quality is not applicable to this PR.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. The only change is a revert to a bash deployment script (deploy-konflux-operator-commands.sh) that modifies proxy configuration handling. This check is...
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR modifies only a bash shell script (deploy-konflux-operator-commands.sh) in the CI operator step registry. It does not add any Ginkgo e2e tests (It(), Describe(), Context(), When(), etc.), s...
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI/CD proxy configuration script, not Kubernetes deployment manifests, operators, or controllers; no scheduling constraints or topology-related changes present.
Ote Binary Stdout Contract ✅ Passed The modified file is a bash shell script for CI operator step registry, not an OTE binary. The check applies only to OTE binaries communicating JSON with openshift-tests, so it's not applicable here.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only modifies a bash script (deploy-konflux-operator-commands.sh) that configures proxy settings - it does not add any Ginkgo e2e tests, so the check is not applicable.
No-Weak-Crypto ✅ Passed PR modifies a bash deployment script with no cryptographic code; no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or insecure token comparisons detected.
Container-Privileges ✅ Passed PR modifies shell script proxy configuration in a CI step. No container security contexts, privileged settings, hostPID/hostNetwork/hostIPC, SYS_ADMIN capabilities, or allowPrivilegeEscalation conf...
No-Sensitive-Data-In-Logs ✅ Passed The PR removes hardcoded exports of internal hostnames (openshift-mirror-list.ci-systems.workers.dev, registry.*.io, s3.us-east-1.amazonaws.com) that were exposing infrastructure details in logs.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci

openshift-ci Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano

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 requested review from ajaggapa and sosiouxme June 19, 2026 11:41
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2026
@jcaamano

Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-ovn-kubernetes-main-e2e-metal-ipi-ovn-dualstack-bgp-local-gw

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@jcaamano: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@jcaamano: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-hypershift-release-4.21-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.20-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.19-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.18-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.17-e2e-kubevirt-metal-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.16-e2e-kubevirt-metal-ovn-conformance openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-main-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.1-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.22-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.21-e2e-agent-connected-ovn-ipv4-metal-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-main-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.1-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-5.0-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.23-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.22-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-hypershift-release-4.21-e2e-kubevirt-metal-ovn-backuprestore openshift/hypershift presubmit Registry content changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-5.1-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-5.0-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.23-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.22-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.21-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed
pull-ci-openshift-machine-config-operator-release-4.20-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed

A total of 287 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant