Skip to content

configs: match latest API changes #4185

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

Merged
mattklein123 merged 2 commits into from
Aug 16, 2018
Merged

configs: match latest API changes #4185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
260b115
configs: match latest API changes
zuercher Aug 16, 2018
da2f6a3
remove extra line introduce in previous commit
zuercher Aug 16, 2018
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
1 change: 0 additions & 1 deletion bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ def _python_deps():
build_file = "@envoy//bazel/external:twitter_common_finagle_thrift.BUILD",
)


# Bazel native C++ dependencies. For the depedencies that doesn't provide autoconf/automake builds.
def _cc_deps():
_repository_impl("grpc_httpjson_transcoding")
Expand Down
6 changes: 4 additions & 2 deletions configs/envoy_front_proxy_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
- name: envoy.health_check
config:
pass_through_mode: false
endpoint: "/healthcheck"
headers:
- name: ":path"
exact_match: "/healthcheck"
- name: envoy.buffer
config:
max_request_bytes: 5242880
Expand Down Expand Up @@ -153,4 +155,4 @@ admin:
socket_address:
protocol: TCP
address: 0.0.0.0
port_value: 9901
port_value: 9901
15 changes: 9 additions & 6 deletions configs/envoy_service_to_service_v2.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
prefix: "/"
headers:
- name: content-type
value: application/grpc
exact_match: application/grpc
route:
cluster: local_service_grpc
- match:
Expand All @@ -34,7 +34,9 @@
- name: envoy.health_check
config:
pass_through_mode: true
endpoint: "/healthcheck"
headers:
- name: ":path"
exact_match: "/healthcheck"
cache_time: 2.5s
- name: envoy.buffer
config:
Expand Down Expand Up @@ -168,8 +170,9 @@ static_resources:
config_source:
api_config_source:
api_type: GRPC
cluster_names:
- rds
grpc_services:
envoy_grpc:
cluster_name: "rds"
route_config_name: rds_config_for_listener_1
add_user_agent: true
tracing:
Expand Down Expand Up @@ -430,7 +433,7 @@ static_resources:
- collector-grpc.lightstep.com
- name: cds_cluster
connect_timeout: 0.25s
type: STRICT_DNS
type: STRICT_DNS
lb_policy: ROUND_ROBIN
hosts:
- socket_address:
Expand Down Expand Up @@ -479,4 +482,4 @@ admin:
socket_address:
protocol: TCP
address: 0.0.0.0
port_value: 9901
port_value: 9901