diff --git a/.circleci/config.yml b/.circleci/config.yml index 76652302bf..bc6f1e4a17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -548,25 +548,25 @@ jobs: - store_artifacts: path: *TEST_RESULTS_DIR - envoy-integration-test-1.12.2: + envoy-integration-test-1.12.4: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.12.2" + ENVOY_VERSION: "1.12.4" steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.13.1: + envoy-integration-test-1.13.2: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.13.1" + ENVOY_VERSION: "1.13.2" steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.14.1: + envoy-integration-test-1.14.2: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.14.1" + ENVOY_VERSION: "1.14.2" steps: *ENVOY_INTEGRATION_TEST_STEPS # run integration tests for the connect ca providers @@ -680,13 +680,13 @@ workflows: - envoy-integration-test-1.11.2: requires: - dev-build - - envoy-integration-test-1.12.2: + - envoy-integration-test-1.12.4: requires: - dev-build - - envoy-integration-test-1.13.1: + - envoy-integration-test-1.13.2: requires: - dev-build - - envoy-integration-test-1.14.1: + - envoy-integration-test-1.14.2: requires: - dev-build diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 2f0ad30b48..774c29a9da 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -69,7 +69,7 @@ type cmd struct { } const ( - defaultEnvoyVersion = "1.14.1" + defaultEnvoyVersion = "1.14.2" 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 index 4181a3516e..81835fe44f 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 75d0440ed1..f09f7ed2b4 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 5e47b0b767..f7e414862f 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 9000ab4c6b..363f4eb101 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index a5117f823f..2199b4e6b7 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 23966bca99..5e07dd098f 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index ac11b3803f..973f6a82b9 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index ac11b3803f..973f6a82b9 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index ac11b3803f..973f6a82b9 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 153c48e64d..2ff8134770 100644 --- 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.1" + "envoy_version": "1.14.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 index 2977413978..e141aff331 100644 --- 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.1" + "envoy_version": "1.14.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 index 93de714a32..d08041ae1e 100644 --- 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.1" + "envoy_version": "1.14.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 index 79eb04417c..022c5db1fa 100644 --- 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.1" + "envoy_version": "1.14.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 index ff65afa148..d1658a8b11 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "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 index ff65afa148..d1658a8b11 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-without-register.golden b/command/connect/envoy/testdata/ingress-gateway-without-register.golden index 93de714a32..d08041ae1e 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index b8a407e3b9..99a4109e08 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index c69f686918..8f3f50e9b2 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index f89bd32b04..0f52e78c9a 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index f89bd32b04..0f52e78c9a 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index f89bd32b04..0f52e78c9a 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index f89bd32b04..0f52e78c9a 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index abb589b33f..db1fdf9b76 100644 --- 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.1" + "envoy_version": "1.14.2" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 8058912075..ce37a89df5 100755 --- 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.1"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.14.2"} 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 index 4af63b1294..eb4ded8829 100644 --- 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.13.0`. This is required so that the correct configuration can be generated. + `1.14.2`. 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 index f1d7a21536..3b407f197d 100644 --- 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.1, 1.13.1, 1.12.3, 1.11.2 | +| 1.8.x | 1.14.2, 1.13.2, 1.12.4, 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† |