connect: update supported envoy point releases to 1.13.7, 1.12.7, 1.1…

…1.2, 1.10.0 selective backport of #9737
hashicorp · Feb 8, 2021 · 7ea38b4 · 7ea38b4
1 parent 93c13b9
commit 7ea38b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -671,11 +671,11 @@ jobs:
       ENVOY_VERSIONS: "1.12.7"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1_13_6:
+  envoy-integration-test-1_13_7:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSIONS: "1.13.6"
+      ENVOY_VERSIONS: "1.13.7"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
   # run tests on vault ca provider integration tests
@@ -784,7 +784,7 @@ workflows:
       - envoy-integration-test-1_12_7:
           requires:
             - dev-build
-      - envoy-integration-test-1_13_6:
+      - envoy-integration-test-1_13_7:
           requires:
             - dev-build
       - vault-ca-provider:

diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
@@ -7,7 +7,7 @@ package proxysupport
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
-	"1.13.6",
+	"1.13.7",
 	"1.12.7",
 	"1.11.2",
 	"1.10.0",

diff --git 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.7 1.13.6"}
+ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.7 1.13.7"}
 
 if [ ! -z "$DEBUG" ] ; then
   set -x

diff --git a/test/integration/connect/envoy/test-envoy-versions.sh b/test/integration/connect/envoy/test-envoy-versions.sh
@@ -7,6 +7,7 @@ unset CDPATH
 cd "$(dirname "$0")"
 
 versions=(
+    1.13.7
     1.13.6
     1.13.4
     1.13.5