Fix envoyproxy#35368

This commit removes the runtime flag introduced in envoyproxy#31047 since it has been 6 months since that change. Signed-off-by: Henry Qin <[email protected]>
hq6 · Jul 23, 2024 · bedd1aa · bedd1aa
1 parent e63b035
commit bedd1aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/changelogs/current.yaml b/changelogs/current.yaml
@@ -166,6 +166,9 @@ removed_config_or_runtime:
 - area: grpc reverse bridge
   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: hot_restart

diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc
@@ -49,7 +49,6 @@ RUNTIME_GUARD(envoy_reloadable_features_enable_intermediate_ca);
 RUNTIME_GUARD(envoy_reloadable_features_enable_zone_routing_different_zone_counts);
 RUNTIME_GUARD(envoy_reloadable_features_exclude_host_in_eds_status_draining);
 RUNTIME_GUARD(envoy_reloadable_features_ext_authz_http_send_original_xff);
-RUNTIME_GUARD(envoy_reloadable_features_grpc_http1_reverse_bridge_change_http_status);
 RUNTIME_GUARD(envoy_reloadable_features_hmac_base64_encoding_only);
 RUNTIME_GUARD(envoy_reloadable_features_http1_balsa_delay_reset);
 RUNTIME_GUARD(envoy_reloadable_features_http1_connection_close_header_in_redirect);

diff --git 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.