Introduce GRPC_PROXY EnvVar Support by awgreene · Pull Request #2364 · operator-framework/operator-lifecycle-manager

awgreene · 2021-09-17T19:56:19Z

Introduce the ability to specify a dial context for GRPC connections.

openshift-ci · 2021-09-17T19:56:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene

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

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

awgreene · 2021-09-17T20:10:40Z

Please take a look @kevinrizza @estroz

tylerslaton

Couple of questions! Looks good.

awgreene · 2021-09-17T21:31:13Z

/retest

njhale

design questions

awgreene · 2021-09-21T15:14:36Z

/hold

awgreene · 2021-09-28T17:18:03Z

/unhold

kevinrizza · 2021-09-28T18:27:53Z

/lgtm

njhale · 2021-09-28T18:33:47Z

/hold

looks like some related unit tests are failing.

njhale

sorry for the late review here, but spotted a few things of note:

njhale · 2021-09-28T18:41:49Z

 	_ = s.Remove(key)

-	conn, err := grpc.Dial(address, grpc.WithInsecure())
+	conn, err := grpcConnection(address)


Can we abstract the dial logic away? maybe take a Dailer as a field of SourceStore?

If we pursue this option wouldn't the connection to the proxy need to remain open indefinitely?

njhale · 2021-09-28T18:43:18Z

+		HTTPProxy:  getGRPCProxyEnv(),
+		HTTPSProxy: getGRPCProxyEnv(),
+		NoProxy:    getEnvAny("NO_PROXY", "no_proxy"),
+		CGI:        os.Getenv("REQUEST_METHOD") != "",


nit: We should probably memoize these so we don't fetch them for every dial.

This seems reasonable but would make the values static, which likely isn't a problem given how deployments and pods work.

njhale · 2021-09-28T18:48:28Z

/lgtm
/hold cancel

looks like the unit test may have been on a stale commit

Introduce the ability to specify a dial context for GRPC connections. Signed-off-by: Alexander Greene <greene.al1991@gmail.com>

kevinrizza · 2021-09-28T20:44:46Z

/lgtm

openshift-cherrypick-robot · 2021-09-30T14:22:29Z

@awgreene: #2364 failed to apply on top of branch "release-4.9":

Applying: Introduce GRPC_PROXY EnvVar Support
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/controller/registry/grpc/source.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging pkg/controller/registry/grpc/source.go
CONFLICT (content): Merge conflict in pkg/controller/registry/grpc/source.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Introduce GRPC_PROXY EnvVar Support
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:

/cherry-pick release-4.9

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.

This reverts commit afc0848.

openshift-ci Bot requested review from njhale and timflannagan September 17, 2021 19:56

openshift-ci Bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 17, 2021

awgreene force-pushed the grpc-proxy branch from be37352 to b037c55 Compare September 17, 2021 20:08

openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 17, 2021

tylerslaton reviewed Sep 17, 2021

View reviewed changes

Comment thread pkg/controller/registry/grpc/source.go Outdated

Comment thread pkg/controller/registry/grpc/source.go

awgreene force-pushed the grpc-proxy branch 2 times, most recently from 5ccf427 to c0e0e4f Compare September 17, 2021 21:24

awgreene force-pushed the grpc-proxy branch from c0e0e4f to f454e9b Compare September 17, 2021 21:37

njhale reviewed Sep 20, 2021

View reviewed changes

Comment thread pkg/controller/registry/grpc/source.go

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 21, 2021

timflannagan reviewed Sep 28, 2021

View reviewed changes

Comment thread go.mod

awgreene force-pushed the grpc-proxy branch from f454e9b to 99ee72c Compare September 28, 2021 16:42

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2021

awgreene force-pushed the grpc-proxy branch from 0f26cbe to 98872ac Compare September 28, 2021 17:31

openshift-ci Bot assigned kevinrizza Sep 28, 2021

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2021

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2021

njhale reviewed Sep 28, 2021

View reviewed changes

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2021

openshift-ci Bot assigned njhale Sep 28, 2021

Introduce GRPC_PROXY EnvVar Support

31c7815

Introduce the ability to specify a dial context for GRPC connections. Signed-off-by: Alexander Greene <greene.al1991@gmail.com>

awgreene force-pushed the grpc-proxy branch from 98872ac to 31c7815 Compare September 28, 2021 19:33

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2021

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2021

openshift-merge-robot merged commit afc0848 into operator-framework:master Sep 28, 2021

timflannagan added a commit to timflannagan/operator-lifecycle-manager that referenced this pull request Oct 5, 2021

Revert "Introduce GRPC_PROXY EnvVar Support (operator-framework#2364)"

17d0b76

This reverts commit afc0848.

timflannagan added a commit to timflannagan/operator-lifecycle-manager that referenced this pull request Oct 6, 2021

Revert "Introduce GRPC_PROXY EnvVar Support (operator-framework#2364)"

54021c5

This reverts commit afc0848.

njhale mentioned this pull request Oct 18, 2021

Bug 2011927: Introduce GRPC_PROXY EnvVar Support (#2364) openshift/operator-framework-olm#206

Merged

Conversation

awgreene commented Sep 17, 2021

Uh oh!

openshift-ci Bot commented Sep 17, 2021

Uh oh!

awgreene commented Sep 17, 2021

Uh oh!

tylerslaton left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

awgreene commented Sep 17, 2021

Uh oh!

njhale left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

awgreene commented Sep 21, 2021

Uh oh!

Uh oh!

awgreene commented Sep 28, 2021

Uh oh!

kevinrizza commented Sep 28, 2021

Uh oh!

njhale commented Sep 28, 2021

Uh oh!

njhale left a comment

Choose a reason for hiding this comment

Uh oh!

njhale Sep 28, 2021

Choose a reason for hiding this comment

Uh oh!

awgreene Sep 28, 2021

Choose a reason for hiding this comment

Uh oh!

njhale Sep 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

awgreene Sep 28, 2021

Choose a reason for hiding this comment

Uh oh!

njhale commented Sep 28, 2021

Uh oh!

kevinrizza commented Sep 28, 2021

Uh oh!

openshift-cherrypick-robot commented Sep 30, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

njhale Sep 28, 2021 •

edited

Loading