istio
/
proxy
mirror of https://github.com/istio/proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update envoy with fixes (#5194) 

* Update envoy with fixes

* Later proxy to fix cache issue

* update all getServerFactoryContext to serverFactoryContext

* listener: add listener info to the contexts
This commit is contained in:
Eric Van Norman 2023-12-06 10:31:03 -06:00 committed by GitHub
parent 5a9126ce61
commit a60824c196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz` # 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed. # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
# #
# Commit date: 2023-12-04 # Commit date: 2023-12-06
ENVOY_SHA = "5bc7a8ca35f1338f53660824b6544d1c09fdbf7b" ENVOY_SHA = "148fd48bb086742f1878877fde2b2fa55d7b58ad"
ENVOY_SHA256 = "952923886f95e7a9d17dd421fdb1498cdeeb30fd73405301aa9d4f027ac287d4" ENVOY_SHA256 = "d0dbdc3d2a3e01fcd554d95db9332a0ebd9cc96e01742739aa778b3dd1c8ccc9"
ENVOY_ORG = "envoyproxy" ENVOY_ORG = "envoyproxy"

2
source/extensions/filters/http/alpn/BUILD
View File

@ -47,7 +47,7 @@ envoy_cc_library(
deps = [ deps = [
":alpn_filter", ":alpn_filter",
"@envoy//envoy/registry", "@envoy//envoy/registry",
"@envoy//source/exe:envoy_common_lib", "@envoy//source/exe:all_extensions_lib",
"@envoy//source/extensions/filters/http/common:factory_base_lib", "@envoy//source/extensions/filters/http/common:factory_base_lib",
], ],
) )

2
source/extensions/filters/http/istio_stats/istio_stats.cc
View File

@ -483,7 +483,7 @@ struct Config : public Logger::Loggable<Logger::Id::filter> {
reporter_ = Reporter::ClientSidecar; reporter_ = Reporter::ClientSidecar;
switch (proto_config.reporter()) { switch (proto_config.reporter()) {
case stats::Reporter::UNSPECIFIED: case stats::Reporter::UNSPECIFIED:
switch (factory_context.direction()) { switch (factory_context.listenerInfo().direction()) {
case envoy::config::core::v3::TrafficDirection::INBOUND: case envoy::config::core::v3::TrafficDirection::INBOUND:
reporter_ = Reporter::ServerSidecar; reporter_ = Reporter::ServerSidecar;
break; break;

6
source/extensions/filters/http/peer_metadata/filter.cc
View File

@ -224,12 +224,12 @@ std::vector<DiscoveryMethodPtr> FilterConfig::buildDiscoveryMethods(
case io::istio::http::peer_metadata::Config::DiscoveryMethod::MethodSpecifierCase:: case io::istio::http::peer_metadata::Config::DiscoveryMethod::MethodSpecifierCase::
kWorkloadDiscovery: kWorkloadDiscovery:
methods.push_back( methods.push_back(
std::make_unique<XDSMethod>(downstream, factory_context.getServerFactoryContext())); std::make_unique<XDSMethod>(downstream, factory_context.serverFactoryContext()));
break; break;
case io::istio::http::peer_metadata::Config::DiscoveryMethod::MethodSpecifierCase:: case io::istio::http::peer_metadata::Config::DiscoveryMethod::MethodSpecifierCase::
kIstioHeaders: kIstioHeaders:
methods.push_back( methods.push_back(
std::make_unique<MXMethod>(downstream, factory_context.getServerFactoryContext())); std::make_unique<MXMethod>(downstream, factory_context.serverFactoryContext()));
break; break;
default: default:
break; break;
@ -249,7 +249,7 @@ std::vector<PropagationMethodPtr> FilterConfig::buildPropagationMethods(
case io::istio::http::peer_metadata::Config::PropagationMethod::MethodSpecifierCase:: case io::istio::http::peer_metadata::Config::PropagationMethod::MethodSpecifierCase::
kIstioHeaders: kIstioHeaders:
methods.push_back(std::make_unique<MXPropagationMethod>( methods.push_back(std::make_unique<MXPropagationMethod>(
downstream, factory_context.getServerFactoryContext(), method.istio_headers())); downstream, factory_context.serverFactoryContext(), method.istio_headers()));
break; break;
default: default:
break; break;

4
source/extensions/filters/network/metadata_exchange/config.cc
View File

@ -54,7 +54,7 @@ ProtobufTypes::MessagePtr MetadataExchangeConfigFactory::createEmptyConfigProto(
Network::FilterFactoryCb MetadataExchangeConfigFactory::createFilterFactory( Network::FilterFactoryCb MetadataExchangeConfigFactory::createFilterFactory(
const envoy::tcp::metadataexchange::config::MetadataExchange& proto_config, const envoy::tcp::metadataexchange::config::MetadataExchange& proto_config,
Server::Configuration::FactoryContext& context) { Server::Configuration::FactoryContext& context) {
return createFilterFactoryHelper(proto_config, context.getServerFactoryContext(), return createFilterFactoryHelper(proto_config, context.serverFactoryContext(),
FilterDirection::Downstream); FilterDirection::Downstream);
} }
@ -71,7 +71,7 @@ ProtobufTypes::MessagePtr MetadataExchangeUpstreamConfigFactory::createEmptyConf
Network::FilterFactoryCb MetadataExchangeUpstreamConfigFactory::createFilterFactory( Network::FilterFactoryCb MetadataExchangeUpstreamConfigFactory::createFilterFactory(
const envoy::tcp::metadataexchange::config::MetadataExchange& proto_config, const envoy::tcp::metadataexchange::config::MetadataExchange& proto_config,
Server::Configuration::UpstreamFactoryContext& context) { Server::Configuration::UpstreamFactoryContext& context) {
return createFilterFactoryHelper(proto_config, context.getServerFactoryContext(), return createFilterFactoryHelper(proto_config, context.serverFactoryContext(),
FilterDirection::Upstream); FilterDirection::Upstream);
} }