From a51776d415e2adb873895c1221b251af9d87a926 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Wed, 5 Apr 2023 17:09:33 -0500 Subject: [PATCH 1/5] Update list of Envoy versions --- agent/xds/proxysupport/proxysupport.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 62bd1d39d768..8fb4eacef932 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.24.0", - "1.23.2", - "1.22.5", - "1.21.5", + "1.24.5", + "1.23.7", + "1.22.10", + "1.21.6", } From 7dc5fdd74702050c3f1b5f6573364ab9fdb27e64 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Wed, 5 Apr 2023 17:28:10 -0500 Subject: [PATCH 2/5] Update docs + CI + tests --- .circleci/config.yml | 8 ++++---- agent/xds/envoy_versioning_test.go | 8 ++++---- website/content/docs/connect/proxies/envoy.mdx | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92c676bfa494..c8ce15396310 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,10 +19,10 @@ references: BASH_ENV: .circleci/bash_env.sh GO_VERSION: 1.20.1 envoy-versions: &supported_envoy_versions - - &default_envoy_version "1.21.5" - - "1.22.5" - - "1.23.2" - - "1.24.0" + - &default_envoy_version "1.21.6" + - "1.22.10" + - "1.23.7" + - "1.24.5" nomad-versions: &supported_nomad_versions - &default_nomad_version "1.3.3" - "1.2.10" diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index d90ade4a0f1c..fa5e09aae390 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -136,10 +136,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { } */ for _, v := range []string{ - "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", - "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", - "1.23.0", "1.23.1", "1.23.2", - "1.24.0", + "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", + "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", + "1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", + "1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 6ac741aab1ad..2b05f15cabe4 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -39,7 +39,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con | Consul Version | Compatible Envoy Versions | | ------------------- | -----------------------------------------------------------------------------------| -| 1.14.x | 1.24.0, 1.23.1, 1.22.5, 1.21.5 | +| 1.14.x | 1.24.5, 1.23.7, 1.22.10, 1.21.6 | | 1.13.x | 1.23.1, 1.22.5, 1.21.5, 1.20.7 | | 1.12.x | 1.22.5, 1.21.5, 1.20.7, 1.19.5 | @@ -126,7 +126,7 @@ Connect to a local Consul client agent and run the [`consul connect envoy` comma If you experience issues when bootstrapping Envoy proxies from the CLI, use the `-enable-config-gen-logging` flag to enable debug message logging. These logs can -help you troubleshoot issues that occur during the bootstrapping process. +help you troubleshoot issues that occur during the bootstrapping process. For more information about available flags and parameters, refer to the [`consul connect envoy CLI` reference](/consul/commands/connect/envoy). @@ -338,7 +338,7 @@ defaults that are inherited by all services. - `local_idle_timeout_ms` - In milliseconds, the idle timeout for HTTP requests to the local application instance. Applies to HTTP based protocols only. If not - specified, inherits the Envoy default for route idle timeouts (15s). A value of 0 + specified, inherits the Envoy default for route idle timeouts (15s). A value of 0 disables request timeouts. - `max_inbound_connections` - The maximum number of concurrent inbound connections From 3fc6482abe37bf30b583dbbbe03f8a529bfe8dc5 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Wed, 12 Apr 2023 16:58:59 -0400 Subject: [PATCH 3/5] Add changelog entry --- .changelog/16888.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/16888.txt diff --git a/.changelog/16888.txt b/.changelog/16888.txt new file mode 100644 index 000000000000..e60f110cfaee --- /dev/null +++ b/.changelog/16888.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.21.6, 1.22.10, 1.23.7, 1.24.5 +``` From d8c6e9bd8ee9710f510ac5e8eda917c4108acd8b Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Wed, 12 Apr 2023 17:07:17 -0400 Subject: [PATCH 4/5] Add newly-released Envoy 1.23.8 and 1.24.6 --- .changelog/16888.txt | 2 +- .circleci/config.yml | 4 ++-- agent/xds/envoy_versioning_test.go | 4 ++-- agent/xds/proxysupport/proxysupport.go | 4 ++-- website/content/docs/connect/proxies/envoy.mdx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.changelog/16888.txt b/.changelog/16888.txt index e60f110cfaee..cc29e0835989 100644 --- a/.changelog/16888.txt +++ b/.changelog/16888.txt @@ -1,3 +1,3 @@ ```release-note:improvement -connect: update supported envoy versions to 1.21.6, 1.22.10, 1.23.7, 1.24.5 +connect: update supported envoy versions to 1.21.6, 1.22.10, 1.23.8, 1.24.6 ``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 00f871c15c84..962d9502c8c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,8 +14,8 @@ references: envoy-versions: &supported_envoy_versions - &default_envoy_version "1.21.6" - "1.22.10" - - "1.23.7" - - "1.24.5" + - "1.23.8" + - "1.24.6" nomad-versions: &supported_nomad_versions - &default_nomad_version "1.3.3" - "1.2.10" diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index fa5e09aae390..9c580fc43414 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -138,8 +138,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { for _, v := range []string{ "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", - "1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", - "1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", + "1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", "1.23.8", + "1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 8fb4eacef932..c88ea54cc36d 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.24.5", - "1.23.7", + "1.24.6", + "1.23.8", "1.22.10", "1.21.6", } diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 2b05f15cabe4..2ceb4c7ddbdb 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -39,7 +39,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con | Consul Version | Compatible Envoy Versions | | ------------------- | -----------------------------------------------------------------------------------| -| 1.14.x | 1.24.5, 1.23.7, 1.22.10, 1.21.6 | +| 1.14.x | 1.24.6, 1.23.8, 1.22.10, 1.21.6 | | 1.13.x | 1.23.1, 1.22.5, 1.21.5, 1.20.7 | | 1.12.x | 1.22.5, 1.21.5, 1.20.7, 1.19.5 | From bbd952a371b3fbe2f68618451ad29d24ce32d092 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Wed, 12 Apr 2023 17:15:03 -0400 Subject: [PATCH 5/5] Add newly-released Envoy version 1.22.11 --- .changelog/16888.txt | 2 +- .circleci/config.yml | 2 +- agent/xds/envoy_versioning_test.go | 2 +- agent/xds/proxysupport/proxysupport.go | 2 +- website/content/docs/connect/proxies/envoy.mdx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.changelog/16888.txt b/.changelog/16888.txt index cc29e0835989..4cea20517ae0 100644 --- a/.changelog/16888.txt +++ b/.changelog/16888.txt @@ -1,3 +1,3 @@ ```release-note:improvement -connect: update supported envoy versions to 1.21.6, 1.22.10, 1.23.8, 1.24.6 +connect: update supported envoy versions to 1.21.6, 1.22.11, 1.23.8, 1.24.6 ``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 962d9502c8c0..411426b815d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ parameters: references: envoy-versions: &supported_envoy_versions - &default_envoy_version "1.21.6" - - "1.22.10" + - "1.22.11" - "1.23.8" - "1.24.6" nomad-versions: &supported_nomad_versions diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 9c580fc43414..ca1ea4e07347 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -137,7 +137,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { */ for _, v := range []string{ "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", - "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", + "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", "1.22.11", "1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", "1.23.8", "1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", } { diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index c88ea54cc36d..a0b7e77b620a 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -9,6 +9,6 @@ package proxysupport var EnvoyVersions = []string{ "1.24.6", "1.23.8", - "1.22.10", + "1.22.11", "1.21.6", } diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 2ceb4c7ddbdb..37e672921fe3 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -39,7 +39,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con | Consul Version | Compatible Envoy Versions | | ------------------- | -----------------------------------------------------------------------------------| -| 1.14.x | 1.24.6, 1.23.8, 1.22.10, 1.21.6 | +| 1.14.x | 1.24.6, 1.23.8, 1.22.11, 1.21.6 | | 1.13.x | 1.23.1, 1.22.5, 1.21.5, 1.20.7 | | 1.12.x | 1.22.5, 1.21.5, 1.20.7, 1.19.5 |