diff --git a/.changelog/10231.txt b/.changelog/10231.txt new file mode 100644 index 000000000..980df4f2a --- /dev/null +++ b/.changelog/10231.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.18.3, 1.17.3, 1.16.4, and 1.15.5 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 48e3fe32c..d7416eb6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -767,14 +767,14 @@ jobs: command: make test-coverage-ci - run: *notify-slack-failure - envoy-integration-test-1_15_4: &ENVOY_TESTS + envoy-integration-test-1_15_5: &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.15.4" + ENVOY_VERSION: "1.15.5" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -807,32 +807,32 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1_15_4-v2compat: + envoy-integration-test-1_15_5-v2compat: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.15.4" + ENVOY_VERSION: "1.15.5" TEST_V2_XDS: "1" - envoy-integration-test-1_16_3: + envoy-integration-test-1_16_4: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.3" + ENVOY_VERSION: "1.16.4" - envoy-integration-test-1_16_3-v2compat: + envoy-integration-test-1_16_4-v2compat: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.3" + ENVOY_VERSION: "1.16.4" TEST_V2_XDS: "1" - envoy-integration-test-1_17_2: + envoy-integration-test-1_17_3: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.17.2" + ENVOY_VERSION: "1.17.3" - envoy-integration-test-1_18_2: + envoy-integration-test-1_18_3: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.18.2" + ENVOY_VERSION: "1.18.3" # run integration tests for the connect ca providers test-connect-ca-providers: @@ -1054,22 +1054,22 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1_15_4: + - envoy-integration-test-1_15_5: requires: - dev-build - - envoy-integration-test-1_15_4-v2compat: + - envoy-integration-test-1_15_5-v2compat: requires: - dev-build - - envoy-integration-test-1_16_3: + - envoy-integration-test-1_16_4: requires: - dev-build - - envoy-integration-test-1_16_3-v2compat: + - envoy-integration-test-1_16_4-v2compat: requires: - dev-build - - envoy-integration-test-1_17_2: + - envoy-integration-test-1_17_3: requires: - dev-build - - envoy-integration-test-1_18_2: + - envoy-integration-test-1_18_3: requires: - dev-build diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index c292eb6c2..8dfe65df6 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -110,7 +110,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { // Insert a bunch of valid versions. for _, v := range []string{ - "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", + "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.5", } { cases[v] = testcase{expect: supportedProxyFeatures{ GatewaysNeedStubClusterWhenEmptyWithIncrementalXDS: true, @@ -118,9 +118,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { }} } for _, v := range []string{ - "1.16.0", "1.16.1", "1.16.2", "1.16.3", - "1.17.0", "1.17.1", "1.17.2", - "1.18.0", "1.18.1", "1.18.2", + "1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4", + "1.17.0", "1.17.1", "1.17.2", "1.17.3", + "1.18.0", "1.18.1", "1.18.2", "1.18.3", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 350569601..01fb84081 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -7,13 +7,13 @@ package proxysupport // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ - "1.18.2", - "1.17.2", - "1.16.3", - "1.15.4", + "1.18.3", + "1.17.3", + "1.16.4", + "1.15.5", } var EnvoyVersionsV2 = []string{ - "1.16.3", - "1.15.4", + "1.16.4", + "1.15.5", } 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 3d83d6589..cd52a65cc 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index ea129a3ec..e65515893 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 774aed3df..6b989665f 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 2c277d994..494752b35 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 2e879d1e1..88618fc5b 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 62b6a79a7..06cd5215d 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index a02eaa904..503226e17 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index 5f1ff4d7c..9082d485d 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 5f1ff4d7c..9082d485d 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 5f1ff4d7c..9082d485d 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 0c321edca..053d1c008 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.18.2" + "envoy_version": "1.18.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 fe6f987ca..99da5e21b 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.18.2" + "envoy_version": "1.18.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 e6a956ee6..d2c4b37e4 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.18.2" + "envoy_version": "1.18.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 d8f46383f..4caf58dd4 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.18.2" + "envoy_version": "1.18.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 90cb17c16..e7bbde807 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index ebc1f4d4f..da76ef79b 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index beb779a35..e4157e9c8 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 3043e6934..42b22dbc6 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 081f6c302..248790500 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 081f6c302..248790500 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 081f6c302..248790500 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 081f6c302..248790500 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index b64783ebe..15b796e26 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.18.2" + "envoy_version": "1.18.3" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index d0907a789..81646f10f 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -9,7 +9,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services" # DEBUG=1 enables set -x for this script so echos every command run DEBUG=${DEBUG:-} -OLD_XDSV2_AWARE_CONSUL_VERSION="${OLD_XDSV2_AWARE_CONSUL_VERSION:-"${HASHICORP_DOCKER_PROXY}/library/consul:1.9.4"}" +OLD_XDSV2_AWARE_CONSUL_VERSION="${OLD_XDSV2_AWARE_CONSUL_VERSION:-"${HASHICORP_DOCKER_PROXY}/library/consul:1.9.5"}" export OLD_XDSV2_AWARE_CONSUL_VERSION # TEST_V2_XDS=1 causes it to do just the 'consul connect envoy' part using @@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-} export TEST_V2_XDS # ENVOY_VERSION to run each test against -ENVOY_VERSION=${ENVOY_VERSION:-"1.18.2"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.18.3"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx index 5adbabdb8..c23df6833 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.18.2`. This is required so that the correct configuration can be generated. + `1.18.3`. 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 ac7e6cf18..5aa5dc6eb 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -34,8 +34,8 @@ compatible Envoy versions. | Consul Version | Compatible Envoy Versions | | ------------------- | -------------------------------- | -| 1.10.x | 1.18.2, 1.17.2, 1.16.3, 1.15.4 | -| 1.9.x | 1.16.3, 1.15.4, 1.14.7‡, 1.13.7‡ | +| 1.10.x | 1.18.3, 1.17.3, 1.16.4, 1.15.5 | +| 1.9.x | 1.16.4, 1.15.5, 1.14.7‡, 1.13.7‡ | | 1.8.x | 1.14.7, 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† |