From fae8cd8da2879c717fc225fc31ce092a9a216454 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Sat, 28 Oct 2023 03:04:17 -0700 Subject: [PATCH 1/3] add a newer PR reference in rc release docs (#2101) Signed-off-by: Arko Dasgupta --- site/content/en/latest/contributions/RELEASING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/en/latest/contributions/RELEASING.md b/site/content/en/latest/contributions/RELEASING.md index f5ec7954f278..f81d5be457d5 100644 --- a/site/content/en/latest/contributions/RELEASING.md +++ b/site/content/en/latest/contributions/RELEASING.md @@ -44,7 +44,7 @@ export GITHUB_REMOTE=origin git push ${GITHUB_REMOTE} release/v${MAJOR_VERSION}.${MINOR_VERSION} ``` -7. Create a topic branch for updating the Envoy proxy image to the tag supported by the release. Reference [PR #958][] +7. Create a topic branch for updating the Envoy proxy image and Envoy Ratelimit image to the tag supported by the release. Reference [PR #2098][] for additional details on updating the image tag. 8. Sign, commit, and push your changes to your fork. 9. Submit a [Pull Request][] to merge the changes into the `release/v${MAJOR_VERSION}.${MINOR_VERSION}` branch. Do not @@ -247,6 +247,6 @@ It's important that the world knows about the release. Use the following steps t [release]: https://github.com/envoyproxy/gateway/releases [Generate]: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes [PR #635]: https://github.com/envoyproxy/gateway/pull/635 -[PR #958]: https://github.com/envoyproxy/gateway/pull/958 +[PR #2098]: https://github.com/envoyproxy/gateway/pull/2098 [PR #1002]: https://github.com/envoyproxy/gateway/pull/1002 [VERSION]: https://github.com/envoyproxy/gateway/blob/main/VERSION From 77445dec77f1dbf64e343f0dd2d7537b6c9b7eb3 Mon Sep 17 00:00:00 2001 From: Xunzhuo Date: Sat, 28 Oct 2023 23:57:59 +0800 Subject: [PATCH 2/3] fix: panic when using nil xdsRouteAction (#2104) Signed-off-by: bitliu --- internal/xds/translator/ratelimit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/xds/translator/ratelimit.go b/internal/xds/translator/ratelimit.go index 36d5c4aa020a..6a3479040791 100644 --- a/internal/xds/translator/ratelimit.go +++ b/internal/xds/translator/ratelimit.go @@ -128,7 +128,7 @@ func (t *Translator) buildRateLimitFilter(irListener *ir.HTTPListener) *hcmv3.Ht // patchRouteWithRateLimit builds rate limit actions and appends to the route. func patchRouteWithRateLimit(xdsRouteAction *routev3.RouteAction, irRoute *ir.HTTPRoute) error { //nolint:unparam // Return early if no rate limit config exists. - if irRoute.RateLimit == nil || irRoute.RateLimit.Global == nil { + if irRoute.RateLimit == nil || irRoute.RateLimit.Global == nil || xdsRouteAction == nil { return nil } From d65ab597196bba840c9ec87dca2676d6b0502a77 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Sat, 28 Oct 2023 23:51:37 -0700 Subject: [PATCH 3/3] remove cors, jwt, rl assignment from route translator (#2105) All the translations and assignments now happen in the policy translators Signed-off-by: Arko Dasgupta --- internal/gatewayapi/route.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go index 90814694d500..4edc6cce86c4 100644 --- a/internal/gatewayapi/route.go +++ b/internal/gatewayapi/route.go @@ -554,9 +554,6 @@ func (t *Translator) processHTTPRouteParentRefListener(route RouteContext, route DirectResponse: routeRoute.DirectResponse, URLRewrite: routeRoute.URLRewrite, Mirrors: routeRoute.Mirrors, - RateLimit: routeRoute.RateLimit, - CORS: routeRoute.CORS, - JWT: routeRoute.JWT, Timeout: routeRoute.Timeout, ExtensionRefs: routeRoute.ExtensionRefs, }