From 2a2d73f8303028939b2c11358168708205b66f85 Mon Sep 17 00:00:00 2001 From: jpsim Date: Mon, 19 Sep 2022 14:09:30 +0000 Subject: [PATCH 1/6] Update Envoy Signed-off-by: GitHub Action --- envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy b/envoy index 0b10b055a6..6e74a51a5a 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit 0b10b055a6e1dbdd600f9a80f8b8d803bdd8ec9c +Subproject commit 6e74a51a5a3c15202526c9cd275cf3ce566f858a From a27236357eb11a3b86aff66c6f67eef8e63012d4 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 19 Sep 2022 14:04:02 -0400 Subject: [PATCH 2/6] bump SHA Signed-off-by: Rafal Augustyniak --- envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy b/envoy index 6e74a51a5a..a8c6db9912 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit 6e74a51a5a3c15202526c9cd275cf3ce566f858a +Subproject commit a8c6db99127206bcea0a27df647a11d279f1df72 From 71857a61381d6a90338afde3877e11d88305c196 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 19 Sep 2022 16:17:40 -0400 Subject: [PATCH 3/6] bump EM again Signed-off-by: Rafal Augustyniak --- envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy b/envoy index a8c6db9912..94c4585079 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit a8c6db99127206bcea0a27df647a11d279f1df72 +Subproject commit 94c4585079212748721c9855a94f8f2f488f2cbf From 100092f9921e52d2c383bede8d8b59b6bbbc9c08 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 19 Sep 2022 16:18:45 -0400 Subject: [PATCH 4/6] add missing registration Signed-off-by: Rafal Augustyniak --- envoy_build_config/BUILD | 1 + envoy_build_config/extension_registry.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/envoy_build_config/BUILD b/envoy_build_config/BUILD index d607016c78..2f020118a8 100644 --- a/envoy_build_config/BUILD +++ b/envoy_build_config/BUILD @@ -14,6 +14,7 @@ envoy_cc_library( deps = [ "extension_registry_platform_additions", "@envoy//source/common/network:socket_lib", + "@envoy//source/common/router:upstream_codec_filter_lib", "@envoy//source/common/upstream:logical_dns_cluster_lib", "@envoy//source/extensions/clusters/dynamic_forward_proxy:cluster", "@envoy//source/extensions/compression/brotli/decompressor:config", diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc index 7d03fe43e5..ca2ae7869f 100644 --- a/envoy_build_config/extension_registry.cc +++ b/envoy_build_config/extension_registry.cc @@ -2,6 +2,7 @@ #include "source/common/network/default_client_connection_factory.h" #include "source/common/network/socket_interface_impl.h" +#include "source/common/router/upstream_codec_filter.h" #include "source/common/upstream/logical_dns_cluster.h" #include "source/extensions/clusters/dynamic_forward_proxy/cluster.h" #include "source/extensions/compression/brotli/decompressor/config.h" @@ -60,6 +61,7 @@ void ExtensionRegistry::registerFactories() { Envoy::Extensions::TransportSockets::Tls::forceRegisterUpstreamSslSocketFactory(); Envoy::Extensions::TransportSockets::Tls::forceRegisterDefaultCertValidatorFactory(); Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory(); + Envoy::Extensions::forceUpstreamCodecFilterFactory(); Envoy::Upstream::forceRegisterLogicalDnsClusterFactory(); ExtensionRegistryPlatformAdditions::registerFactories(); From 51dd681dd47ab3c834b0f4053976d807a12f30b2 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 19 Sep 2022 16:33:17 -0400 Subject: [PATCH 5/6] fixes Signed-off-by: Rafal Augustyniak --- envoy_build_config/extension_registry.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc index ca2ae7869f..8374172d34 100644 --- a/envoy_build_config/extension_registry.cc +++ b/envoy_build_config/extension_registry.cc @@ -61,7 +61,7 @@ void ExtensionRegistry::registerFactories() { Envoy::Extensions::TransportSockets::Tls::forceRegisterUpstreamSslSocketFactory(); Envoy::Extensions::TransportSockets::Tls::forceRegisterDefaultCertValidatorFactory(); Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory(); - Envoy::Extensions::forceUpstreamCodecFilterFactory(); + Router::forceRegisterUpstreamCodecFilterFactory(); Envoy::Upstream::forceRegisterLogicalDnsClusterFactory(); ExtensionRegistryPlatformAdditions::registerFactories(); From 106045265e6f20ee4abdadd67c8b49e5df775e43 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 19 Sep 2022 16:33:43 -0400 Subject: [PATCH 6/6] reorder Signed-off-by: Rafal Augustyniak --- envoy_build_config/extension_registry.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc index 8374172d34..59183fc4ee 100644 --- a/envoy_build_config/extension_registry.cc +++ b/envoy_build_config/extension_registry.cc @@ -61,9 +61,9 @@ void ExtensionRegistry::registerFactories() { Envoy::Extensions::TransportSockets::Tls::forceRegisterUpstreamSslSocketFactory(); Envoy::Extensions::TransportSockets::Tls::forceRegisterDefaultCertValidatorFactory(); Envoy::Extensions::Upstreams::Http::Generic::forceRegisterGenericGenericConnPoolFactory(); - Router::forceRegisterUpstreamCodecFilterFactory(); Envoy::Upstream::forceRegisterLogicalDnsClusterFactory(); ExtensionRegistryPlatformAdditions::registerFactories(); + Router::forceRegisterUpstreamCodecFilterFactory(); // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code // in such a way that does not depend on the statically initialized variable.