Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

envoy: update envoy ref and update config to v3 supported schema #626

Merged
merged 3 commits into from
Jan 13, 2020
Merged

envoy: update envoy ref and update config to v3 supported schema #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8f8f04
wip
Jan 9, 2020
b3bbd64
update envoy
Jan 10, 2020
ed84062
remove v2 ref
Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion envoy
Open in desktop
Submodule envoy updated 2833 files
7,318 changes: 3,659 additions & 3,659 deletions library/common/certificates.inc
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 15 additions & 13 deletions library/common/config_template.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ const char* config_template = R"(
- endpoint:
address:
socket_address: {address: {{ domain }}, port_value: 443}
tls_context: &base_tls_context
common_tls_context:
validation_context:
trusted_ca:
inline_string: |
transport_socket: &base_transport_socket
name: envoy.transport_sockets.tls
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3alpha.UpstreamTlsContext
common_tls_context:
validation_context:
trusted_ca:
inline_string: |
)"
#include "certificates.inc"
R"(
verify_subject_alt_name:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: #630

- {{ domain }}
sni: {{ domain }}
R"(
sni: {{ domain }}
type: LOGICAL_DNS
upstream_connection_options: &upstream_opts
tcp_keepalive:
Expand All @@ -41,7 +42,7 @@ R"(
load_assignment:
cluster_name: base_wlan
endpoints: *base_endpoints
tls_context: *base_tls_context
transport_socket: *base_transport_socket
type: LOGICAL_DNS
upstream_connection_options: *upstream_opts
- name: base_wwan # Note: the direct API depends on the existence of a cluster with this name.
Expand All @@ -52,7 +53,7 @@ R"(
load_assignment:
cluster_name: base_wwan
endpoints: *base_endpoints
tls_context: *base_tls_context
transport_socket: *base_transport_socket
type: LOGICAL_DNS
upstream_connection_options: *upstream_opts
- name: stats
Expand All @@ -67,12 +68,13 @@ R"(
- endpoint:
address:
socket_address: {address: {{ stats_domain }}, port_value: 443}
tls_context: *base_tls_context
transport_socket: *base_transport_socket
type: LOGICAL_DNS
stats_flush_interval: {{ stats_flush_interval_seconds }}s
stats_sinks:
- name: envoy.metrics_service
config:
typed_config:
"@type": type.googleapis.com/envoy.config.metrics.v3alpha.MetricsServiceConfig
grpc_service:
envoy_grpc:
cluster_name: stats
Expand Down
2 changes: 0 additions & 2 deletions library/common/engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ static void registerFactories() {
Envoy::Extensions::NetworkFilters::HttpConnectionManager::
forceRegisterHttpConnectionManagerFilterConfigFactory();
Envoy::Extensions::StatSinks::MetricsService::forceRegisterMetricsServiceSinkFactory();
Envoy::Extensions::TransportSockets::RawBuffer::forceRegisterDownstreamRawBufferSocketFactory();
Envoy::Extensions::TransportSockets::RawBuffer::forceRegisterUpstreamRawBufferSocketFactory();
Envoy::Extensions::TransportSockets::Tls::forceRegisterUpstreamSslSocketFactory();
Envoy::Upstream::forceRegisterLogicalDnsClusterFactory();
}
Expand Down
1 change: 0 additions & 1 deletion library/common/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "extensions/filters/http/router/config.h"
#include "extensions/filters/network/http_connection_manager/config.h"
#include "extensions/stat_sinks/metrics_service/config.h"
#include "extensions/transport_sockets/raw_buffer/config.h"
#include "extensions/transport_sockets/tls/config.h"

#include "absl/base/call_once.h"
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/dispatcher_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class DispatcherTest : public testing::Test {
Router::ShadowWriterPtr{new NiceMock<Router::MockShadowWriter>()}, http_context_) {
http_dispatcher_.ready(event_dispatcher_, cm_);
ON_CALL(*cm_.conn_pool_.host_, locality())
.WillByDefault(ReturnRef(envoy::api::v2::core::Locality().default_instance()));
.WillByDefault(ReturnRef(envoy::config::core::v3alpha::Locality().default_instance()));
}

typedef struct {
Expand Down