Bug 1820595: Support for specific http proxy for the service by martinkunc · Pull Request #87 · openshift/insights-operator

martinkunc · 2020-03-19T13:46:15Z

This change allows to override proxy passed with Env using support secret.
It uses golang build-in proxy settings, including noproxy logic.

martinkunc · 2020-03-20T12:25:21Z

/retest

martinkunc · 2020-03-21T20:43:53Z

/retest

martinkunc · 2020-03-22T07:17:47Z

/retest

martinkunc · 2020-03-22T09:27:05Z

/retest

martinkunc · 2020-03-22T16:42:07Z

/retest

martinkunc · 2020-03-22T18:33:49Z

/retest

martinkunc · 2020-03-23T06:02:56Z

/retest

tremes · 2020-03-23T07:50:43Z

+		},
+		{
+			Name:       "Env set, specific proxy set noproxy, request without noproxy",
+			EnvValues:  map[string]interface{}{"HTTPS_PROXY": "envsecproxy.to", "NO_PROXY": "envnoproxy.to"},


Not sure about HTTP/S_PROXY values, but shouldn't the NO_PROXY support multiple values?

Hi, it should, there is just no test for that..

martinkunc · 2020-03-24T10:39:07Z

/assign smarterclayton

smarterclayton · 2020-03-26T18:02:58Z

+}
+
+// FromConfig is setting HttpProxy from HttpConfig in support secret, if it is used
+func FromConfig(c config.HTTPConfig) func(req *http.Request) (*url.URL, error) {


ProxyFromConfig as name

Actually, these two methods are confusingly named in general. This should probably be NewProxyFromConfig() in the line above.

I removed them when I moved the logic to authorizer and removed options to simplify a bit.

smarterclayton · 2020-03-26T18:12:08Z


 type Authorizer interface {
 	Authorize(req *http.Request) error
+	HTTPConfig() config.HTTPConfig


Why is the authorizer not handling the proxy setup? It already has all the config info.

I moved it there. If you ment something like a Roundtripper with dynamic injectable Proxy, I can prepare it as well, but at first it seemed a bit too much code.

alexandrevicenzi · 2020-04-01T10:47:19Z

/lgtm

alexandrevicenzi · 2020-04-01T10:55:08Z

@martinkunc we need this in 4.3 as well.

…rtinkunc/insights-operator into allow-specific-http-proxy-from-secret

martinkunc · 2020-04-01T12:35:53Z

I tried to squeeze the changes, which invalidated the lgtms, sorry.

martinkunc · 2020-04-01T13:12:33Z

/retest

alexandrevicenzi

/lgtm

openshift-ci-robot · 2020-04-01T14:31:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexandrevicenzi, martinkunc

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~~ [alexandrevicenzi]

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

openshift-bot · 2020-04-01T14:55:27Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-04-01T15:08:25Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-04-01T17:31:25Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2020-04-03T12:39:07Z

@martinkunc: Bugzilla bug 1805940 is in an unrecognized state (VERIFIED) and will not be moved to the MODIFIED state.

Details

In response to this:

Bug 1805940: Support for specific http proxy for the service

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-robot · 2020-04-03T12:40:28Z

@martinkunc: All pull requests linked via external trackers have merged: . Bugzilla bug 1820595 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1820595: Support for specific http proxy for the service

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-cherrypick-robot · 2020-04-03T13:13:44Z

@martinkunc: #87 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/config/configobserver/configobserver.go
M	pkg/insights/insightsclient/insightsclient.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/insights/insightsclient/insightsclient.go
CONFLICT (content): Merge conflict in pkg/insights/insightsclient/insightsclient.go
Auto-merging pkg/config/configobserver/configobserver.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Patch failed at 0001 Support for specific http proxy for the service

Details

In response to this:

/cherry-pick release-4.4

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-cherrypick-robot · 2020-04-03T13:19:14Z

@martinkunc: #87 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/config/configobserver/configobserver.go
M	pkg/insights/insightsclient/insightsclient.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/insights/insightsclient/insightsclient.go
CONFLICT (content): Merge conflict in pkg/insights/insightsclient/insightsclient.go
Auto-merging pkg/config/configobserver/configobserver.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Patch failed at 0001 Support for specific http proxy for the service

Details

In response to this:

/cherry-pick release-4.3

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.

martinkunc · 2020-04-03T13:57:17Z

/bugzilla refresh

openshift-ci-robot · 2020-04-03T13:57:20Z

@martinkunc: Bugzilla bug 1820595 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

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.

martinkunc · 2020-04-03T14:00:26Z

/bugzilla refresh

openshift-ci-robot · 2020-04-03T14:00:30Z

@martinkunc: All pull requests linked via external trackers have merged: . Bugzilla bug 1820595 has been moved to the MODIFIED state.

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.

Support for specific http proxy for the service

6d35d54

openshift-ci-robot requested review from alexandrevicenzi and mfojtik March 19, 2020 13:48

martinkunc changed the title ~~Support for specific http proxy for the service~~ WIP: Support for specific http proxy for the service Mar 19, 2020

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 19, 2020

Updating vendor folder

f77afd7

Unit tests for specific proxy settings

c503b45

martinkunc changed the title ~~WIP: Support for specific http proxy for the service~~ Support for specific http proxy for the service Mar 20, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 20, 2020

alexandrevicenzi reviewed Mar 20, 2020

View reviewed changes

Comment thread pkg/insights/insightsclient/insightsclient_test.go Outdated

tremes reviewed Mar 23, 2020

View reviewed changes

openshift-ci-robot assigned smarterclayton Mar 24, 2020

Remove commented code block - moved above.

147dca3

smarterclayton reviewed Mar 26, 2020

View reviewed changes

Moving specific proxy to authorizer

d19d8d8

openshift-ci-robot assigned alexandrevicenzi Apr 1, 2020

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 1, 2020

Support for specific http proxy for the service

65e2183

Merge branch 'allow-specific-http-proxy-from-secret' of github.com:ma…

c62662d

…rtinkunc/insights-operator into allow-specific-http-proxy-from-secret

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2020

alexandrevicenzi approved these changes Apr 1, 2020

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2020

openshift-merge-robot merged commit a4560d8 into openshift:master Apr 1, 2020

martinkunc changed the title ~~Support for specific http proxy for the service~~ Bug 1805940: Support for specific http proxy for the service Apr 3, 2020

martinkunc changed the title ~~Bug 1805940: Support for specific http proxy for the service~~ Bug 1820595: Support for specific http proxy for the service Apr 3, 2020

martinkunc mentioned this pull request Apr 7, 2020

Bug 1821149: Cherry-pick release 4.3 Support for specific http proxy for the service #91

Merged

Conversation

martinkunc commented Mar 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

martinkunc commented Mar 20, 2020

Uh oh!

Uh oh!

martinkunc commented Mar 21, 2020

Uh oh!

martinkunc commented Mar 22, 2020

Uh oh!

martinkunc commented Mar 22, 2020

Uh oh!

martinkunc commented Mar 22, 2020

Uh oh!

martinkunc commented Mar 22, 2020

Uh oh!

martinkunc commented Mar 23, 2020

Uh oh!

tremes Mar 23, 2020

Choose a reason for hiding this comment

Uh oh!

martinkunc Mar 24, 2020

Choose a reason for hiding this comment

Uh oh!

martinkunc commented Mar 24, 2020

Uh oh!

smarterclayton Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

smarterclayton Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

martinkunc Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

smarterclayton Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

martinkunc Mar 27, 2020

Choose a reason for hiding this comment

Uh oh!

alexandrevicenzi commented Apr 1, 2020

Uh oh!

alexandrevicenzi commented Apr 1, 2020

Uh oh!

martinkunc commented Apr 1, 2020

Uh oh!

martinkunc commented Apr 1, 2020

Uh oh!

alexandrevicenzi left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Apr 1, 2020

Uh oh!

openshift-bot commented Apr 1, 2020

Uh oh!

openshift-bot commented Apr 1, 2020

Uh oh!

openshift-bot commented Apr 1, 2020

Uh oh!

openshift-ci-robot commented Apr 3, 2020

Uh oh!

openshift-ci-robot commented Apr 3, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 3, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 3, 2020

Uh oh!

martinkunc commented Apr 3, 2020

Uh oh!

openshift-ci-robot commented Apr 3, 2020

Uh oh!

martinkunc commented Apr 3, 2020

Uh oh!

openshift-ci-robot commented Apr 3, 2020

Uh oh!

Reviewers

Assignees

Labels

martinkunc commented Mar 19, 2020 •

edited

Loading