connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.1…

…4.6, 1.13.7 (#9737) (#9753)
hashicorp · Apr 21, 2021 · 3e7bb52 · 3e7bb52
1 parent 2ee5cf0
commit 3e7bb52
Show file tree

Hide file tree

Showing 30 changed files with 55 additions and 46 deletions.
diff --git a/.changelog/9737.txt b/.changelog/9737.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.14.6, 1.13.7
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -755,14 +755,14 @@ jobs:
           command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_13_6: &ENVOY_TESTS
+  envoy-integration-test-1_13_7: &ENVOY_TESTS
     docker:
       # We only really need bash and docker-compose which is installed on all
       # Circle images but pick Go since we have to pick one of them.
       - image: *GOLANG_IMAGE
     parallelism: 2
     environment:
-      ENVOY_VERSION: "1.13.6"
+      ENVOY_VERSION: "1.13.7"
     steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
@@ -795,20 +795,20 @@ jobs:
           path: *TEST_RESULTS_DIR
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_14_5:
+  envoy-integration-test-1_14_6:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.14.5"
+      ENVOY_VERSION: "1.14.6"
 
-  envoy-integration-test-1_15_2:
+  envoy-integration-test-1_15_3:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.15.2"
+      ENVOY_VERSION: "1.15.3"
 
-  envoy-integration-test-1_16_0:
+  envoy-integration-test-1_16_2:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.16.0"
+      ENVOY_VERSION: "1.16.2"
 
   # run integration tests for the connect ca providers
   test-connect-ca-providers:
@@ -945,16 +945,16 @@ workflows:
       - nomad-integration-0_8:
           requires:
             - dev-build
-      - envoy-integration-test-1_13_6:
+      - envoy-integration-test-1_13_7:
           requires:
             - dev-build
-      - envoy-integration-test-1_14_5:
+      - envoy-integration-test-1_14_6:
           requires:
             - dev-build
-      - envoy-integration-test-1_15_2:
+      - envoy-integration-test-1_15_3:
           requires:
             - dev-build
-      - envoy-integration-test-1_16_0:
+      - envoy-integration-test-1_16_2:
           requires:
             - dev-build
   website:

diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
@@ -99,9 +99,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 
 	// Insert a bunch of valid versions.
 	for _, v := range []string{
-		"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.14.1",
-		"1.14.2", "1.14.3", "1.14.4", "1.14.5",
-		"1.15.0", "1.15.1", "1.15.2", "1.16.0",
+		"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.13.7",
+		"1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.14.5", "1.14.6",
+		"1.15.0", "1.15.1", "1.15.2", "1.15.3",
+		"1.16.0", "1.16.1", "1.16.2",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}

diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
@@ -7,8 +7,8 @@ package proxysupport
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
-	"1.16.0",
-	"1.15.2",
-	"1.14.5",
-	"1.13.6",
+	"1.16.2",
+	"1.15.3",
+	"1.14.6",
+	"1.13.7",
 }
diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden
@@ -13,7 +13,7 @@
     "id": "ingress-gateway",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
@@ -13,7 +13,7 @@
     "id": "ingress-gateway",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
@@ -13,7 +13,7 @@
     "id": "my-gateway-123",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
@@ -13,7 +13,7 @@
     "id": "my-gateway",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden
@@ -13,7 +13,7 @@
     "id": "ingress-gateway-1",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden
@@ -13,7 +13,7 @@
     "id": "test-proxy",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.16.0"
+      "envoy_version": "1.16.2"
     }
   },
   "static_resources": {

diff --git 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.16.0"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.16.2"}
 export ENVOY_VERSION
 
 if [ ! -z "$DEBUG" ] ; then

diff --git a/test/integration/connect/envoy/test-envoy-versions.sh b/test/integration/connect/envoy/test-envoy-versions.sh
@@ -18,15 +18,20 @@ versions=(
     1.13.3
     1.13.4
     1.13.6
+    1.13.7
     1.14.1
     1.14.2
     1.14.3
     1.14.4
     1.14.5
+    1.14.6
     1.15.0
     1.15.1
     1.15.2
+    1.15.3
     1.16.0
+    1.16.1
+    1.16.2
 )
 
 for v in "${versions[@]}"; do

diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx
@@ -74,7 +74,7 @@ proxy configuration needed.
   allowed to access by [Connect intentions](/docs/connect/intentions).
 
 - `-envoy-version` - The version of envoy that is being started. Default is
-  `1.16.0`. This is required so that the correct configuration can be generated.
+  `1.16.2`. This is required so that the correct configuration can be generated.
 
 - `-no-central-config` - By default the proxy's bootstrap configuration can be
   customized centrally. This requires that the command run on the same agent

diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
@@ -35,9 +35,9 @@ compatible Envoy versions.
 
 | Consul Version      | Compatible Envoy Versions        |
 | ------------------- | -------------------------------- |
-| 1.9.x               | 1.16.0, 1.15.2, 1.14.5‡, 1.13.6‡ |
-| 1.8.x               | 1.14.5, 1.13.6, 1.12.7, 1.11.2   |
-| 1.7.x               | 1.13.6, 1.12.7, 1.11.2, 1.10.0\* |
+| 1.9.x               | 1.16.2, 1.15.3, 1.14.6‡, 1.13.7‡ |
+| 1.8.x               | 1.14.6, 1.13.7, 1.12.7, 1.11.2   |
+| 1.7.x               | 1.13.7, 1.12.7, 1.11.2, 1.10.0\* |
 | 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0†    |
 | 1.5.1, 1.5.0        | 1.9.1, 1.8.0†                    |
 | 1.4.x, 1.3.x        | 1.9.1, 1.8.0†, 1.7.0†            |
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,15 +18,20 @@ versions=( @@
 .13.3
 .13.4
 .13.6
+.13.7
 .14.1
 .14.2
 .14.3
 .14.4
 .14.5
+.14.6
 .15.0
 .15.1
 .15.2
+.15.3
 .16.0
+.16.1
+.16.2
     )
     for v in "${versions[@]}"; do
@@ Expand Down @@