From 154ed1d97314d4611c3875534e6567e73ecb565e Mon Sep 17 00:00:00 2001 From: Gopi Krishna Date: Thu, 14 Nov 2024 13:24:16 +0000 Subject: [PATCH] Removed deprecated Envoy runtime guard --- WORKSPACE | 1 + examples/auth/envoy_config.json | 1 - examples/dynamic_routing/envoy_config.json | 1 - examples/grpc_dynamic_routing/envoy_config.json | 1 - examples/service_control/envoy_config.json | 1 - examples/testdata/route_match/envoy_config.json | 1 - examples/testdata/sidecar_backend/envoy_config.json | 1 - src/go/bootstrap/ads/bootstrap_test.go | 6 ++---- src/go/bootstrap/layer_runtime.go | 9 --------- tests/env/testdata/access_log.txt | 0 10 files changed, 3 insertions(+), 19 deletions(-) create mode 100644 tests/env/testdata/access_log.txt diff --git a/WORKSPACE b/WORKSPACE index 4189aa289..9d939bd06 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -40,6 +40,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Try to match it with the one in source/extensions and comment out unneeded extensions. ENVOY_SHA1 = "349011c2ebd40f070510e34f4605bff1da64fb0e" # v1.30.7 + ENVOY_SHA256 = "fee4d8c1005cac9a241e29d51a903b1b369515a8a77e5b7fe320520ae7c7b855" http_archive( diff --git a/examples/auth/envoy_config.json b/examples/auth/envoy_config.json index dc6355929..0fa11f22c 100644 --- a/examples/auth/envoy_config.json +++ b/examples/auth/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/examples/dynamic_routing/envoy_config.json b/examples/dynamic_routing/envoy_config.json index 5f5784619..e5cf46522 100644 --- a/examples/dynamic_routing/envoy_config.json +++ b/examples/dynamic_routing/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/examples/grpc_dynamic_routing/envoy_config.json b/examples/grpc_dynamic_routing/envoy_config.json index b06e5e93d..fb2c4194c 100644 --- a/examples/grpc_dynamic_routing/envoy_config.json +++ b/examples/grpc_dynamic_routing/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/examples/service_control/envoy_config.json b/examples/service_control/envoy_config.json index 9f832b537..a19d9bc5f 100644 --- a/examples/service_control/envoy_config.json +++ b/examples/service_control/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/examples/testdata/route_match/envoy_config.json b/examples/testdata/route_match/envoy_config.json index 7d1260707..f8b26c522 100644 --- a/examples/testdata/route_match/envoy_config.json +++ b/examples/testdata/route_match/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/examples/testdata/sidecar_backend/envoy_config.json b/examples/testdata/sidecar_backend/envoy_config.json index 12ae25d74..0abc4c10e 100644 --- a/examples/testdata/sidecar_backend/envoy_config.json +++ b/examples/testdata/sidecar_backend/envoy_config.json @@ -5,7 +5,6 @@ { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, "http.max_requests_per_io_cycle": 1, "re2.max_program_size.error_level": 1000 } diff --git a/src/go/bootstrap/ads/bootstrap_test.go b/src/go/bootstrap/ads/bootstrap_test.go index 4a71accb5..36ee508fa 100644 --- a/src/go/bootstrap/ads/bootstrap_test.go +++ b/src/go/bootstrap/ads/bootstrap_test.go @@ -70,8 +70,7 @@ func TestCreateBootstrapConfig(t *testing.T) { { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, - "http.max_requests_per_io_cycle":1, + "http.max_requests_per_io_cycle":1, "re2.max_program_size.error_level":1000 } } @@ -172,8 +171,7 @@ func TestCreateBootstrapConfig(t *testing.T) { { "name": "static-runtime", "staticLayer": { - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": false, - "http.max_requests_per_io_cycle":1, + "http.max_requests_per_io_cycle":1, "re2.max_program_size.error_level":1000 } } diff --git a/src/go/bootstrap/layer_runtime.go b/src/go/bootstrap/layer_runtime.go index 927f40d1e..d8e5faafb 100644 --- a/src/go/bootstrap/layer_runtime.go +++ b/src/go/bootstrap/layer_runtime.go @@ -35,15 +35,6 @@ func CreateLayeredRuntime() *bootstrappb.LayeredRuntime { NumberValue: 1000, }, }, - // Our service control filter may call route() in log time - // but it is possible that the route isn't set with early local reply, - // which triggers an ENVOY_BUG, so we use this flag to workaround. - // For more context, see https://github.com/envoyproxy/envoy/issues/28626. - "envoy.reloadable_features.prohibit_route_refresh_after_response_headers_sent": { - Kind: &structpb.Value_BoolValue{ - BoolValue: false, - }, - }, // Enable an Envoy vulnerability mitigation. For details, please see b/299661830. "http.max_requests_per_io_cycle": { Kind: &structpb.Value_NumberValue{ diff --git a/tests/env/testdata/access_log.txt b/tests/env/testdata/access_log.txt new file mode 100644 index 000000000..e69de29bb