[1.8.x] connect: update supported envoy point releases to 1.14.6, 1.1…

…3.7, 1.12.7, 1.11.2 (#9739) selective backport of #9737
hashicorp · Feb 10, 2021 · 22640c9 · 22640c9
1 parent 415be13
commit 22640c9
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 32 deletions.
diff --git a/.changelog/9739.txt b/.changelog/9739.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy point releases to 1.14.6, 1.13.7, 1.12.7, 1.11.2
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -694,18 +694,18 @@ jobs:
       ENVOY_VERSION: "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_VERSION: "1.13.6"
+      ENVOY_VERSION: "1.13.7"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1_14_5:
+  envoy-integration-test-1_14_6:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.14.5"
+      ENVOY_VERSION: "1.14.6"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
   # run integration tests for the connect ca providers
@@ -846,10 +846,10 @@ 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
-      - envoy-integration-test-1_14_5:
+      - envoy-integration-test-1_14_6:
           requires:
             - dev-build
   website:

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.14.5",
-	"1.13.6",
+	"1.14.6",
+	"1.13.7",
 	"1.12.7",
 	"1.11.2",
 }
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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "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.14.5"
+      "envoy_version": "1.14.6"
     }
   },
   "static_resources": {

diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
@@ -6,7 +6,7 @@ set -eEuo pipefail
 DEBUG=${DEBUG:-}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.14.5"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.14.6"}
 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
@@ -9,11 +9,13 @@ cd "$(dirname "$0")"
 # MISSING: 1.14.0
 # MISSING: 1.13.5
 versions=(
+    1.14.6
     1.14.5
     1.14.4
     1.14.3
     1.14.2
     1.14.1
+    1.13.7
     1.13.6
     1.13.4
     1.13.3
@@ -31,7 +33,6 @@ versions=(
     1.11.2
     1.11.1
     1.11.0
-    1.10.0
 )
 
 for v in "${versions[@]}"; do