Backport of [NET-6305] xds: Ensure v2 route match and protocol are populated for gRPC into release/1.17.x#19366
Merged
zalimeni merged 2 commits intoOct 25, 2023
Conversation
a6049ae to
e2c64cc
Compare
8d87e83 to
782bcdb
Compare
github-team-consul-core-pr-approver
approved these changes
Oct 25, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
782bcdb to
8572f73
Compare
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 #19343 to be assessed for backporting due to the inclusion of the label backport/1.17.
The below text is copied from the body of the original PR.
Description
Because the default matches generated for gRPC contain a single empty
GRPCRouteMatch, and that proto does not directly support prefix-based config, an interpretation of the empty struct is needed to generate the same output that theHTTPRouteMatchis explicitly configured to provide in internal/mesh/internal/controllers/routes/generate.go.Add explicit protocol in
ProxyStateTemplatebuilders and validate itis always set on clusters. This ensures that HTTP filters and
http2_protocol_optionsare populated in all the necessary places forgRPC traffic and prevents future unintended omissions of non-TCP
protocols.
PR Checklist
Overview of commits