add support for envoy 1.14.4, 1.13.4, 1.12.6 (#8216)

hashicorp · Jul 13, 2020 · 496fb5f · 496fb5f
1 parent 4d857d1
commit 496fb5f
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 39 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -581,25 +581,25 @@ jobs:
       - store_artifacts:
           path: *TEST_RESULTS_DIR
 
-  envoy-integration-test-1.12.4:
+  envoy-integration-test-1.12.6:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.12.4"
+      ENVOY_VERSION: "1.12.6"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.13.2:
+  envoy-integration-test-1.13.4:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.13.2"
+      ENVOY_VERSION: "1.13.4"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.14.2:
+  envoy-integration-test-1.14.4:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.14.2"
+      ENVOY_VERSION: "1.14.4"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
   # run integration tests for the connect ca providers
@@ -713,13 +713,13 @@ workflows:
       - envoy-integration-test-1.11.2:
           requires:
             - dev-build
-      - envoy-integration-test-1.12.4:
+      - envoy-integration-test-1.12.6:
           requires:
             - dev-build
-      - envoy-integration-test-1.13.2:
+      - envoy-integration-test-1.13.4:
           requires:
             - dev-build
-      - envoy-integration-test-1.14.2:
+      - envoy-integration-test-1.14.4:
           requires:
             - dev-build
 

diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go
@@ -742,8 +742,8 @@ func setupTLSRootsAndLeaf(t *testing.T, snap *proxycfg.ConfigSnapshot) {
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var supportedEnvoyVersions = []string{
-	"1.14.2",
-	"1.13.2",
-	"1.12.4",
+	"1.14.4",
+	"1.13.4",
+	"1.12.6",
 	"1.11.2",
 }
diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go
@@ -69,7 +69,7 @@ type cmd struct {
 }
 
 const (
-	defaultEnvoyVersion = "1.14.2"
+	defaultEnvoyVersion = "1.14.4"
 	meshGatewayVal      = "mesh"
 )
 

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.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.4"
     }
   },
   "static_resources": {

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

diff --git a/command/connect/envoy/testdata/ingress-gateway-without-register.golden b/command/connect/envoy/testdata/ingress-gateway-without-register.golden
@@ -13,7 +13,7 @@
     "id": "ingress-gateway",
     "metadata": {
       "namespace": "default",
-      "envoy_version": "1.14.2"
+      "envoy_version": "1.14.3"
     }
   },
   "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.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.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.14.2"
+      "envoy_version": "1.14.4"
     }
   },
   "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.2"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.14.4"}
 export ENVOY_VERSION
 
 if [ ! -z "$DEBUG" ] ; then

diff --git a/website/pages/docs/commands/connect/envoy.mdx b/website/pages/docs/commands/connect/envoy.mdx
@@ -76,7 +76,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.14.2`. This is required so that the correct configuration can be generated.
+  `1.14.4`. This is required so that the correct configuration can be generated.
 
 - `-- [pass-through options]` - Any options given after a double dash are passed
   directly through to the `envoy` invocation. See [Envoy's

diff --git a/website/pages/docs/connect/proxies/envoy.mdx b/website/pages/docs/connect/proxies/envoy.mdx
@@ -35,7 +35,7 @@ compatible Envoy versions.
 
 | Consul Version      | Compatible Envoy Versions        |
 | ------------------- | -------------------------------- |
-| 1.8.x               | 1.14.2, 1.13.2, 1.12.4, 1.11.2   |
+| 1.8.x               | 1.14.4, 1.13.4, 1.12.6, 1.11.2   |
 | 1.7.x               | 1.13.1, 1.12.3, 1.11.2, 1.10.0\* |
 | 1.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0†    |
 | 1.5.0, 1.5.1        | 1.9.1, 1.8.0†                    |
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ type cmd struct { @@
     }
     const (
-    	defaultEnvoyVersion = "1.14.2"
+    	defaultEnvoyVersion = "1.14.4"
     	meshGatewayVal      = "mesh"
     )
@@ Expand Down @@