From ee30a54c7fc5c8ebadd62c116eab62e19754b3bf Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:49:16 -0500 Subject: [PATCH] [1.9.x] connect: update supported envoy versions to 1.16.3, 1.15.4, 1.14.7, 1.13.7 (#10105) --- .changelog/10105.txt | 3 + .circleci/config.yml | 18 +-- agent/xds/envoy_versioning_test.go | 10 +- agent/xds/proxysupport/proxysupport.go | 4 +- ...ting-gateway-lb-config.envoy-1-17-x.golden | 136 ------------------ ..._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 +- 28 files changed, 43 insertions(+), 174 deletions(-) create mode 100644 .changelog/10105.txt delete mode 100644 agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden diff --git a/.changelog/10105.txt b/.changelog/10105.txt new file mode 100644 index 0000000000..7318a3a2df --- /dev/null +++ b/.changelog/10105.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.16.3, 1.15.4, 1.14.7, 1.13.7 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 5898bddf10..bea455cf5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -783,20 +783,20 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1_14_6: + envoy-integration-test-1_14_7: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.14.6" + ENVOY_VERSION: "1.14.7" - envoy-integration-test-1_15_3: + envoy-integration-test-1_15_4: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.15.3" + ENVOY_VERSION: "1.15.4" - envoy-integration-test-1_16_2: + envoy-integration-test-1_16_3: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.2" + ENVOY_VERSION: "1.16.3" # run integration tests for the connect ca providers test-connect-ca-providers: @@ -935,13 +935,13 @@ workflows: - envoy-integration-test-1_13_7: requires: - dev-build - - envoy-integration-test-1_14_6: + - envoy-integration-test-1_14_7: requires: - dev-build - - envoy-integration-test-1_15_3: + - envoy-integration-test-1_15_4: requires: - dev-build - - envoy-integration-test-1_16_2: + - envoy-integration-test-1_16_3: requires: - dev-build website: diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 567179d177..e55e196791 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -5,9 +5,11 @@ import ( envoycore "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" envoytype "github.com/envoyproxy/go-control-plane/envoy/type" - "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/go-version" "github.com/stretchr/testify/require" + + "github.com/hashicorp/consul/sdk/testutil" ) func TestDetermineEnvoyVersionFromNode(t *testing.T) { @@ -100,9 +102,9 @@ 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.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", + "1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.14.5", "1.14.6", "1.14.7", + "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", + "1.16.0", "1.16.1", "1.16.2", "1.16.3", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 75df9c2e0d..5fbc3c7de1 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.2", - "1.15.3", + "1.16.3", + "1.15.4", "1.14.6", "1.13.7", } diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden deleted file mode 100644 index d228a0cdb5..0000000000 --- a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden +++ /dev/null @@ -1,136 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "virtualHosts": [ - { - "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "domains": [ - "*" - ], - "routes": [ - { - "match": { - "prefix": "/" - }, - "route": { - "autoHostRewrite": true, - "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "hashPolicy": [ - { - "cookie": { - "name": "chocolate-chip" - }, - "terminal": true - }, - { - "header": { - "headerName": "x-user-id" - } - }, - { - "connectionProperties": { - "sourceIp": true - }, - "terminal": true - } - ] - } - } - ] - } - ], - "validateClusters": true - }, - { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "virtualHosts": [ - { - "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "domains": [ - "*" - ], - "routes": [ - { - "match": { - "prefix": "/" - }, - "route": { - "autoHostRewrite": true, - "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "hashPolicy": [ - { - "cookie": { - "name": "chocolate-chip" - }, - "terminal": true - }, - { - "header": { - "headerName": "x-user-id" - } - }, - { - "connectionProperties": { - "sourceIp": true - }, - "terminal": true - } - ] - } - } - ] - } - ], - "validateClusters": true - }, - { - "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "virtualHosts": [ - { - "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "domains": [ - "*" - ], - "routes": [ - { - "match": { - "prefix": "/" - }, - "route": { - "autoHostRewrite": true, - "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "hashPolicy": [ - { - "cookie": { - "name": "chocolate-chip" - }, - "terminal": true - }, - { - "header": { - "headerName": "x-user-id" - } - }, - { - "connectionProperties": { - "sourceIp": true - }, - "terminal": true - } - ] - } - } - ] - } - ], - "validateClusters": true - } - ], - "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", - "nonce": "00000001" -} 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 6973e9181a..3a5c017423 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 1bec11d8c4..c080b31f8f 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 59afb5359e..8934c316e8 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 86cbb6cff4..02b1b6d713 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 28a211fcaf..0d71941aad 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 7e99c7191b..e90395b2d2 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index b57aa5c852..ac106ca292 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index 1c7b59047c..3b65761bc9 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 1c7b59047c..3b65761bc9 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 1c7b59047c..3b65761bc9 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 683c4b2619..8fa84e1315 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.2" + "envoy_version": "1.16.3" } }, "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 43104f4c80..c914195f37 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.2" + "envoy_version": "1.16.3" } }, "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 f72abe08c4..a8fbcfff11 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.2" + "envoy_version": "1.16.3" } }, "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 6495664992..ae21851141 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.2" + "envoy_version": "1.16.3" } }, "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 16c67c473b..908dc2d2fd 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 044310ed49..f43edfec5e 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 26e6c53051..4aef3f7fed 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 08e79a7efa..1867c82d33 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 08e79a7efa..1867c82d33 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 08e79a7efa..1867c82d33 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 08e79a7efa..1867c82d33 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 0188fd90ff..82b6c34dbd 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.2" + "envoy_version": "1.16.3" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index b73dc379eb..fd2dee6aa7 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.2"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.16.3"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then