From 194fb0d14432ada0288bc261f17a89e4341b5e30 Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" Date: Wed, 10 Feb 2021 13:11:15 -0600 Subject: [PATCH] connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.14.6, 1.13.7 (#9737) --- .changelog/9737.txt | 3 +++ .circleci/config.yml | 24 +++++++++---------- agent/xds/envoy_versioning_test.go | 7 +++--- agent/xds/proxysupport/proxysupport.go | 8 +++---- ...listener-with-timeouts.envoy-1-13-x.golden | 2 +- ...listener-with-timeouts.envoy-1-14-x.golden | 2 +- ...listener-with-timeouts.envoy-1-15-x.golden | 2 +- ...listener-with-timeouts.envoy-1-16-x.golden | 2 +- ..._ADDR-with-https-scheme-enables-tls.golden | 2 +- .../envoy/testdata/access-log-path.golden | 2 +- .../connect/envoy/testdata/defaults.golden | 2 +- .../envoy/testdata/existing-ca-file.golden | 2 +- .../envoy/testdata/existing-ca-path.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 +- .../ingress-gateway-address-specified.golden | 2 +- .../ingress-gateway-no-auto-register.golden | 2 +- ...-register-with-service-and-proxy-id.golden | 2 +- ...ister-with-service-without-proxy-id.golden | 2 +- .../envoy/testdata/ingress-gateway.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 +- .../connect/envoy/test-envoy-versions.sh | 5 ++++ website/content/commands/connect/envoy.mdx | 2 +- .../content/docs/connect/proxies/envoy.mdx | 6 ++--- 34 files changed, 59 insertions(+), 50 deletions(-) create mode 100644 .changelog/9737.txt diff --git a/.changelog/9737.txt b/.changelog/9737.txt new file mode 100644 index 000000000..9eb3093cf --- /dev/null +++ b/.changelog/9737.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.14.6, 1.13.7 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ff7ccc65..f3276af66 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -779,14 +779,14 @@ jobs: command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui - run: *notify-slack-failure - envoy-integration-test-1_13_6: &ENVOY_TESTS + envoy-integration-test-1_13_7: &ENVOY_TESTS 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 parallelism: 2 environment: - ENVOY_VERSION: "1.13.6" + ENVOY_VERSION: "1.13.7" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -819,20 +819,20 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1_14_5: + envoy-integration-test-1_14_6: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.14.5" + ENVOY_VERSION: "1.14.6" - envoy-integration-test-1_15_2: + envoy-integration-test-1_15_3: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.15.2" + ENVOY_VERSION: "1.15.3" - envoy-integration-test-1_16_0: + envoy-integration-test-1_16_2: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.0" + ENVOY_VERSION: "1.16.2" # run integration tests for the connect ca providers test-connect-ca-providers: @@ -1042,16 +1042,16 @@ workflows: - nomad-integration-0_8: 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 - - envoy-integration-test-1_15_2: + - envoy-integration-test-1_15_3: requires: - dev-build - - envoy-integration-test-1_16_0: + - envoy-integration-test-1_16_2: requires: - dev-build website: diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 54be604d6..567179d17 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -99,9 +99,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { // Insert a bunch of valid versions. for _, v := range []string{ - "1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.14.1", - "1.14.2", "1.14.3", "1.14.4", "1.14.5", - "1.15.0", "1.15.1", "1.15.2", "1.16.0", + "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.15.0", "1.15.1", "1.15.2", "1.15.3", + "1.16.0", "1.16.1", "1.16.2", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 24f88f39b..75df9c2e0 100644 --- 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.0", - "1.15.2", - "1.14.5", - "1.13.6", + "1.16.2", + "1.15.3", + "1.14.6", + "1.13.7", } diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-13-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-13-x.golden index 6fe8be4bb..c48ca056f 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-13-x.golden @@ -133,4 +133,4 @@ ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" -} +} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-14-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-14-x.golden index 6fe8be4bb..c48ca056f 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-14-x.golden @@ -133,4 +133,4 @@ ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" -} +} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-15-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-15-x.golden index 6fe8be4bb..c48ca056f 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-15-x.golden @@ -133,4 +133,4 @@ ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" -} +} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-16-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-16-x.golden index 6fe8be4bb..c48ca056f 100644 --- a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-16-x.golden @@ -133,4 +133,4 @@ ], "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", "nonce": "00000001" -} +} \ No newline at end of file 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 e1e0547bb..3843aecaa 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 096837c16..bb3ab2163 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 3b360404d..5608a6837 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 36c74916f..eceaeeb19 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 6c05cc6f9..06d7c3dea 100644 --- 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.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 839dab512..e7fe687f3 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 94ad8e426..ddaa0f896 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index bca728cd2..17b26c952 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index bca728cd2..17b26c952 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index bca728cd2..17b26c952 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 3dd5fa9a0..a40e5eb32 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.16.0" + "envoy_version": "1.16.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 dc3847a77..1b49ba87e 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.16.0" + "envoy_version": "1.16.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 4f4fc910c..afb5b7965 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.16.0" + "envoy_version": "1.16.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 7a94bed1d..963f29c79 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.16.0" + "envoy_version": "1.16.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 136fb982c..0cd7af795 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 112d49c72..98d541a89 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 62a7809c8..fdfa447c6 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 8f0fcc213..62a9ffb6b 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 8f0fcc213..62a9ffb6b 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 8f0fcc213..62a9ffb6b 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 8f0fcc213..62a9ffb6b 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index ba6245fc3..37e7f07f4 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.16.0" + "envoy_version": "1.16.2" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index fed69474e..b73dc379e 100755 --- 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.0"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.16.2"} 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 index 2fbfcb3bd..3e991b46a 100755 --- a/test/integration/connect/envoy/test-envoy-versions.sh +++ b/test/integration/connect/envoy/test-envoy-versions.sh @@ -18,15 +18,20 @@ versions=( 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.15.0 1.15.1 1.15.2 + 1.15.3 1.16.0 + 1.16.1 + 1.16.2 ) for v in "${versions[@]}"; do diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx index 2621ef4d2..185ea5bc9 100644 --- a/website/content/commands/connect/envoy.mdx +++ b/website/content/commands/connect/envoy.mdx @@ -74,7 +74,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.16.0`. This is required so that the correct configuration can be generated. + `1.16.2`. This is required so that the correct configuration can be generated. - `-no-central-config` - By default the proxy's bootstrap configuration can be customized centrally. This requires that the command run on the same agent diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index b0f6071e8..eb39a4633 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -35,9 +35,9 @@ compatible Envoy versions. | Consul Version | Compatible Envoy Versions | | ------------------- | -------------------------------- | -| 1.9.x | 1.16.0, 1.15.2, 1.14.5‡, 1.13.6‡ | -| 1.8.x | 1.14.5, 1.13.6, 1.12.7, 1.11.2 | -| 1.7.x | 1.13.6, 1.12.7, 1.11.2, 1.10.0\* | +| 1.9.x | 1.16.2, 1.15.3, 1.14.6‡, 1.13.7‡ | +| 1.8.x | 1.14.6, 1.13.7, 1.12.7, 1.11.2 | +| 1.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0\* | | 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0† | | 1.5.1, 1.5.0 | 1.9.1, 1.8.0† | | 1.4.x, 1.3.x | 1.9.1, 1.8.0†, 1.7.0† |