Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual backport 1.15.x of Disable remote proxy patching except AWS Lambda #17432

Conversation

zalimeni
Copy link
Member

backport of commit ba18381

Description

Manual backport of #17415.

Resolves automated backport PR #17428.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch from 9ee0655 to 2706524 Compare May 23, 2023 14:40
@github-actions github-actions bot added theme/api Relating to the HTTP API interface theme/envoy/xds Related to Envoy support labels May 23, 2023
@zalimeni zalimeni force-pushed the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch from 2706524 to 453bdc6 Compare May 23, 2023 14:44
@zalimeni zalimeni added pr/no-changelog PR does not need a corresponding .changelog entry theme/envoy/xds Related to Envoy support theme/security and removed theme/api Relating to the HTTP API interface theme/envoy/xds Related to Envoy support labels May 23, 2023
@zalimeni zalimeni force-pushed the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch from 453bdc6 to dfbbed3 Compare May 23, 2023 15:10
@zalimeni zalimeni requested review from hashi-derek and ndhanushkodi and removed request for hashi-derek May 23, 2023 15:37
@zalimeni zalimeni marked this pull request as ready for review May 23, 2023 15:37
api/go.mod Show resolved Hide resolved
@zalimeni zalimeni force-pushed the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch from dfbbed3 to b4dcfc5 Compare May 23, 2023 16:46
Copy link
Member Author

@zalimeni zalimeni left a comment

Choose a reason for hiding this comment

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

I've noted the only differences between main and 1.15 here; beyond moved references and fatter tests, there are no functional changes. Happy to discuss any specifics if helpful, though.

Comment on lines +222 to +230
Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
dbService: {
SNI: map[string]struct{}{
"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
},
EnvoyID: "db",
OutgoingProxyKind: "connect-proxy",
},
},
Copy link
Member Author

Choose a reason for hiding this comment

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

This additional test data existed in main, so I brought it over for a more complete test and parity.

@@ -0,0 +1,47 @@
package extensioncommon
Copy link
Member Author

Choose a reason for hiding this comment

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

This file was added after 1.15 as a home for several other helpers that were made exported; I opted to add only the net-new ones from my original PR rather than recreate those migrations (needlessly, since they're defined and used privately in this release branch).

@zalimeni zalimeni requested review from erichaberkorn and cthain and removed request for ndhanushkodi May 23, 2023 18:03
Copy link
Member

@hashi-derek hashi-derek left a comment

Choose a reason for hiding this comment

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

Approving the go.mod changes for this backport. I'm assuming that the original enterprise review was correct on content.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch from b4dcfc5 to d2a9daf Compare May 25, 2023 01:02
@zalimeni
Copy link
Member Author

Rebased for merge

@zalimeni zalimeni merged commit 66f7d7b into release/1.15.x May 25, 2023
106 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-3900-only-apply-remote-upstream-extension-aws-lambda/1.15.x branch May 25, 2023 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry theme/envoy/xds Related to Envoy support theme/security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants