Backport of Avoid panic applying TProxy Envoy extensions into release/1.15.x#17542
Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.15.xfrom
Conversation
7d94518 to
f566a8e
Compare
f566a8e to
7d94518
Compare
|
Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement Learn more about why HashiCorp requires a CLA and what the CLA includes temp seems not to be a GitHub user. Have you signed the CLA already but the status is still pending? Recheck it. |
github-team-consul-core-pr-approver
approved these changes
Jun 1, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
This file contains hidden or 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
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
This PR is auto-generated from #17537 to be assessed for backporting due to the inclusion of the label backport/1.15.
🚨
The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
When
UpstreamEnvoyExtenderwas introduced, some code was left duplicated between it andBasicEnvoyExtender. One path in that code panics when a TProxy listener patch is attempted due to no upstream data inRuntimeConfigmatching the local service (which would only happen in rare cases).Instead, we can remove the special handling of upstream VIPs from
BasicEnvoyExtenderentirely, greatly simplifying the listener filter patch code and avoiding the panic.UpstreamEnvoyExtender, which needs this code to function, is modified to ensure a panic does not occur.This also fixes a second regression in which the Lua extension was not applied to TProxy outbound listeners.
Description
This fixes two regressions caused by #17415.
Testing & Reproduction steps
I've hand-tested this fix in addition to adding tests to guard against the regressions.
PR Checklist
Overview of commits