From f49144fcee26da57d5211065645dada07747cd94 Mon Sep 17 00:00:00 2001 From: Hans Hasselberg Date: Tue, 10 Mar 2020 11:04:46 +0100 Subject: [PATCH] connect: support for envoy 1.13.1 and 1.12.3 (#7380) * setup new envoy versions for CI * bump version on the website too. --- test/integration/connect/envoy/helpers.bash | 8 +++++--- test/integration/connect/envoy/run-tests.sh | 2 +- website/source/docs/connect/proxies/envoy.md | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash index 602ab1cce..6fa3c16e2 100755 --- a/test/integration/connect/envoy/helpers.bash +++ b/test/integration/connect/envoy/helpers.bash @@ -146,10 +146,12 @@ function get_envoy_listener_filters { [ "$status" -eq 0 ] local ENVOY_VERSION=$(echo $output | jq --raw-output '.configs[0].bootstrap.node.metadata.envoy_version') local QUERY='' - if [ "$ENVOY_VERSION" == "1.13.0" ]; then - QUERY='.configs[2].dynamic_listeners[].active_state.listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"' - else + # from 1.13.0 on the config json looks slightly different + # 1.10.x, 1.11.x, 1.12.x are not affected + if [[ "$ENVOY_VERSION" =~ ^1\.1[012]\. ]]; then 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 echo "$output" | jq --raw-output "$QUERY" } diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 50c886b67..c674b7fbb 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-} STOP_ON_FAIL=${STOP_ON_FAIL:-} # 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 set -x diff --git a/website/source/docs/connect/proxies/envoy.md b/website/source/docs/connect/proxies/envoy.md index 8e40d3c10..af502ec40 100644 --- a/website/source/docs/connect/proxies/envoy.md +++ b/website/source/docs/connect/proxies/envoy.md @@ -36,7 +36,7 @@ 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.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† |