From 7605dff46ef7571fe95c3831ca3d0b244294e7b2 Mon Sep 17 00:00:00 2001 From: Evan Culver Date: Tue, 21 Sep 2021 15:39:36 -0700 Subject: [PATCH] add envoy 1.19.1 --- .circleci/config.yml | 8 ++++++++ agent/xds/proxysupport/proxysupport.go | 1 + test/integration/connect/envoy/run-tests.sh | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54798f322a..5f35f8ba4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -859,6 +859,11 @@ jobs: environment: ENVOY_VERSION: "1.18.4" + envoy-integration-test-1_19_1: + <<: *ENVOY_TESTS + environment: + ENVOY_VERSION: "1.19.1" + # run integration tests for the connect ca providers test-connect-ca-providers: docker: @@ -1117,6 +1122,9 @@ workflows: - envoy-integration-test-1_18_4: requires: - dev-build + - envoy-integration-test-1_19_1: + requires: + - dev-build website: unless: << pipeline.parameters.trigger-load-test >> diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index a8f0b5051b..908a7ba401 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -7,6 +7,7 @@ package proxysupport // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ + "1.19.1", "1.18.4", "1.17.4", "1.16.5", diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 2015c373f9..d6e2501192 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-} export TEST_V2_XDS # ENVOY_VERSION to run each test against -ENVOY_VERSION=${ENVOY_VERSION:-"1.18.4"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.19.1"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then