Skip to content

Conversation

@palonsoro
Copy link

PR to backport #622 to release-4.7. It consists of:

  • Cherry-picking da19127
  • Vendoring golang.org/x/net/http/httpproxy
  • Also cherry-picking 91794f0 and ee66c8a in order to backport some fixes made to CVO scenarios tests. The failures fixed at those commits seemed to impact the CVO scenarios test once da19127 was backported and httpproxy was vendored.

wking and others added 4 commits December 10, 2021 13:50
Since 4.2's ea5e3bc (Add http transport for cincinnati to enable
proxy, 2019-07-16, openshift#219), the CVO has been consuming httpsProxy, but
not httpProxy or noProxy [1].  This commit fixes that.  I'm handing
off the logic that mixes those three together to pick the proxy URI to
the httpproxy library, which is also what the Go standard library uses
for this purpose.

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1978749

Cherry-pick of: e43080d
Generated with:

  $ go mod vendor
  $ go mod tidy

using:

  $ go version
  go version go1.15.15 linux/amd64
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2021

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 openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. labels Dec 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2021

@palonsoro: This pull request references Bugzilla bug 2030628, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1982683 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1982683 targets the "4.8.z" release, which is one of the valid target releases: 4.8.0, 4.8.z
  • bug has dependents

Requesting review from QA contact:
/cc @jianlinliu

Details

In response to this:

Bug 2030628: [release-4.7] Respect noProxy

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/test-infra repository.

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 10, 2021
@palonsoro palonsoro marked this pull request as ready for review December 10, 2021 17:17
@palonsoro
Copy link
Author

/test all

@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 Dec 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2021

@palonsoro: 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/test-infra repository. I understand the commands that are listed here.

@palonsoro
Copy link
Author

/assign @LalatenduMohanty

@LalatenduMohanty
Copy link
Member

/label backport-risk-assessed

@openshift-ci openshift-ci bot 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 Dec 13, 2021
@jiajliu
Copy link
Contributor

jiajliu commented Dec 16, 2021

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 16, 2021
@palonsoro
Copy link
Author

Hi.

Can this PR be reviewed and merged? Is anything else pending to do so?

@jiajliu
Copy link
Contributor

jiajliu commented Mar 14, 2022

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 14, 2022
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$ cherry-pick-diff origin/release-4.7..origin/pr/711 origin/release-4.8
ee66c8a2 -> 18d5957d Fixed the cluster version update verify function
91794f06 -> bcf18a02 Fixed fake client for CVO scenarios test
cdca0adc -> c75e3279 vendor: Include golang.org/x/net/http/httpproxy
da191270 -> a114d6d6 pkg/cvo: Respect noProxy

...just context changes for the three non-vendor picks, and then a bunch of divergence on the httpproxy bump...

which is a clean enough set of backports for me. All four commits are part of #691.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 11, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, palonsoro, wking

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:
  • OWNERS [LalatenduMohanty,wking]

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

@openshift-merge-robot openshift-merge-robot merged commit a684220 into openshift:release-4.7 Apr 11, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 11, 2022

@palonsoro: All pull requests linked via external trackers have merged:

Bugzilla bug 2030628 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2030628: [release-4.7] Respect noProxy

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/test-infra 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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants