fix: move websocket config under config.route.v3.RouteAction #2683
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
zetaab
force-pushed
the
fix/websocket
branch
from
5e98b6a to
1dccf00
Compare
zetaab
commented
Feb 23, 2024
internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
Outdated
Show resolved
Hide resolved
zetaab
commented
Feb 23, 2024
internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
Outdated
Show resolved
Hide resolved
zetaab
commented
Feb 23, 2024
internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.route.yaml
Outdated
Show resolved
Hide resolved
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2683 +/- ##
==========================================
+ Coverage 63.43% 63.45% +0.01%
==========================================
Files 119 119
Lines 19477 19479 +2
==========================================
+ Hits 12356 12361 +5
+ Misses 6323 6321 -2
+ Partials 798 797 -1 ☔ View full report in Codecov by Sentry. |
zetaab
commented
Feb 23, 2024
Signed-off-by: Jesse Haka <haka.jesse@gmail.com>
Signed-off-by: Jesse Haka <haka.jesse@gmail.com>
zetaab
force-pushed
the
fix/websocket
branch
from
1dccf00 to
2a95896
Compare
arkodg
reviewed
Feb 23, 2024
internal/xds/translator/route.go
Outdated
| @@ -57,20 +57,27 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute) (*routev3.Route, error) { | |||
|
|
|||
| router.Action = &routev3.Route_Route{Route: routeAction} | |||
| default: | |||
| routeAction := buildXdsRouteAction(httpRoute.Destination.Name) | |||
There was a problem hiding this comment.
thanks for improving this logic, it could be further simplified with....
var routeAction *<type>
if httpRoute.BackendWeights.Invalid != 0 {
routeAction = buildXdsWeightedRouteAction(httpRoute)
else {
routeAction = buildXdsRouteAction(httpRoute.Destination.Name)
}
if httpRoute.Mirrors != nil {
routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirrors)
}
Signed-off-by: Jesse Haka <haka.jesse@gmail.com>
shawnh2
approved these changes
Feb 24, 2024
Merged
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.
What type of PR is this?
fix: move websocket config under config.route.v3.RouteAction
What this PR does / why we need it:
If there were 1 grpc route under same listener, the websocket connections did not work at all. This should make websockets working under same listener which contains grpc routes.
Which issue(s) this PR fixes:
Fixes #2632
cc @arkodg