[1.9.x] connect: update supported envoy versions to 1.16.4, 1.15.5, 1…

….14.6, and 1.13.7 (#10232) manual backport of #10231 to 1.9.x
hashicorp · May 12, 2021 · a179607 · a179607
1 parent ff6d4c7
commit a179607
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 33 deletions.
diff --git a/.changelog/10232.txt b/.changelog/10232.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -788,15 +788,15 @@ jobs:
     environment:
       ENVOY_VERSION: "1.14.7"
 
-  envoy-integration-test-1_15_4:
+  envoy-integration-test-1_15_5:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.15.4"
+      ENVOY_VERSION: "1.15.5"
 
-  envoy-integration-test-1_16_3:
+  envoy-integration-test-1_16_4:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.16.3"
+      ENVOY_VERSION: "1.16.4"
 
   # run integration tests for the connect ca providers
   test-connect-ca-providers:
@@ -951,10 +951,10 @@ workflows:
       - envoy-integration-test-1_14_7:
           requires:
             - dev-build
-      - envoy-integration-test-1_15_4:
+      - envoy-integration-test-1_15_5:
           requires:
             - dev-build
-      - envoy-integration-test-1_16_3:
+      - envoy-integration-test-1_16_4:
           requires:
             - dev-build
   website:

diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
@@ -103,8 +103,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	for _, v := range []string{
 		"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.14.7",
-		"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4",
-		"1.16.0", "1.16.1", "1.16.2", "1.16.3",
+		"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.5",
+		"1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4",
 	} {
 		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.3",
-	"1.15.4",
+	"1.16.4",
+	"1.15.5",
 	"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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"
+      "envoy_version": "1.16.4"
     }
   },
   "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.3"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.16.4"}
 export ENVOY_VERSION
 
 if [ ! -z "$DEBUG" ] ; then