Manual backport 1.15.x of Avoid panic applying TProxy Envoy extensions #17539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zalimeni
added
theme/envoy/xds
zalimeni
force-pushed
the
zalimeni/net-3900-fix-tproxy-extension-panic--1.15.x
branch
from
3876ef3
to
2cec60e
Compare
zalimeni
commented
Jun 1, 2023
| @@ -112,89 +112,12 @@ func (b *BasicEnvoyExtender) Extend(resources *xdscommon.IndexedResources, confi | |||
| } | |||
There was a problem hiding this comment.
Changes in this file are equivalent to the original PR but slightly different due to refactors that did not require backporting
hashi-derek
approved these changes
Jun 1, 2023
zalimeni
force-pushed
the
zalimeni/net-3900-fix-tproxy-extension-panic--1.15.x
branch
from
2cec60e
to
acb24c0
Compare
backport of commit 8c30455
zalimeni
force-pushed
the
zalimeni/net-3900-fix-tproxy-extension-panic--1.15.x
branch
from
acb24c0
to
be7cb47
Compare
zalimeni
commented
Jun 1, 2023
Comment on lines
-114
to
120
| func (b *BasicEnvoyExtender) patchListener(config *RuntimeConfig, l *envoy_listener_v3.Listener) (proto.Message, bool, error) { | ||
| func (b *BasicEnvoyExtender) patchSupportedListenerFilterChains(config *RuntimeConfig, l *envoy_listener_v3.Listener) (proto.Message, bool, error) { | ||
| switch config.Kind { | ||
| case api.ServiceKindTerminatingGateway: | ||
| return b.patchTerminatingGatewayListener(config, l) | ||
| case api.ServiceKindConnectProxy: | ||
| return b.patchConnectProxyListener(config, l) | ||
| case api.ServiceKindTerminatingGateway, api.ServiceKindConnectProxy: | ||
| return b.patchListenerFilterChains(config, l) | ||
| } | ||
| return l, false, nil | ||
| } |
There was a problem hiding this comment.
After double checking the original change that introduced this switch and the matching one above, I restored it to align with that and reduce changes here (I'd originally thought it was more copy-pasta). This could prevent a future bug if we were to support more proxy types for extensions in general without aligning that support with listeners specifically.
No other changes since the last review. I've also re-tested by hand w/ this change.
hashi-derek
approved these changes
Jun 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of commit 8c30455
Description
Manual backport of #17537.
Resolves automated backport PR #17542.