From 1f38e52f5e4a92225402f420d27aa37c7483ebfd Mon Sep 17 00:00:00 2001 From: Ilya Lobkov Date: Mon, 16 May 2022 20:06:18 +0700 Subject: [PATCH 1/5] chore(envoy): update to 1.22.0 Signed-off-by: Ilya Lobkov --- mk/envoy.mk | 2 +- .../gateway/testdata/01-gateway-listener.yaml | 2 ++ .../gateway/testdata/02-gateway-listener.yaml | 4 ++++ .../gateway/testdata/03-gateway-listener.yaml | 2 ++ .../gateway/testdata/04-gateway-listener.yaml | 2 ++ .../gateway/testdata/05-gateway-listener.yaml | 8 ++++++++ .../gateway/testdata/http/01-gateway-route.yaml | 2 ++ .../gateway/testdata/http/02-gateway-route.yaml | 2 ++ .../gateway/testdata/http/03-gateway-route.yaml | 2 ++ .../gateway/testdata/http/04-gateway-route.yaml | 2 ++ .../gateway/testdata/http/05-gateway-route.yaml | 2 ++ .../gateway/testdata/http/06-gateway-route.yaml | 2 ++ .../gateway/testdata/http/07-gateway-route.yaml | 2 ++ .../gateway/testdata/http/08-gateway-route.yaml | 2 ++ .../gateway/testdata/http/09-gateway-route.yaml | 2 ++ .../gateway/testdata/http/10-gateway-route.yaml | 2 ++ .../gateway/testdata/http/11-gateway-route.yaml | 2 ++ .../gateway/testdata/http/12-gateway-route.yaml | 2 ++ .../gateway/testdata/http/13-gateway-route.yaml | 2 ++ .../gateway/testdata/http/14-gateway-route.yaml | 2 ++ .../gateway/testdata/http/15-gateway-route.yaml | 2 ++ .../gateway/testdata/http/16-gateway-route.yaml | 2 ++ .../gateway/testdata/http/17-gateway-route.yaml | 2 ++ .../gateway/testdata/http/18-gateway-route.yaml | 2 ++ .../gateway/testdata/http/19-gateway-route.yaml | 2 ++ .../gateway/testdata/http/20-gateway-route.yaml | 2 ++ .../gateway/testdata/http/21-gateway-route.yaml | 2 ++ .../gateway/testdata/http/22-gateway-route.yaml | 2 ++ .../gateway/testdata/http/23-gateway-route.yaml | 2 ++ .../gateway/testdata/http/24-gateway-route.yaml | 2 ++ .../gateway/testdata/http/25-gateway-route.yaml | 2 ++ .../gateway/testdata/http/26-gateway-route.yaml | 2 ++ .../gateway/testdata/https/01-gateway-route.yaml | 2 ++ .../gateway/testdata/https/02-gateway-route.yaml | 2 ++ .../gateway/testdata/https/03-gateway-route.yaml | 2 ++ .../gateway/testdata/https/04-gateway-route.yaml | 2 ++ .../gateway/testdata/https/05-gateway-route.yaml | 2 ++ .../gateway/testdata/https/06-gateway-route.yaml | 2 ++ .../gateway/testdata/https/07-gateway-route.yaml | 2 ++ .../gateway/testdata/https/08-gateway-route.yaml | 2 ++ .../gateway/testdata/https/09-gateway-route.yaml | 2 ++ .../gateway/testdata/https/10-gateway-route.yaml | 2 ++ .../gateway/testdata/https/11-gateway-route.yaml | 2 ++ .../gateway/testdata/https/12-gateway-route.yaml | 2 ++ .../gateway/testdata/https/13-gateway-route.yaml | 2 ++ .../gateway/testdata/https/14-gateway-route.yaml | 2 ++ .../gateway/testdata/https/15-gateway-route.yaml | 2 ++ .../gateway/testdata/https/16-gateway-route.yaml | 2 ++ .../gateway/testdata/https/17-gateway-route.yaml | 2 ++ .../gateway/testdata/https/18-gateway-route.yaml | 2 ++ .../gateway/testdata/https/19-gateway-route.yaml | 2 ++ .../gateway/testdata/https/20-gateway-route.yaml | 6 ++++++ .../gateway/testdata/https/21-gateway-route.yaml | 2 ++ .../gateway/testdata/https/22-gateway-route.yaml | 2 ++ .../gateway/testdata/https/23-gateway-route.yaml | 2 ++ .../gateway/testdata/https/24-gateway-route.yaml | 2 ++ .../gateway/testdata/https/25-gateway-route.yaml | 2 ++ .../gateway/testdata/https/26-gateway-route.yaml | 2 ++ pkg/xds/envoy/listeners/filter_chain_builder.go | 6 ++++++ .../http_connection_manager_configurer_test.go | 6 ++++++ .../listeners/v3/fault_injection_configurer_test.go | 6 ++++++ .../envoy/listeners/v3/grpc_stats_configurer_test.go | 2 ++ .../listeners/v3/http_access_log_configurer_test.go | 6 ++++++ .../v3/http_connection_manager_configurer_test.go | 2 ++ .../v3/http_inbound_routes_configurer_test.go | 6 ++++++ .../v3/http_outbound_route_configurer_test.go | 4 ++++ .../envoy/listeners/v3/http_route_configurer_test.go | 2 ++ .../envoy/listeners/v3/rate_limit_configurer_test.go | 2 ++ pkg/xds/envoy/listeners/v3/retry_configurer_test.go | 8 ++++++++ .../listeners/v3/static_endpoints_configurer_test.go | 2 ++ .../envoy/listeners/v3/tracing_configurer_test.go | 8 ++++++++ .../testdata/01.externalservice-only.golden.yaml | 2 ++ .../egress/testdata/03.mixed-services.golden.yaml | 4 ++++ ...04.mixed-services-custom-trafficroute.golden.yaml | 2 ++ ...rvices-with-custom-trafficpermissions.golden.yaml | 4 ++++ ...-services-with-external-in-other-zone.golden.yaml | 2 ++ .../generator/prometheus_endpoint_generator_test.go | 5 +++++ .../testdata/admin/01.envoy-config.golden.yaml | 4 ++++ .../inbound-proxy/3-envoy-config.golden.yaml | 4 ++++ .../inbound-proxy/4-envoy-config.golden.yaml | 4 ++++ .../inbound-proxy/5-envoy-config.golden.yaml | 12 ++++++++++++ .../inbound-proxy/6-envoy-config.golden.yaml | 12 ++++++++++++ .../testdata/outbound-proxy/03.envoy.golden.yaml | 6 ++++++ .../testdata/outbound-proxy/04.envoy.golden.yaml | 2 ++ .../testdata/outbound-proxy/05.envoy.golden.yaml | 2 ++ .../testdata/outbound-proxy/06.envoy.golden.yaml | 2 ++ .../testdata/outbound-proxy/08.envoy.golden.yaml | 6 ++++++ .../generator/testdata/probe/01.envoy.golden.yaml | 2 ++ .../generator/testdata/probe/03.envoy.golden.yaml | 2 ++ .../generator/testdata/probe/04.envoy.golden.yaml | 2 ++ .../profile-source/1-envoy-config.golden.yaml | 4 ++++ .../profile-source/2-envoy-config.golden.yaml | 4 ++++ .../profile-source/3-envoy-config.golden.yaml | 10 ++++++++++ .../profile-source/4-envoy-config.golden.yaml | 10 ++++++++++ .../custom.envoy-config.golden.yaml | 2 ++ .../default-mtls.envoy-config.golden.yaml | 4 ++++ ...default-without-hijacker.envoy-config.golden.yaml | 2 ++ .../default.envoy-config.golden.yaml | 2 ++ tools/envoy/fetch.sh | 8 +------- tools/envoy/version.sh | 8 +++++++- tools/releases/distros.sh | 2 +- tools/releases/docker.sh | 2 +- 102 files changed, 314 insertions(+), 11 deletions(-) diff --git a/mk/envoy.mk b/mk/envoy.mk index 2a55fb85ec89..a86ae41ad944 100644 --- a/mk/envoy.mk +++ b/mk/envoy.mk @@ -2,7 +2,7 @@ KUMA_DIR ?= . BUILD_ENVOY_FROM_SOURCES ?= false -ENVOY_TAG ?= v1.21.1 # commit hash or git tag +ENVOY_TAG ?= v1.22.0 # commit hash or git tag # Remember to update pkg/version/compatibility.go ENVOY_VERSION = $(shell ${KUMA_DIR}/tools/envoy/version.sh ${ENVOY_TAG}) diff --git a/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml index 493199021c89..f72c125e87d3 100644 --- a/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml @@ -33,6 +33,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml index 447a6d1a0d35..c20790896ff6 100644 --- a/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml @@ -33,6 +33,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -86,6 +88,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml index 1450d92af569..76ffdd3080c6 100644 --- a/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml @@ -33,6 +33,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml index 3c657046e823..5be7a184457e 100644 --- a/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml @@ -42,6 +42,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml index cb163f012419..ce8302d231e0 100644 --- a/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml +++ b/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml @@ -40,6 +40,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -102,6 +104,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -164,6 +168,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -224,6 +230,8 @@ Resources: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml index 9c27ca42a95b..c0cb3f48009d 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/01-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml index c7578adfc200..978ff0327138 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/02-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml index edb412fe7ee7..ed9d03018b33 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/03-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml index 5b9cada3d200..ba4579ee260b 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/04-gateway-route.yaml @@ -110,6 +110,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml index dccd7d589b73..af72fdde2e80 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/05-gateway-route.yaml @@ -38,6 +38,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml index c4baf9755b77..4390c33f9bf8 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/06-gateway-route.yaml @@ -110,6 +110,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml index 12025cd81a9c..da388e52c64e 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/07-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml index e27fa1379df4..da2745b5901e 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/08-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml index 3b5efc3a29cf..e5c1fff7b258 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/09-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml index e8bf196ae0ed..d59105279d7f 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/10-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml index c5b3b171bc33..9d02dcf6e6b0 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/11-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml index 3744c70b61fa..169eae066bcf 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/12-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml index a94312267ccb..54923291e77c 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/13-gateway-route.yaml @@ -167,6 +167,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml index 83611df7860c..36a5ca77852d 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/14-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml index 3796d331ff66..e4b8d0cfe186 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/15-gateway-route.yaml @@ -167,6 +167,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml index 361b41d740e5..41475a9b8743 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/16-gateway-route.yaml @@ -164,6 +164,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml index 8225bfe80dc7..a60e449a273b 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/17-gateway-route.yaml @@ -185,6 +185,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml index cf9f38392d89..2e407a77b3b2 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/18-gateway-route.yaml @@ -78,6 +78,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml index b071d8812e1d..f915c2dbe58c 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/19-gateway-route.yaml @@ -90,6 +90,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml index c8c4edae0964..d210f8d865de 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/20-gateway-route.yaml @@ -167,6 +167,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml index a9c5c7d947b2..f7050f12b408 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/21-gateway-route.yaml @@ -167,6 +167,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml index 7e20b626a29b..475eae0daff3 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/22-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml index 5bd6c5064519..f6c1c544616f 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/23-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml index 5bd6c5064519..f6c1c544616f 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/24-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml index 42e9243b2daa..f792eb768bd4 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/25-gateway-route.yaml @@ -103,6 +103,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml index 689e0a2d2b53..f0045013e3bc 100644 --- a/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/http/26-gateway-route.yaml @@ -89,6 +89,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml index 9c27ca42a95b..c0cb3f48009d 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/01-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml index c7578adfc200..978ff0327138 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/02-gateway-route.yaml @@ -81,6 +81,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml index 46fe4c056944..955ea8c0c73a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/03-gateway-route.yaml @@ -88,6 +88,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml index 374a179624a1..e3326ba617a8 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/04-gateway-route.yaml @@ -117,6 +117,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml index 9324fe313e87..3988e6170e43 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/05-gateway-route.yaml @@ -45,6 +45,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml index 09d5665a5cb2..c8462023adab 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/06-gateway-route.yaml @@ -117,6 +117,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml index 4e4107653bef..f265efdee16e 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/07-gateway-route.yaml @@ -88,6 +88,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml index 44cffeb0e42f..bf377cd2665a 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/08-gateway-route.yaml @@ -131,6 +131,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml index 246c96907160..d4202fbe792b 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/09-gateway-route.yaml @@ -88,6 +88,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml index ddb10e18d01c..5fa4b66e868c 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/10-gateway-route.yaml @@ -131,6 +131,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml index 2da18a62964b..607003196cf2 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/11-gateway-route.yaml @@ -131,6 +131,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml index a55d39debbc6..a3af43abfb57 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/12-gateway-route.yaml @@ -88,6 +88,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml index e38b5bdd4914..5dd1d23e515d 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/13-gateway-route.yaml @@ -174,6 +174,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml index ec6d93f638e8..73c65e9bfd35 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/14-gateway-route.yaml @@ -88,6 +88,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml index 935c3f570efc..8a09cc45dd44 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/15-gateway-route.yaml @@ -174,6 +174,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml index 902e4e8d1ac8..d7e7a064d421 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/16-gateway-route.yaml @@ -171,6 +171,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml index d37607f43ebd..71e3406e88e4 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/17-gateway-route.yaml @@ -192,6 +192,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml index 807464b4e6be..ebe46ded7a6e 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/18-gateway-route.yaml @@ -85,6 +85,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml index c447f0f0c490..59fbf8e457b0 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/19-gateway-route.yaml @@ -97,6 +97,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml index ca132f6a9b7f..966e5b4c6488 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/20-gateway-route.yaml @@ -174,6 +174,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -236,6 +238,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: @@ -298,6 +302,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml index 93956992194a..15b4479e01fd 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/21-gateway-route.yaml @@ -174,6 +174,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml index 7e20b626a29b..475eae0daff3 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/22-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml index 5bd6c5064519..f6c1c544616f 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/23-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml index 5bd6c5064519..f6c1c544616f 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/24-gateway-route.yaml @@ -124,6 +124,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml index 2d6cbc5153ff..304abf553213 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/25-gateway-route.yaml @@ -110,6 +110,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml b/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml index 6df46bfde718..15129bb0da06 100644 --- a/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml +++ b/pkg/plugins/runtime/gateway/testdata/https/26-gateway-route.yaml @@ -96,6 +96,8 @@ Listeners: responseDirectionConfig: disableOnEtagHeader: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true rds: diff --git a/pkg/xds/envoy/listeners/filter_chain_builder.go b/pkg/xds/envoy/listeners/filter_chain_builder.go index 7ce7fc578816..e5e9bdf53188 100644 --- a/pkg/xds/envoy/listeners/filter_chain_builder.go +++ b/pkg/xds/envoy/listeners/filter_chain_builder.go @@ -5,6 +5,7 @@ import ( envoy_hcm "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" envoy_types "github.com/envoyproxy/go-control-plane/pkg/cache/types" "github.com/pkg/errors" + "google.golang.org/protobuf/types/known/anypb" "github.com/kumahq/kuma/pkg/xds/envoy" v3 "github.com/kumahq/kuma/pkg/xds/envoy/listeners/v3" @@ -65,6 +66,11 @@ func (b *FilterChainBuilder) Build() (envoy_types.Resource, error) { _ = v3.UpdateHTTPConnectionManager(&filterChain, func(hcm *envoy_hcm.HttpConnectionManager) error { router := &envoy_hcm.HttpFilter{ Name: "envoy.filters.http.router", + ConfigType: &envoy_hcm.HttpFilter_TypedConfig{ + TypedConfig: &anypb.Any{ + TypeUrl: "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router", + }, + }, } hcm.HttpFilters = append(hcm.HttpFilters, router) return nil diff --git a/pkg/xds/envoy/listeners/http_connection_manager_configurer_test.go b/pkg/xds/envoy/listeners/http_connection_manager_configurer_test.go index ce36fc1be7d9..4566adf53934 100644 --- a/pkg/xds/envoy/listeners/http_connection_manager_configurer_test.go +++ b/pkg/xds/envoy/listeners/http_connection_manager_configurer_test.go @@ -47,6 +47,8 @@ var _ = Describe("HttpConnectionManager Configurers", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router serverName: test-server statPrefix: test`, }), @@ -60,6 +62,8 @@ var _ = Describe("HttpConnectionManager Configurers", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router mergeSlashes: true normalizePath: true statPrefix: test`, @@ -74,6 +78,8 @@ var _ = Describe("HttpConnectionManager Configurers", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: test stripAnyHostPort: true`, }), diff --git a/pkg/xds/envoy/listeners/v3/fault_injection_configurer_test.go b/pkg/xds/envoy/listeners/v3/fault_injection_configurer_test.go index c32c52ec15cf..93ef56d73c23 100644 --- a/pkg/xds/envoy/listeners/v3/fault_injection_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/fault_injection_configurer_test.go @@ -72,6 +72,8 @@ var _ = Describe("FaultInjectionConfigurer", func() { googleRe2: {} regex: '.*&tag1=[^&]*value1[,&].*&tag2=[^&]*value2[,&].*' - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: stats`, }), Entry("2 policy selectors", testCase{ @@ -118,6 +120,8 @@ var _ = Describe("FaultInjectionConfigurer", func() { googleRe2: {} regex: '(.*&tag1=[^&]*value1m1[,&].*&tag2=[^&]*value2m1[,&].*|.*&tag1=[^&]*value1m2[,&].*&tag2=[^&]*value2m2[,&].*)' - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: stats`, }), Entry("should preserve the order of passed policies", testCase{ @@ -221,6 +225,8 @@ var _ = Describe("FaultInjectionConfigurer", func() { googleRe2: {} regex: .*&tag1=.*&tag2=.* - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: stats`, }), ) diff --git a/pkg/xds/envoy/listeners/v3/grpc_stats_configurer_test.go b/pkg/xds/envoy/listeners/v3/grpc_stats_configurer_test.go index b659038cf196..f99a368c2ca0 100644 --- a/pkg/xds/envoy/listeners/v3/grpc_stats_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/grpc_stats_configurer_test.go @@ -41,6 +41,8 @@ var _ = Describe("gRPCStatsConfigurer", func() { emitFilterState: true statsForAllMethods: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: stats`, }), ) diff --git a/pkg/xds/envoy/listeners/v3/http_access_log_configurer_test.go b/pkg/xds/envoy/listeners/v3/http_access_log_configurer_test.go index 08ebefe398bd..6965f7ba3380 100644 --- a/pkg/xds/envoy/listeners/v3/http_access_log_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/http_access_log_configurer_test.go @@ -89,6 +89,8 @@ var _ = Describe("HttpAccessLogConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: backend trafficDirection: OUTBOUND `, @@ -127,6 +129,8 @@ var _ = Describe("HttpAccessLogConfigurer", func() { path: /tmp/log httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: backend name: outbound:127.0.0.1:27070 trafficDirection: OUTBOUND`, @@ -179,6 +183,8 @@ var _ = Describe("HttpAccessLogConfigurer", func() { transportApiVersion: V3 httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: backend name: outbound:127.0.0.1:27070 trafficDirection: OUTBOUND`, diff --git a/pkg/xds/envoy/listeners/v3/http_connection_manager_configurer_test.go b/pkg/xds/envoy/listeners/v3/http_connection_manager_configurer_test.go index 00d441e3e3d1..4676c4c14434 100644 --- a/pkg/xds/envoy/listeners/v3/http_connection_manager_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/http_connection_manager_configurer_test.go @@ -62,6 +62,8 @@ var _ = Describe("HttpConnectionManagerConfigurer", func() { statPrefix: localhost_8080 httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router `, }), ) diff --git a/pkg/xds/envoy/listeners/v3/http_inbound_routes_configurer_test.go b/pkg/xds/envoy/listeners/v3/http_inbound_routes_configurer_test.go index 7cf9a354196a..47819f5370e5 100644 --- a/pkg/xds/envoy/listeners/v3/http_inbound_routes_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/http_inbound_routes_configurer_test.go @@ -99,6 +99,8 @@ var _ = Describe("HttpInboundRouteConfigurer", func() { uri: true httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend validateClusters: false @@ -161,6 +163,8 @@ var _ = Describe("HttpInboundRouteConfigurer", func() { uri: true httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend validateClusters: false @@ -253,6 +257,8 @@ var _ = Describe("HttpInboundRouteConfigurer", func() { uri: true httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend validateClusters: false diff --git a/pkg/xds/envoy/listeners/v3/http_outbound_route_configurer_test.go b/pkg/xds/envoy/listeners/v3/http_outbound_route_configurer_test.go index b74164887177..36f21ca0cd15 100644 --- a/pkg/xds/envoy/listeners/v3/http_outbound_route_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/http_outbound_route_configurer_test.go @@ -83,6 +83,8 @@ var _ = Describe("HttpOutboundRouteConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend validateClusters: false @@ -214,6 +216,8 @@ var _ = Describe("HttpOutboundRouteConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend requestHeadersToAdd: diff --git a/pkg/xds/envoy/listeners/v3/http_route_configurer_test.go b/pkg/xds/envoy/listeners/v3/http_route_configurer_test.go index c1dbb612f27d..635684c1f0d7 100644 --- a/pkg/xds/envoy/listeners/v3/http_route_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/http_route_configurer_test.go @@ -38,6 +38,8 @@ var _ = Describe("HttpDynamicRouteConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router rds: configSource: ads: {} diff --git a/pkg/xds/envoy/listeners/v3/rate_limit_configurer_test.go b/pkg/xds/envoy/listeners/v3/rate_limit_configurer_test.go index 42f335a51595..51448216c19e 100644 --- a/pkg/xds/envoy/listeners/v3/rate_limit_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/rate_limit_configurer_test.go @@ -63,6 +63,8 @@ var _ = Describe("RateLimitConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: stats`, }), ) diff --git a/pkg/xds/envoy/listeners/v3/retry_configurer_test.go b/pkg/xds/envoy/listeners/v3/retry_configurer_test.go index fa91583f34bb..6cbbce6f78d8 100644 --- a/pkg/xds/envoy/listeners/v3/retry_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/retry_configurer_test.go @@ -95,6 +95,8 @@ var _ = Describe("RetryConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend validateClusters: false @@ -172,6 +174,8 @@ var _ = Describe("RetryConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend validateClusters: false @@ -245,6 +249,8 @@ var _ = Describe("RetryConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend validateClusters: false @@ -320,6 +326,8 @@ var _ = Describe("RetryConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:backend validateClusters: false diff --git a/pkg/xds/envoy/listeners/v3/static_endpoints_configurer_test.go b/pkg/xds/envoy/listeners/v3/static_endpoints_configurer_test.go index ee531a0caa17..efc91d808944 100644 --- a/pkg/xds/envoy/listeners/v3/static_endpoints_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/static_endpoints_configurer_test.go @@ -67,6 +67,8 @@ var _ = Describe("StaticEndpointsConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go b/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go index fdb2b31550d0..50e2cbb361a6 100644 --- a/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go +++ b/pkg/xds/envoy/listeners/v3/tracing_configurer_test.go @@ -58,6 +58,8 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: overallSampling: @@ -94,6 +96,8 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: provider: @@ -129,6 +133,8 @@ var _ = Describe("TracingConfigurer", func() { '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router statPrefix: localhost_8080 tracing: provider: @@ -159,6 +165,8 @@ var _ = Describe("TracingConfigurer", func() { statPrefix: localhost_8080 httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router `, }), ) diff --git a/pkg/xds/generator/egress/testdata/01.externalservice-only.golden.yaml b/pkg/xds/generator/egress/testdata/01.externalservice-only.golden.yaml index dddcb65e0435..1e7a2e4331c9 100644 --- a/pkg/xds/generator/egress/testdata/01.externalservice-only.golden.yaml +++ b/pkg/xds/generator/egress/testdata/01.externalservice-only.golden.yaml @@ -60,6 +60,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-1 validateClusters: false diff --git a/pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml b/pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml index 1750eb98615c..ff22313369ee 100644 --- a/pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml +++ b/pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml @@ -212,6 +212,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-1 validateClusters: false @@ -267,6 +269,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-2 validateClusters: false diff --git a/pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml b/pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml index 3e5eeabf4a26..c810304fb08c 100644 --- a/pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml +++ b/pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml @@ -172,6 +172,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-2 validateClusters: false diff --git a/pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml b/pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml index 6948335b3988..69231a94a791 100644 --- a/pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml +++ b/pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml @@ -214,6 +214,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-1 validateClusters: false @@ -263,6 +265,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-2 validateClusters: false diff --git a/pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml b/pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml index a85c32cea5a6..c562c6ac9ac6 100644 --- a/pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml +++ b/pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml @@ -217,6 +217,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:externalservice-1 validateClusters: false diff --git a/pkg/xds/generator/prometheus_endpoint_generator_test.go b/pkg/xds/generator/prometheus_endpoint_generator_test.go index 95d1f4c760c8..946e671d8daf 100644 --- a/pkg/xds/generator/prometheus_endpoint_generator_test.go +++ b/pkg/xds/generator/prometheus_endpoint_generator_test.go @@ -7,6 +7,7 @@ import ( . "github.com/onsi/gomega" mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1" + "github.com/kumahq/kuma/pkg/core" core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh" core_xds "github.com/kumahq/kuma/pkg/core/xds" . "github.com/kumahq/kuma/pkg/test/matchers" @@ -20,6 +21,10 @@ import ( var _ = Describe("PrometheusEndpointGenerator", func() { + core.TempDir = func() string { + return "/tmp" + } + type testCase struct { ctx xds_context.Context proxy *core_xds.Proxy diff --git a/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml b/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml index f6a252fe435e..45ac07dc5086 100644 --- a/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml @@ -30,6 +30,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -51,6 +53,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/inbound-proxy/3-envoy-config.golden.yaml b/pkg/xds/generator/testdata/inbound-proxy/3-envoy-config.golden.yaml index 83fbf54157fd..92d2a67e12fe 100644 --- a/pkg/xds/generator/testdata/inbound-proxy/3-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/inbound-proxy/3-envoy-config.golden.yaml @@ -127,6 +127,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -298,6 +300,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: diff --git a/pkg/xds/generator/testdata/inbound-proxy/4-envoy-config.golden.yaml b/pkg/xds/generator/testdata/inbound-proxy/4-envoy-config.golden.yaml index ea693efa04e3..fd12762a0e2f 100644 --- a/pkg/xds/generator/testdata/inbound-proxy/4-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/inbound-proxy/4-envoy-config.golden.yaml @@ -129,6 +129,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -302,6 +304,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: diff --git a/pkg/xds/generator/testdata/inbound-proxy/5-envoy-config.golden.yaml b/pkg/xds/generator/testdata/inbound-proxy/5-envoy-config.golden.yaml index 3934da340995..0942476bf9cf 100644 --- a/pkg/xds/generator/testdata/inbound-proxy/5-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/inbound-proxy/5-envoy-config.golden.yaml @@ -163,6 +163,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -283,6 +285,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -405,6 +409,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -616,6 +622,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: @@ -648,6 +656,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: @@ -682,6 +692,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: diff --git a/pkg/xds/generator/testdata/inbound-proxy/6-envoy-config.golden.yaml b/pkg/xds/generator/testdata/inbound-proxy/6-envoy-config.golden.yaml index 05fbda78b7b5..49c935d64574 100644 --- a/pkg/xds/generator/testdata/inbound-proxy/6-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/inbound-proxy/6-envoy-config.golden.yaml @@ -165,6 +165,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -285,6 +287,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -407,6 +411,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit statPrefix: rate_limit - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend1 requestHeadersToRemove: @@ -620,6 +626,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: @@ -652,6 +660,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: @@ -686,6 +696,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend3 requestHeadersToRemove: diff --git a/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml index b2a26dc38555..2f78ca78cc7c 100644 --- a/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/outbound-proxy/03.envoy.golden.yaml @@ -329,6 +329,8 @@ resources: path: /var/log httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:api-http requestHeadersToAdd: @@ -398,6 +400,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:api-http2 requestHeadersToAdd: @@ -441,6 +445,8 @@ resources: emitFilterState: true statsForAllMethods: true - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:api-grpc requestHeadersToAdd: diff --git a/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml index d67821499f2c..29e0aea04233 100644 --- a/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/outbound-proxy/04.envoy.golden.yaml @@ -367,6 +367,8 @@ resources: path: /var/log httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:api-http requestHeadersToAdd: diff --git a/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml index 74c353feb694..e9ee8af42e79 100644 --- a/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/outbound-proxy/05.envoy.golden.yaml @@ -43,6 +43,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:es requestHeadersToAdd: diff --git a/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml index 32e0dc521693..1ee3cbc20ac1 100644 --- a/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/outbound-proxy/06.envoy.golden.yaml @@ -43,6 +43,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:es2 requestHeadersToAdd: diff --git a/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml b/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml index 1fb851226114..e4413b0c57e1 100644 --- a/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml @@ -72,6 +72,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:es2 requestHeadersToAdd: @@ -118,6 +120,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:es2 requestHeadersToAdd: @@ -164,6 +168,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: outbound:es2 requestHeadersToAdd: diff --git a/pkg/xds/generator/testdata/probe/01.envoy.golden.yaml b/pkg/xds/generator/testdata/probe/01.envoy.golden.yaml index 8332e0205a85..2acc50404a09 100644 --- a/pkg/xds/generator/testdata/probe/01.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/probe/01.envoy.golden.yaml @@ -13,6 +13,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: virtualHosts: - domains: diff --git a/pkg/xds/generator/testdata/probe/03.envoy.golden.yaml b/pkg/xds/generator/testdata/probe/03.envoy.golden.yaml index b442afb2bc1e..d4bded219f30 100644 --- a/pkg/xds/generator/testdata/probe/03.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/probe/03.envoy.golden.yaml @@ -13,6 +13,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: virtualHosts: - domains: diff --git a/pkg/xds/generator/testdata/probe/04.envoy.golden.yaml b/pkg/xds/generator/testdata/probe/04.envoy.golden.yaml index 8332e0205a85..2acc50404a09 100644 --- a/pkg/xds/generator/testdata/probe/04.envoy.golden.yaml +++ b/pkg/xds/generator/testdata/probe/04.envoy.golden.yaml @@ -13,6 +13,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: virtualHosts: - domains: diff --git a/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml index 815a761410c8..9b236843c992 100644 --- a/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml @@ -202,6 +202,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -223,6 +225,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml index 87006afaaef8..00f23c3a6b9b 100644 --- a/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml @@ -241,6 +241,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -262,6 +264,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml index 650bff220b5d..41518ee61024 100644 --- a/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml @@ -177,6 +177,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend requestHeadersToRemove: @@ -237,6 +239,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -258,6 +262,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -314,6 +320,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -338,6 +346,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml index 1d202b140cd6..fd67e6658ba3 100644 --- a/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml @@ -198,6 +198,8 @@ resources: forwardClientCertDetails: SANITIZE_SET httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: name: inbound:backend requestHeadersToRemove: @@ -276,6 +278,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -297,6 +301,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -353,6 +359,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -377,6 +385,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/prometheus-endpoint/custom.envoy-config.golden.yaml b/pkg/xds/generator/testdata/prometheus-endpoint/custom.envoy-config.golden.yaml index b874df912fb5..5c3ef4ad74ec 100644 --- a/pkg/xds/generator/testdata/prometheus-endpoint/custom.envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/prometheus-endpoint/custom.envoy-config.golden.yaml @@ -29,6 +29,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/prometheus-endpoint/default-mtls.envoy-config.golden.yaml b/pkg/xds/generator/testdata/prometheus-endpoint/default-mtls.envoy-config.golden.yaml index 15fd6cb64d40..b66d6b27f4bc 100644 --- a/pkg/xds/generator/testdata/prometheus-endpoint/default-mtls.envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/prometheus-endpoint/default-mtls.envoy-config.golden.yaml @@ -33,6 +33,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: @@ -57,6 +59,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/prometheus-endpoint/default-without-hijacker.envoy-config.golden.yaml b/pkg/xds/generator/testdata/prometheus-endpoint/default-without-hijacker.envoy-config.golden.yaml index 3b247d2e4352..06be56ae9a8f 100644 --- a/pkg/xds/generator/testdata/prometheus-endpoint/default-without-hijacker.envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/prometheus-endpoint/default-without-hijacker.envoy-config.golden.yaml @@ -29,6 +29,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/pkg/xds/generator/testdata/prometheus-endpoint/default.envoy-config.golden.yaml b/pkg/xds/generator/testdata/prometheus-endpoint/default.envoy-config.golden.yaml index 3b247d2e4352..06be56ae9a8f 100644 --- a/pkg/xds/generator/testdata/prometheus-endpoint/default.envoy-config.golden.yaml +++ b/pkg/xds/generator/testdata/prometheus-endpoint/default.envoy-config.golden.yaml @@ -29,6 +29,8 @@ resources: '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager httpFilters: - name: envoy.filters.http.router + typedConfig: + '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router routeConfig: validateClusters: false virtualHosts: diff --git a/tools/envoy/fetch.sh b/tools/envoy/fetch.sh index d0dcffae1387..bc39b0b27914 100755 --- a/tools/envoy/fetch.sh +++ b/tools/envoy/fetch.sh @@ -33,14 +33,8 @@ function download_envoy() { [ -f "${BINARY_PATH}" ] && chmod +x "${BINARY_PATH}" } -if [[ "${GOARCH}" == "arm64" ]]; then - ARCH="-arm64" -else - ARCH="" -fi - if [[ -n "${ENVOY_VERSION}" ]]; then - BINARY_NAME="envoy-${ENVOY_VERSION}-${ENVOY_DISTRO}${ARCH}" + BINARY_NAME="envoy-${ENVOY_VERSION}-${ENVOY_DISTRO}-${GOARCH}" download_envoy "${BINARY_NAME}" exit 0 fi diff --git a/tools/envoy/version.sh b/tools/envoy/version.sh index f7ad197d859d..9826cdc3ec45 100755 --- a/tools/envoy/version.sh +++ b/tools/envoy/version.sh @@ -9,7 +9,13 @@ set -o nounset # - if ENVOY_TAG is a commit hash then the version will look like '1.20.1-dev-b16d390f' ENVOY_TAG=$1 -ENVOY_VERSION=$(curl --silent --location --fail "https://raw.githubusercontent.com/envoyproxy/envoy/${ENVOY_TAG}/VERSION") +ENVOY_VERSION=$(curl --silent --location "https://raw.githubusercontent.com/envoyproxy/envoy/${ENVOY_TAG}/VERSION.txt") + +# for envoy versions older than v1.22.0 file 'VERSION.txt' used to be called 'VERSION' +if [[ "${ENVOY_VERSION}" == "404: Not Found" ]]; then + ENVOY_VERSION=$(curl --silent --location --fail "https://raw.githubusercontent.com/envoyproxy/envoy/${ENVOY_TAG}/VERSION") +fi + if [[ "${ENVOY_TAG}" =~ ^v[0-9]*\.[0-9]*\.[0-9]*$ ]]; then echo "${ENVOY_VERSION}" else diff --git a/tools/releases/distros.sh b/tools/releases/distros.sh index d9208034089e..59b28ea874f1 100755 --- a/tools/releases/distros.sh +++ b/tools/releases/distros.sh @@ -16,7 +16,7 @@ PULP_HOST="https://api.pulp.konnect-prod.konghq.com" PULP_PACKAGE_TYPE="mesh" PULP_DIST_NAME="alpine" [ -z "$RELEASE_NAME" ] && RELEASE_NAME="kuma" -ENVOY_VERSION=1.21.1 +ENVOY_VERSION=1.22.0 [ -z "$KUMA_CONFIG_PATH" ] && KUMA_CONFIG_PATH=pkg/config/app/kuma-cp/kuma-cp.defaults.yaml CTL_NAME="kumactl" diff --git a/tools/releases/docker.sh b/tools/releases/docker.sh index ec633b681a10..bf621d46fa08 100755 --- a/tools/releases/docker.sh +++ b/tools/releases/docker.sh @@ -8,7 +8,7 @@ source "${SCRIPT_DIR}/../common.sh" KUMA_DOCKER_REPO="${KUMA_DOCKER_REPO:-docker.io}" KUMA_DOCKER_REPO_ORG="${KUMA_DOCKER_REPO_ORG:-${KUMA_DOCKER_REPO}/kumahq}" KUMA_COMPONENTS="${KUMA_COMPONENTS:-kuma-cp kuma-dp kumactl kuma-init kuma-prometheus-sd}" -ENVOY_VERSION="${ENVOY_VERSION:-1.21.1}" +ENVOY_VERSION="${ENVOY_VERSION:-1.22.0}" function build() { for component in ${KUMA_COMPONENTS}; do From 58fd04b920fad0b76106e3e9460ac579be7ab0dd Mon Sep 17 00:00:00 2001 From: Ilya Lobkov Date: Wed, 18 May 2022 16:49:04 +0700 Subject: [PATCH 2/5] chore(envoy): added white-list support for contrib extensions Signed-off-by: Ilya Lobkov --- tools/envoy/build_centos.sh | 8 +++++++- tools/envoy/build_darwin.sh | 6 +++++- tools/envoy/build_linux.sh | 8 +++++++- tools/envoy/contrib_enabled_matrix.py | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 tools/envoy/contrib_enabled_matrix.py diff --git a/tools/envoy/build_centos.sh b/tools/envoy/build_centos.sh index d7597e23152e..d05528b1e921 100755 --- a/tools/envoy/build_centos.sh +++ b/tools/envoy/build_centos.sh @@ -9,6 +9,7 @@ echo "Building Envoy for CentOS 7" mkdir -p "$(dirname "${BINARY_PATH}")" SOURCE_DIR="${SOURCE_DIR}" "${KUMA_DIR:-.}/tools/envoy/fetch_sources.sh" +CONTRIB_ENABLED_MATRIX_SCRIPT=$(realpath "${KUMA_DIR:-.}/tools/envoy/contrib_enabled_matrix.py") BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS:-""} read -ra BAZEL_BUILD_EXTRA_OPTIONS <<< "${BAZEL_BUILD_EXTRA_OPTIONS}" @@ -17,7 +18,12 @@ BAZEL_BUILD_OPTIONS=( "--verbose_failures" "${BAZEL_BUILD_EXTRA_OPTIONS[@]+"${BAZEL_BUILD_EXTRA_OPTIONS[@]}"}") BUILD_TARGET=${BUILD_TARGET:-"//contrib/exe:envoy-static"} -BUILD_CMD=${BUILD_CMD:-"bazel build ${BAZEL_BUILD_OPTIONS[@]} -c opt ${BUILD_TARGET} --//source/extensions/transport_sockets/tcp_stats:enabled=false"} + +pushd "${SOURCE_DIR}" +CONTRIB_ENABLED_ARGS=$(python "${CONTRIB_ENABLED_MATRIX_SCRIPT}") +popd + +BUILD_CMD=${BUILD_CMD:-"bazel build ${BAZEL_BUILD_OPTIONS[@]} -c opt ${BUILD_TARGET} ${CONTRIB_ENABLED_ARGS} --//source/extensions/transport_sockets/tcp_stats:enabled=false"} ENVOY_BUILD_SHA=$(curl --fail --location --silent https://raw.githubusercontent.com/envoyproxy/envoy/"${ENVOY_TAG}"/.bazelrc | grep envoyproxy/envoy-build-ubuntu | sed -e 's#.*envoyproxy/envoy-build-ubuntu:\(.*\)#\1#'| uniq) ENVOY_BUILD_IMAGE="envoyproxy/envoy-build-centos:${ENVOY_BUILD_SHA}" diff --git a/tools/envoy/build_darwin.sh b/tools/envoy/build_darwin.sh index 43f63b9a6c73..58ae9f4b7d00 100755 --- a/tools/envoy/build_darwin.sh +++ b/tools/envoy/build_darwin.sh @@ -9,6 +9,7 @@ echo "Building Envoy for Darwin" mkdir -p "$(dirname "${BINARY_PATH}")" SOURCE_DIR="${SOURCE_DIR}" "${KUMA_DIR:-.}/tools/envoy/fetch_sources.sh" +CONTRIB_ENABLED_MATRIX_SCRIPT=$(realpath "${KUMA_DIR:-.}/tools/envoy/contrib_enabled_matrix.py") pushd "${SOURCE_DIR}" @@ -22,7 +23,10 @@ BAZEL_BUILD_OPTIONS=( "--action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin:/opt/homebrew/bin" "--define" "wasm=disabled" "${BAZEL_BUILD_EXTRA_OPTIONS[@]+"${BAZEL_BUILD_EXTRA_OPTIONS[@]}"}") -bazel build "${BAZEL_BUILD_OPTIONS[@]}" -c opt //contrib/exe:envoy-static + +CONTRIB_ENABLED_ARGS=$(python "${CONTRIB_ENABLED_MATRIX_SCRIPT}") + +bazel build "${BAZEL_BUILD_OPTIONS[@]}" -c opt //contrib/exe:envoy-static ${CONTRIB_ENABLED_ARGS} popd diff --git a/tools/envoy/build_linux.sh b/tools/envoy/build_linux.sh index cbce8a7ac83a..447b96dd4a98 100755 --- a/tools/envoy/build_linux.sh +++ b/tools/envoy/build_linux.sh @@ -9,6 +9,7 @@ echo "Building Envoy for Linux" mkdir -p "$(dirname "${BINARY_PATH}")" SOURCE_DIR="${SOURCE_DIR}" "${KUMA_DIR:-.}/tools/envoy/fetch_sources.sh" +CONTRIB_ENABLED_MATRIX_SCRIPT=$(realpath "${KUMA_DIR:-.}/tools/envoy/contrib_enabled_matrix.py") BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS:-""} read -ra BAZEL_BUILD_EXTRA_OPTIONS <<< "${BAZEL_BUILD_EXTRA_OPTIONS}" @@ -17,7 +18,12 @@ BAZEL_BUILD_OPTIONS=( "--verbose_failures" "${BAZEL_BUILD_EXTRA_OPTIONS[@]+"${BAZEL_BUILD_EXTRA_OPTIONS[@]}"}") BUILD_TARGET=${BUILD_TARGET:-"//contrib/exe:envoy-static"} -BUILD_CMD=${BUILD_CMD:-"bazel build ${BAZEL_BUILD_OPTIONS[@]} -c opt ${BUILD_TARGET}"} + +pushd "${SOURCE_DIR}" +CONTRIB_ENABLED_ARGS=$(python "${CONTRIB_ENABLED_MATRIX_SCRIPT}") +popd + +BUILD_CMD=${BUILD_CMD:-"bazel build ${BAZEL_BUILD_OPTIONS[@]} -c opt ${BUILD_TARGET} ${CONTRIB_ENABLED_ARGS}"} ENVOY_BUILD_SHA=$(curl --fail --location --silent https://raw.githubusercontent.com/envoyproxy/envoy/"${ENVOY_TAG}"/.bazelrc | grep envoyproxy/envoy-build-ubuntu | sed -e 's#.*envoyproxy/envoy-build-ubuntu:\(.*\)#\1#'| uniq) ENVOY_BUILD_IMAGE="envoyproxy/envoy-build-ubuntu:${ENVOY_BUILD_SHA}" diff --git a/tools/envoy/contrib_enabled_matrix.py b/tools/envoy/contrib_enabled_matrix.py new file mode 100644 index 000000000000..0a8b6fb9eba2 --- /dev/null +++ b/tools/envoy/contrib_enabled_matrix.py @@ -0,0 +1,17 @@ +#!/usr/bin/python + +# file in format CONTRIB_EXTENSIONS = {...} +execfile('contrib/contrib_build_config.bzl') + +enabled = [ + "envoy.filters.network.kafka_broker" +] + +disabled = [] +for k, v in CONTRIB_EXTENSIONS.items(): + disabled.append('--{target}:enabled={enabled}'.format( + target=v.split(":")[0], + enabled=(k in enabled)) + ) + +print(' '.join(disabled)) From 31427c73d0ef6fe1021deae5b40dda61225e6181 Mon Sep 17 00:00:00 2001 From: Ilya Lobkov Date: Wed, 18 May 2022 16:52:56 +0700 Subject: [PATCH 3/5] chore(envoy): make check Signed-off-by: Ilya Lobkov --- tools/envoy/build_darwin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/envoy/build_darwin.sh b/tools/envoy/build_darwin.sh index 58ae9f4b7d00..fb5d85c0a104 100755 --- a/tools/envoy/build_darwin.sh +++ b/tools/envoy/build_darwin.sh @@ -26,6 +26,7 @@ BAZEL_BUILD_OPTIONS=( CONTRIB_ENABLED_ARGS=$(python "${CONTRIB_ENABLED_MATRIX_SCRIPT}") +# shellcheck disable=SC2086 bazel build "${BAZEL_BUILD_OPTIONS[@]}" -c opt //contrib/exe:envoy-static ${CONTRIB_ENABLED_ARGS} popd From 76c40bef744aab1cb29d99e69b87774b7b8443b1 Mon Sep 17 00:00:00 2001 From: Ilya Lobkov Date: Wed, 18 May 2022 16:53:23 +0700 Subject: [PATCH 4/5] chore(envoy): cleanup Dockerfile.build-centos Signed-off-by: Ilya Lobkov --- tools/envoy/Dockerfile.build-centos | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/envoy/Dockerfile.build-centos b/tools/envoy/Dockerfile.build-centos index 72f6e129e46a..63cf1a44b830 100644 --- a/tools/envoy/Dockerfile.build-centos +++ b/tools/envoy/Dockerfile.build-centos @@ -3,16 +3,6 @@ FROM $ENVOY_BUILD_IMAGE ARG BUILD_CMD -# based on the fix https://github.com/envoyproxy/envoy/pull/18426, could be deleted as soon as it'll be merged -RUN git clone https://gn.googlesource.com/gn && \ - pushd gn && \ - git checkout 45aa842fb41d79e149b46fac8ad71728856e15b9 && \ - python build/gen.py && \ - ninja -C out && \ - mv -f out/gn /usr/local/bin/gn && \ - chmod +x /usr/local/bin/gn && \ - popd - COPY . /envoy-sources/ RUN bash -c "pushd envoy-sources/ && bazel/setup_clang.sh /opt/llvm" From d2ef1ea560fcdbb751590099c564c318058c7342 Mon Sep 17 00:00:00 2001 From: Ilya Lobkov Date: Wed, 18 May 2022 17:57:43 +0700 Subject: [PATCH 5/5] chore(envoy): replace 'execfile' with 'exec' Signed-off-by: Ilya Lobkov --- tools/envoy/contrib_enabled_matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/envoy/contrib_enabled_matrix.py b/tools/envoy/contrib_enabled_matrix.py index 0a8b6fb9eba2..31e877a23960 100644 --- a/tools/envoy/contrib_enabled_matrix.py +++ b/tools/envoy/contrib_enabled_matrix.py @@ -1,7 +1,7 @@ #!/usr/bin/python # file in format CONTRIB_EXTENSIONS = {...} -execfile('contrib/contrib_build_config.bzl') +exec(open('contrib/contrib_build_config.bzl').read()) enabled = [ "envoy.filters.network.kafka_broker"