Backport of Fix incorrect protocol for transparent proxy upstreams. into release/1.16.x #18010
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
hc-github-team-consul-core
force-pushed
the
backport/derekm/NET-4679/fix-tproxy-protocol/nationally-splendid-ladybug
branch
from
3bd4e4f
to
521889d
Compare
hc-github-team-consul-core
force-pushed
the
backport/derekm/NET-4679/fix-tproxy-protocol/nationally-splendid-ladybug
branch
from
49f978d
to
39e997e
Compare
github-team-consul-core-pr-approver
approved these changes
Jul 5, 2023
hc-github-team-consul-core
deleted the
backport/derekm/NET-4679/fix-tproxy-protocol/nationally-splendid-ladybug
branch
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 #17894 to be assessed for backporting due to the inclusion of the label backport/1.16.
The below text is copied from the body of the original PR.
This PR fixes a bug that was introduced in: #16021
A user setting a protocol in proxy-defaults would cause tproxy implicit upstreams to not honor the upstream service's protocol set in its
ServiceDefaults.Protocolfield, and would instead always use the proxy-defaults value.Due to the fact that upstreams configured with "tcp" can successfully contact upstream "http" services, this issue was not recognized until recently (a proxy-defaults with "tcp" and a listening service with "http" would make successful requests, but not the opposite).
As a temporary work-around, users experiencing this issue can explicitly set the protocol on the
ServiceDefaults.UpstreamConfig.Overrides, which should take precedence.The fix in this PR removes the proxy-defaults protocol from the wildcard upstream that tproxy uses to configure implicit upstreams. When the protocol was included, it would always overwrite the value during discovery chain compilation, which was not correct. The discovery chain compiler also consumes proxy defaults to determine the protocol, so simply excluding it from the wildcard upstream config map resolves the issue.
Overview of commits