luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

connect: support for envoy 1.13.1 and 1.12.3 (#7380) 

* setup new envoy versions for CI
* bump version on the website too.
This commit is contained in:
Hans Hasselberg 2020-03-10 11:04:46 +01:00 committed by GitHub
parent 520d464c85
commit f49144fcee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/connect/envoy/helpers.bash
View File

@ -146,10 +146,12 @@ function get_envoy_listener_filters {
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
local ENVOY_VERSION=$(echo $output | jq --raw-output '.configs[0].bootstrap.node.metadata.envoy_version') local ENVOY_VERSION=$(echo $output | jq --raw-output '.configs[0].bootstrap.node.metadata.envoy_version')
local QUERY='' local QUERY=''
if [ "$ENVOY_VERSION" == "1.13.0" ]; then # from 1.13.0 on the config json looks slightly different
QUERY='.configs[2].dynamic_listeners[].active_state.listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"' # 1.10.x, 1.11.x, 1.12.x are not affected
else if [[ "$ENVOY_VERSION" =~ ^1\.1[012]\. ]]; then
QUERY='.configs[2].dynamic_active_listeners[].listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"' QUERY='.configs[2].dynamic_active_listeners[].listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"'
else
QUERY='.configs[2].dynamic_listeners[].active_state.listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"'
fi fi
echo "$output" | jq --raw-output "$QUERY" echo "$output" | jq --raw-output "$QUERY"
} }

2
test/integration/connect/envoy/run-tests.sh
View File

@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-}
STOP_ON_FAIL=${STOP_ON_FAIL:-} STOP_ON_FAIL=${STOP_ON_FAIL:-}
# ENVOY_VERSIONS is the list of envoy versions to run each test against # ENVOY_VERSIONS is the list of envoy versions to run each test against
ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.2 1.13.0"} ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.3 1.13.1"}
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then
set -x set -x

2
website/source/docs/connect/proxies/envoy.md
View File

@ -36,7 +36,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
|---|---| |---|---|
| 1.7.0 and higher | 1.13.0, 1.12.2, 1.11.2, 1.10.0* | | 1.7.0 and higher | 1.13.1, 1.12.3, 1.11.2, 1.10.0* |
| 1.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0† | | 1.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0† |
| 1.5.0, 1.5.1 | 1.9.1, 1.8.0† | | 1.5.0, 1.5.1 | 1.9.1, 1.8.0† |
| 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† | | 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |