diff --git a/WORKSPACE b/WORKSPACE index fc190b0e43db..096e2bba4e82 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,7 +30,7 @@ bind( ) # When updating envoy sha manually please update the sha in istio.deps file also -ENVOY_SHA = "cb892b4855bc9e8516ca5eece8098f56f77fe522" +ENVOY_SHA = "f936fc60f488cfae07f5e5d20d7381f0f23482fe" http_archive( name = "envoy", diff --git a/include/istio/control/http/BUILD b/include/istio/control/http/BUILD index 2bf7160ec046..532a48e82fce 100644 --- a/include/istio/control/http/BUILD +++ b/include/istio/control/http/BUILD @@ -23,5 +23,5 @@ cc_library( "request_handler.h", ], visibility = ["//visibility:public"], - deps = ["//src/istio/authn:context_proto"], + deps = ["//src/istio/authn:context_proto_cc"], ) diff --git a/istio.deps b/istio.deps index 506109dacd9a..bc75cfc353b0 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "cb892b4855bc9e8516ca5eece8098f56f77fe522" + "lastStableSHA": "f936fc60f488cfae07f5e5d20d7381f0f23482fe" } ] diff --git a/src/envoy/http/authn/BUILD b/src/envoy/http/authn/BUILD index 3f4c3f296cd7..83706dcf28bc 100644 --- a/src/envoy/http/authn/BUILD +++ b/src/envoy/http/authn/BUILD @@ -45,7 +45,7 @@ envoy_cc_library( "//external:authentication_policy_config_cc_proto", "//src/envoy/http/jwt_auth:jwt_lib", "//src/envoy/utils:utils_lib", - "//src/istio/authn:context_proto", + "//src/istio/authn:context_proto_cc", "//src/envoy/utils:filter_names_lib", ], ) @@ -65,7 +65,7 @@ envoy_cc_library( "//external:authentication_policy_config_cc_proto", "//src/envoy/utils:authn_lib", "//src/envoy/utils:utils_lib", - "//src/istio/authn:context_proto", + "//src/istio/authn:context_proto_cc", "@envoy//source/exe:envoy_common_lib", "//src/envoy/utils:filter_names_lib", ], @@ -76,7 +76,7 @@ envoy_cc_test_library( hdrs = ["test_utils.h"], repository = "@envoy", deps = [ - "//src/istio/authn:context_proto", + "//src/istio/authn:context_proto_cc", ], ) diff --git a/src/envoy/http/mixer/control.cc b/src/envoy/http/mixer/control.cc index 16465a5bdf10..53d7c6f8c6ec 100644 --- a/src/envoy/http/mixer/control.cc +++ b/src/envoy/http/mixer/control.cc @@ -30,9 +30,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm, const LocalInfo::LocalInfo& local_info) : config_(config), check_client_factory_(Utils::GrpcClientFactoryForCluster( - config_.check_cluster(), cm, scope)), + config_.check_cluster(), cm, scope, dispatcher.timeSource())), report_client_factory_(Utils::GrpcClientFactoryForCluster( - config_.report_cluster(), cm, scope)), + config_.report_cluster(), cm, scope, dispatcher.timeSource())), stats_obj_(dispatcher, stats, config_.config_pb().transport().stats_update_interval(), [this](::istio::mixerclient::Statistics* stat) -> bool { diff --git a/src/envoy/tcp/mixer/control.cc b/src/envoy/tcp/mixer/control.cc index 86b6651f7d25..6f8bee5fd644 100644 --- a/src/envoy/tcp/mixer/control.cc +++ b/src/envoy/tcp/mixer/control.cc @@ -29,9 +29,9 @@ Control::Control(const Config& config, Upstream::ClusterManager& cm, : config_(config), dispatcher_(dispatcher), check_client_factory_(Utils::GrpcClientFactoryForCluster( - config_.check_cluster(), cm, scope)), + config_.check_cluster(), cm, scope, dispatcher.timeSource())), report_client_factory_(Utils::GrpcClientFactoryForCluster( - config_.report_cluster(), cm, scope)), + config_.report_cluster(), cm, scope, dispatcher.timeSource())), stats_obj_(dispatcher, stats, config_.config_pb().transport().stats_update_interval(), [this](Statistics* stat) -> bool { return GetStats(stat); }), diff --git a/src/envoy/utils/BUILD b/src/envoy/utils/BUILD index 9057f0e14bdc..ed9418a13fd3 100644 --- a/src/envoy/utils/BUILD +++ b/src/envoy/utils/BUILD @@ -34,7 +34,7 @@ envoy_cc_library( deps = [ ":utils_lib", "//include/istio/utils:attribute_names_header", - "//src/istio/authn:context_proto", + "//src/istio/authn:context_proto_cc", "//src/istio/utils:attribute_names_lib", "//src/istio/utils:utils_lib", ":filter_names_lib", diff --git a/src/envoy/utils/mixer_control.cc b/src/envoy/utils/mixer_control.cc index 53fcf354d396..81928b3d005e 100644 --- a/src/envoy/utils/mixer_control.cc +++ b/src/envoy/utils/mixer_control.cc @@ -48,16 +48,18 @@ class EnvoyTimer : public ::istio::mixerclient::Timer { class EnvoyGrpcAsyncClientFactory : public Grpc::AsyncClientFactory { public: EnvoyGrpcAsyncClientFactory(Upstream::ClusterManager &cm, - envoy::api::v2::core::GrpcService config) - : cm_(cm), config_(config) {} + envoy::api::v2::core::GrpcService config, + TimeSource &time_source) + : cm_(cm), config_(config), time_source_(time_source) {} Grpc::AsyncClientPtr create() override { - return std::make_unique(cm_, config_); + return std::make_unique(cm_, config_, time_source_); } private: Upstream::ClusterManager &cm_; envoy::api::v2::core::GrpcService config_; + TimeSource &time_source_; }; inline bool ReadProtoMap( @@ -110,13 +112,14 @@ void SerializeForwardedAttributes( Grpc::AsyncClientFactoryPtr GrpcClientFactoryForCluster( const std::string &cluster_name, Upstream::ClusterManager &cm, - Stats::Scope &scope) { + Stats::Scope &scope, TimeSource &time_source) { envoy::api::v2::core::GrpcService service; service.mutable_envoy_grpc()->set_cluster_name(cluster_name); // Workaround for https://github.com/envoyproxy/envoy/issues/2762 UNREFERENCED_PARAMETER(scope); - return std::make_unique(cm, service); + return std::make_unique(cm, service, + time_source); } // This function is for compatibility with existing node ids. diff --git a/src/envoy/utils/mixer_control.h b/src/envoy/utils/mixer_control.h index 28a796227e2b..f9b34090d0da 100644 --- a/src/envoy/utils/mixer_control.h +++ b/src/envoy/utils/mixer_control.h @@ -41,7 +41,7 @@ void SerializeForwardedAttributes( Grpc::AsyncClientFactoryPtr GrpcClientFactoryForCluster( const std::string &cluster_name, Upstream::ClusterManager &cm, - Stats::Scope &scope); + Stats::Scope &scope, TimeSource &time_source); bool ExtractNodeInfo(const envoy::api::v2::core::Node &node, ::istio::utils::LocalNode *args); diff --git a/src/istio/control/http/BUILD b/src/istio/control/http/BUILD index a21f3c439eb6..d485e0a383ed 100644 --- a/src/istio/control/http/BUILD +++ b/src/istio/control/http/BUILD @@ -33,7 +33,7 @@ cc_library( "//include/istio/control/http:headers_lib", "//include/istio/utils:attribute_names_header", "//src/istio/api_spec:api_spec_lib", - "//src/istio/authn:context_proto", + "//src/istio/authn:context_proto_cc", "//src/istio/control:common_lib", "//src/istio/utils:attribute_names_lib", "//src/istio/utils:utils_lib",