From b78220981c75a2e36620aa2c6d7823ffdebc06f9 Mon Sep 17 00:00:00 2001 From: Hans Hasselberg Date: Thu, 9 Apr 2020 20:58:22 +0200 Subject: [PATCH] connect: support envoy 1.14.1 (#7624) --- .circleci/config.yml | 30 +++++++++---------- command/connect/envoy/envoy.go | 2 +- .../envoy/testdata/access-log-path.golden | 2 +- .../connect/envoy/testdata/defaults.golden | 2 +- .../envoy/testdata/existing-ca-file.golden | 2 +- .../envoy/testdata/extra_-multiple.golden | 2 +- .../envoy/testdata/extra_-single.golden | 2 +- .../envoy/testdata/grpc-addr-config.golden | 2 +- .../envoy/testdata/grpc-addr-env.golden | 2 +- .../envoy/testdata/grpc-addr-flag.golden | 2 +- .../envoy/testdata/grpc-addr-unix.golden | 2 +- .../testdata/stats-config-override.golden | 2 +- .../connect/envoy/testdata/token-arg.golden | 2 +- .../connect/envoy/testdata/token-env.golden | 2 +- .../envoy/testdata/token-file-arg.golden | 2 +- .../envoy/testdata/token-file-env.golden | 2 +- .../testdata/zipkin-tracing-config.golden | 2 +- test/integration/connect/envoy/run-tests.sh | 2 +- website/source/docs/connect/proxies/envoy.md | 3 +- 19 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00cc86703..f4147e110 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -554,13 +554,13 @@ jobs: - store_test_results: path: ui-v2/test-results - envoy-integration-test-1.10.0: + envoy-integration-test-1.11.2: 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 environment: - ENVOY_VERSIONS: "1.10.0" + ENVOY_VERSIONS: "1.11.2" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -579,13 +579,6 @@ jobs: path: ./test/integration/connect/envoy/workdir/logs destination: container-logs - envoy-integration-test-1.11.2: - docker: - - image: *GOLANG_IMAGE - environment: - ENVOY_VERSIONS: "1.11.2" - steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.12.2: docker: - image: *GOLANG_IMAGE @@ -593,11 +586,18 @@ jobs: ENVOY_VERSIONS: "1.12.2" steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.13.0: + envoy-integration-test-1.13.1: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSIONS: "1.13.0" + ENVOY_VERSIONS: "1.13.1" + steps: *ENVOY_INTEGRATION_TEST_STEPS + + envoy-integration-test-1.14.1: + docker: + - image: *GOLANG_IMAGE + environment: + ENVOY_VERSIONS: "1.14.1" steps: *ENVOY_INTEGRATION_TEST_STEPS # run integration tests for the connect ca providers @@ -708,16 +708,16 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1.10.0: - requires: - - dev-build - envoy-integration-test-1.11.2: requires: - dev-build - envoy-integration-test-1.12.2: requires: - dev-build - - envoy-integration-test-1.13.0: + - envoy-integration-test-1.13.1: + requires: + - dev-build + - envoy-integration-test-1.14.1: requires: - dev-build diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index a917856f7..2f3f0b898 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -70,7 +70,7 @@ type cmd struct { } const ( - defaultEnvoyVersion = "1.13.1" + defaultEnvoyVersion = "1.14.1" meshGatewayVal = "mesh" ) diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index fc858f99f..75d0440ed 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index b8400de77..5e47b0b76 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index ff77f8deb..9000ab4c6 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 93f02898c..a5117f823 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index a02b58a48..23966bca9 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index c5a083d2c..ac11b3803 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index c5a083d2c..ac11b3803 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index c5a083d2c..ac11b3803 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index dfa766fd9..153c48e64 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 129439fe8..c69f68691 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index cd4e958d3..f89bd32b0 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index cd4e958d3..f89bd32b0 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index cd4e958d3..f89bd32b0 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index cd4e958d3..f89bd32b0 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 0557269d1..abb589b33 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.13.1" + "envoy_version": "1.14.1" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index c674b7fbb..55ce31b0f 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-} STOP_ON_FAIL=${STOP_ON_FAIL:-} # ENVOY_VERSIONS is the list of envoy versions to run each test against -ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.3 1.13.1"} +ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.11.2 1.12.3 1.13.1 1.14.1"} if [ ! -z "$DEBUG" ] ; then set -x diff --git a/website/source/docs/connect/proxies/envoy.md b/website/source/docs/connect/proxies/envoy.md index 208495da8..a63b9ad9e 100644 --- a/website/source/docs/connect/proxies/envoy.md +++ b/website/source/docs/connect/proxies/envoy.md @@ -36,7 +36,8 @@ compatible Envoy versions. | Consul Version | Compatible Envoy Versions | |---|---| -| 1.7.0 and higher | 1.13.1, 1.12.3, 1.11.2, 1.10.0* | +| 1.8.x | 1.14.1, 1.13.1, 1.12.3, 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† | | 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |