status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix integration test for older Envoy versions

This commit is contained in:
Paul Banks 2021-08-27 21:28:01 +01:00
parent 2281d883b9
commit 843079f33a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
View File

@ -4,18 +4,22 @@ services {
proxy { proxy {
config { config {
# Note that http2_protocol_options is a deprecated field and Envoy 1.17
# and up would prefer:
# typed_extension_protocol_options:
# envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
# "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
# explicit_http_config:
# http2_protocol_options:
#
# But that breaks 1.15 and 1.16. For now use this which is supported by
# all our supported versions# to avoid needing to setup different
# bootstrap based on the envoy version.
envoy_extra_static_clusters_json = <<EOF envoy_extra_static_clusters_json = <<EOF
{ {
"name": "sds-cluster", "name": "sds-cluster",
"connect_timeout": "5s", "connect_timeout": "5s",
"typed_extension_protocol_options": { "http2_protocol_options": {},
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http2_protocol_options": {}
}
}
},
"load_assignment": { "load_assignment": {
"cluster_name": "sds-cluster", "cluster_name": "sds-cluster",
"endpoints": [ "endpoints": [