From 7ea38b4136987bdf1b28728b2576c7aeb7a1827c Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Mon, 8 Feb 2021 16:33:40 -0600
Subject: [PATCH] connect: update supported envoy point releases to 1.13.7,
 1.12.7, 1.11.2, 1.10.0

selective backport of #9737
---
 .circleci/config.yml                                  | 6 +++---
 agent/xds/proxysupport/proxysupport.go                | 2 +-
 test/integration/connect/envoy/run-tests.sh           | 2 +-
 test/integration/connect/envoy/test-envoy-versions.sh | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5eb538d26083..19fc579b72ca 100644
--- 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
index 766754bd027f..a27f1a6c83a0 100644
--- 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
index 70ec6e798491..2ca9dd7236be 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.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
index 34e13bc4ee43..24cc60225452 100755
--- 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