Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update list of Envoy versions #16888

Merged
merged 6 commits into from
Apr 12, 2023
Merged

Update list of Envoy versions #16888

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a51776d
Update list of Envoy versions
nathancoleman Apr 5, 2023
7dc5fdd
Update docs + CI + tests
nathancoleman Apr 5, 2023
acafc68
Merge branch 'release/1.14.x' into envoy-versions-1.14.x
nathancoleman Apr 12, 2023
3fc6482
Add changelog entry
nathancoleman Apr 12, 2023
d8c6e9b
Add newly-released Envoy 1.23.8 and 1.24.6
nathancoleman Apr 12, 2023
bbd952a
Add newly-released Envoy version 1.22.11
nathancoleman Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing this here might not be the correct place because of the migration to Github Actions?

Copy link
Member Author

@nathancoleman nathancoleman Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chatted w/ @jmurret and am going to commit envoy version updates to #16915 outside of this PR

Copy link
Member Author

@nathancoleman nathancoleman Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also chatted about a backport that incorrectly updated these versions. Temporarily reverting them here, but there's no real impact since this workflow will be removed shortly

- "1.22.10"
- "1.23.7"
- "1.24.5"
nomad-versions: &supported_nomad_versions
- &default_nomad_version "1.3.3"
- "1.2.10"
Expand Down
8 changes: 4 additions & 4 deletions agent/xds/envoy_versioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}}
}
Expand Down
8 changes: 4 additions & 4 deletions agent/xds/proxysupport/proxysupport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
6 changes: 3 additions & 3 deletions website/content/docs/connect/proxies/envoy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down Expand Up @@ -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).

Expand Down Expand Up @@ -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
Expand Down