Browse Source

connect: Bump latest Envoy to 1.23.1 in test matrix (#14573)

pull/14619/head
Evan Culver 2 years ago committed by GitHub
parent
commit
d0416f593c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      .changelog/14573.txt
  2. 2
      .circleci/config.yml
  3. 2
      agent/xds/envoy_versioning_test.go
  4. 2
      agent/xds/proxysupport/proxysupport.go
  5. 2
      test/integration/connect/envoy/run-tests.sh
  6. 2
      website/content/commands/connect/envoy.mdx
  7. 2
      website/content/docs/connect/proxies/envoy.mdx

3
.changelog/14573.txt

@ -0,0 +1,3 @@
```release-note: improvement
connect: Bump latest Envoy to 1.23.1 in test matrix
```

2
.circleci/config.yml

@ -27,7 +27,7 @@ references:
- &default_envoy_version "1.20.6" - &default_envoy_version "1.20.6"
- "1.21.4" - "1.21.4"
- "1.22.2" - "1.22.2"
- "1.23.0" - "1.23.1"
nomad-versions: &supported_nomad_versions nomad-versions: &supported_nomad_versions
- &default_nomad_version "1.3.3" - &default_nomad_version "1.3.3"
- "1.2.10" - "1.2.10"

2
agent/xds/envoy_versioning_test.go

@ -138,7 +138,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
"1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.20.0", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
"1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.0", "1.21.1", "1.21.2", "1.21.3", "1.21.4",
"1.22.0", "1.22.1", "1.22.2", "1.22.0", "1.22.1", "1.22.2",
"1.23.0", "1.23.0", "1.23.1",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

2
agent/xds/proxysupport/proxysupport.go

@ -7,7 +7,7 @@ package proxysupport
// //
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{ var EnvoyVersions = []string{
"1.23.0", "1.23.1",
"1.22.2", "1.22.2",
"1.21.4", "1.21.4",
"1.20.6", "1.20.6",

2
test/integration/connect/envoy/run-tests.sh

@ -12,7 +12,7 @@ DEBUG=${DEBUG:-}
XDS_TARGET=${XDS_TARGET:-server} XDS_TARGET=${XDS_TARGET:-server}
# ENVOY_VERSION to run each test against # ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.23.0"} ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
export ENVOY_VERSION export ENVOY_VERSION
export DOCKER_BUILDKIT=1 export DOCKER_BUILDKIT=1

2
website/content/commands/connect/envoy.mdx

@ -55,7 +55,7 @@ Usage: `consul connect envoy [options] [-- pass-through options]`
allowed to access by [Connect intentions](/docs/connect/intentions). allowed to access by [Connect intentions](/docs/connect/intentions).
- `-envoy-version` - The version of envoy that is being started. Default is - `-envoy-version` - The version of envoy that is being started. Default is
`1.19.1`. This is required so that the correct configuration can be generated. `1.23.1`. This is required so that the correct configuration can be generated.
- `-no-central-config` - By default the proxy's bootstrap configuration can be - `-no-central-config` - By default the proxy's bootstrap configuration can be
customized centrally. This requires that the command run on the same agent customized centrally. This requires that the command run on the same agent

2
website/content/docs/connect/proxies/envoy.mdx

@ -36,7 +36,7 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | -----------------------------------------------------------------------------------| | ------------------- | -----------------------------------------------------------------------------------|
| 1.13.x | 1.23.0, 1.22.2, 1.21.4, 1.20.6 | | 1.13.x | 1.23.1, 1.22.2, 1.21.4, 1.20.6 |
| 1.12.x | 1.22.2, 1.21.4, 1.20.6, 1.19.5 | | 1.12.x | 1.22.2, 1.21.4, 1.20.6, 1.19.5 |
| 1.11.x | 1.20.6, 1.19.5, 1.18.6, 1.17.4<sup>1</sup> | | 1.11.x | 1.20.6, 1.19.5, 1.18.6, 1.17.4<sup>1</sup> |

Loading…
Cancel
Save