Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Jul 3, 2021

Since 4.2's ea5e3bc (#219), the CVO has been consuming httpsProxy, but not httpProxy or noProxy. This pull request 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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 3, 2021

@wking: This pull request references Bugzilla bug 1978749, which is invalid:

  • expected the bug to target the "4.9.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1978749: pkg/cvo: 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 bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 3, 2021
@openshift-ci openshift-ci bot requested review from jottofar and vrutkovs July 3, 2021 04:41
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2021
@wking
Copy link
Member Author

wking commented Jul 3, 2021

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 3, 2021

@wking: This pull request references Bugzilla bug 1978749, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianlinliu

Details

In response to this:

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

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 3, 2021
@openshift-ci openshift-ci bot requested a review from jianlinliu July 3, 2021 04:42
@wking wking force-pushed the no-proxy branch 2 times, most recently from 521887e to eb670b0 Compare July 3, 2021 05:01
wking added 2 commits July 5, 2021 15:31
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
Generated with:

  $ go mod vendor
  $ go mod tidy

using:

  $ go version
  go version go1.16.4 linux/arm64
@jottofar
Copy link
Contributor

jottofar commented Jul 7, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jottofar, 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:

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 256eea4 into openshift:master Jul 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 7, 2021

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

Bugzilla bug 1978749 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1978749: pkg/cvo: 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.

@wking wking deleted the no-proxy branch July 7, 2021 17:58
@wking
Copy link
Member Author

wking commented Oct 6, 2021

/cherrypick release-4.8

@openshift-cherrypick-robot

@wking: #622 failed to apply on top of branch "release-4.8":

Applying: pkg/cvo: Respect noProxy
Using index info to reconstruct a base tree...
M	pkg/cincinnati/cincinnati.go
M	pkg/cvo/cvo.go
M	pkg/cvo/egress.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cvo/egress.go
CONFLICT (content): Merge conflict in pkg/cvo/egress.go
Auto-merging pkg/cvo/cvo.go
Auto-merging pkg/cincinnati/cincinnati.go
CONFLICT (content): Merge conflict in pkg/cincinnati/cincinnati.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pkg/cvo: Respect noProxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.8

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. 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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants