diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 621d9eec6dcc..8224ed5f424b 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -56,6 +56,11 @@ removed_config_or_runtime: change: | Removed ``envoy.reloadable_features.grpc_http1_reverse_bridge_handle_empty_response`` runtime flag and legacy code paths. +- area: grpc reverse bridge + change: | + Removed ``envoy.reloadable_features.grpc_http1_reverse_bridge_change_http_status`` runtime flag + and legacy code paths. + new_features: - area: tls diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index a09fbc818db8..cbc7f3e7b85b 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -44,7 +44,6 @@ RUNTIME_GUARD(envoy_reloadable_features_enable_compression_bomb_protection); RUNTIME_GUARD(envoy_reloadable_features_enable_include_histograms); RUNTIME_GUARD(envoy_reloadable_features_exclude_host_in_eds_status_draining); RUNTIME_GUARD(envoy_reloadable_features_gcp_authn_use_fixed_url); -RUNTIME_GUARD(envoy_reloadable_features_grpc_http1_reverse_bridge_change_http_status); RUNTIME_GUARD(envoy_reloadable_features_grpc_side_stream_flow_control); RUNTIME_GUARD(envoy_reloadable_features_http1_balsa_delay_reset); RUNTIME_GUARD(envoy_reloadable_features_http1_balsa_disallow_lone_cr_in_chunk_extension); diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc index f3236e6d4c4f..d4ffdb78ddbd 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc @@ -9,7 +9,6 @@ #include "source/common/grpc/status.h" #include "source/common/http/headers.h" #include "source/common/http/utility.h" -#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Extensions { @@ -182,10 +181,7 @@ Http::FilterHeadersStatus Filter::encodeHeaders(Http::ResponseHeaderMap& headers grpc_status_ = grpcStatusFromHeaders(headers); // gRPC clients expect that the HTTP status will always be 200. - if (Runtime::runtimeFeatureEnabled( - "envoy.reloadable_features.grpc_http1_reverse_bridge_change_http_status")) { - headers.setStatus(enumToInt(Http::Code::OK)); - } + headers.setStatus(enumToInt(Http::Code::OK)); // This is a header-only response, and we should prepend the gRPC frame // header directly.