From ec65890f018be9f2e9b23ba28840830d459cf2d9 Mon Sep 17 00:00:00 2001
From: Evan Culver <eculver@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:35:27 -0800
Subject: [PATCH] connect: Upgrade Envoy 1.20 to 1.20.1 (#11895)

---
 .changelog/11895.txt                           | 3 +++
 .circleci/config.yml                           | 6 +++---
 agent/xds/envoy_versioning_test.go             | 2 +-
 agent/xds/proxysupport/proxysupport.go         | 2 +-
 test/integration/connect/envoy/run-tests.sh    | 2 +-
 website/content/docs/connect/proxies/envoy.mdx | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 .changelog/11895.txt

diff --git a/.changelog/11895.txt b/.changelog/11895.txt
new file mode 100644
index 000000000..3bc591833
--- /dev/null
+++ b/.changelog/11895.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update Envoy supported version of 1.20 to 1.20.1
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 362523f85..274092b15 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -837,10 +837,10 @@ jobs:
     environment:
       ENVOY_VERSION: "1.19.1"
 
-  envoy-integration-test-1_20_0:
+  envoy-integration-test-1_20_1:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.20.0"
+      ENVOY_VERSION: "1.20.1"
 
   # run integration tests for the connect ca providers
   test-connect-ca-providers:
@@ -1091,7 +1091,7 @@ workflows:
       - envoy-integration-test-1_19_1:
           requires:
             - dev-build
-      - envoy-integration-test-1_20_0:
+      - envoy-integration-test-1_20_1:
           requires:
             - dev-build
 
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index 6b715f4c2..75211ecc5 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -126,7 +126,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 		"1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4",
 		"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4",
 		"1.19.0", "1.19.1",
-		"1.20.0",
+		"1.20.0", "1.20.1",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index 9d4304426..7f7c829a6 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.20.0",
+	"1.20.1",
 	"1.19.1",
 	"1.18.4",
 	"1.17.4",
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index b5978ad29..148ceb4d1 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
 DEBUG=${DEBUG:-}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.20.0"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.20.1"}
 export ENVOY_VERSION
 
 if [ ! -z "$DEBUG" ] ; then
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index c5e29b24c..52c1f1471 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -35,7 +35,7 @@ compatible Envoy versions.
 
 | Consul Version      | Compatible Envoy Versions                              |
 | ------------------- | ------------------------------------------------------ |
-| 1.11.x              | 1.20.0, 1.19.1, 1.18.4, 1.17.4                         |
+| 1.11.x              | 1.20.1, 1.19.1, 1.18.4, 1.17.4                         |
 | 1.10.x              | 1.18.4, 1.17.4, 1.16.5, 1.15.5                         |
 | 1.9.x               | 1.16.5, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> |
 | 1.8.x               | 1.14.7, 1.13.7, 1.12.7, 1.11.2                         |