From 22640c9e87bac36673053d1ac6396ebbec9b4c2e Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" Date: Wed, 10 Feb 2021 13:11:51 -0600 Subject: [PATCH] [1.8.x] connect: update supported envoy point releases to 1.14.6, 1.13.7, 1.12.7, 1.11.2 (#9739) selective backport of #9737 --- .changelog/9739.txt | 3 +++ .circleci/config.yml | 12 ++++++------ agent/xds/proxysupport/proxysupport.go | 4 ++-- ...UL_HTTP_ADDR-with-https-scheme-enables-tls.golden | 2 +- .../connect/envoy/testdata/access-log-path.golden | 2 +- command/connect/envoy/testdata/defaults.golden | 2 +- .../connect/envoy/testdata/existing-ca-file.golden | 2 +- .../connect/envoy/testdata/existing-ca-path.golden | 2 +- .../connect/envoy/testdata/extra_-multiple.golden | 2 +- command/connect/envoy/testdata/extra_-single.golden | 2 +- .../connect/envoy/testdata/grpc-addr-config.golden | 2 +- command/connect/envoy/testdata/grpc-addr-env.golden | 2 +- command/connect/envoy/testdata/grpc-addr-flag.golden | 2 +- command/connect/envoy/testdata/grpc-addr-unix.golden | 2 +- .../ingress-gateway-address-specified.golden | 2 +- .../testdata/ingress-gateway-no-auto-register.golden | 2 +- ...gateway-register-with-service-and-proxy-id.golden | 2 +- ...way-register-with-service-without-proxy-id.golden | 2 +- .../connect/envoy/testdata/ingress-gateway.golden | 2 +- .../envoy/testdata/stats-config-override.golden | 2 +- command/connect/envoy/testdata/token-arg.golden | 2 +- command/connect/envoy/testdata/token-env.golden | 2 +- command/connect/envoy/testdata/token-file-arg.golden | 2 +- command/connect/envoy/testdata/token-file-env.golden | 2 +- .../envoy/testdata/zipkin-tracing-config.golden | 2 +- test/integration/connect/envoy/run-tests.sh | 2 +- .../integration/connect/envoy/test-envoy-versions.sh | 3 ++- 27 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 .changelog/9739.txt diff --git a/.changelog/9739.txt b/.changelog/9739.txt new file mode 100644 index 000000000000..4091396851e6 --- /dev/null +++ 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 index 2972dfbda638..6bf3ad74db37 100644 --- 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 index 7961b0dd07c0..f03d4d073141 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.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 index 6c3b5e372691..900bca148d39 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.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 index b0a36a60a1cc..2692027ec492 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.5" + "envoy_version": "1.14.6" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index e729106d88d5..cf1597123b7d 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.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 index ec9d2fca78e3..871fdd7d27ce 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.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 index b4a98b57a5ae..2c85c998058e 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.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 index c6441496c3d1..f9efb9e0cfe0 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.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 index 8dcca90230e6..1f979ab1f772 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.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 index a46910320be1..285e89f36014 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.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 index a46910320be1..285e89f36014 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.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 index a46910320be1..285e89f36014 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.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 index 69abe1ca091c..794fc4726f9d 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.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 index 83475243b67b..7e2d943052a1 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.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 index d5efd5635434..13380aeb992b 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.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 index 2e98760167b5..a802ae135f8e 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.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 index 2572858a415d..c08947d2571c 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.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 index a45661f2da50..a3eccec1d100 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.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 index 5fd88d2029ad..990a45b9f17a 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.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 index fd1c918f409a..5122051175ae 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.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 index fd1c918f409a..5122051175ae 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.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 index fd1c918f409a..5122051175ae 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.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 index fd1c918f409a..5122051175ae 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.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 index 2a697a7a9d0f..b1f1a18ce5a7 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.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 index 63414efed516..0134ce72e8e7 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.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 index d8232a38a3d1..ae21564a7bfb 100755 --- 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