status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update supported Envoy versions (#19276)

This commit is contained in:
Chris Thain 2023-10-19 14:08:20 -07:00 committed by GitHub
parent ef27bc2fd6
commit 681aef31e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/19276.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:security
connect: update supported envoy versions to 1.25.11, 1.26.6, 1.27.2, 1.28.0 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76)
```

4
.github/workflows/nightly-test-integrations-1.15.x.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the # this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be # other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values: # multiplied by 8 based on these values:
# envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"] # envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 4 TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -102,7 +102,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"] envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11"]
xds-target: ["server", "client"] xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env: env:

4
.github/workflows/nightly-test-integrations-1.16.x.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the # this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be # other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values: # multiplied by 8 based on these values:
# envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] # envoy-version: ["1.23.12", "1.24.12", "1.25.11", "1.26.6"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 4 TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -102,7 +102,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.23.12", "1.24.10", "1.25.9", "1.26.4"] envoy-version: ["1.23.12", "1.24.12", "1.25.11", "1.26.6"]
xds-target: ["server", "client"] xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env: env:

4
.github/workflows/nightly-test-integrations-1.17.x.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the # this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be # other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values: # multiplied by 8 based on these values:
# envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] # envoy-version: ["1.24.12", "1.25.11", "1.26.6", "1.27.2"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 4 TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -102,7 +102,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] envoy-version: ["1.24.12", "1.25.11", "1.26.6", "1.27.2"]
xds-target: ["server", "client"] xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env: env:

4
.github/workflows/nightly-test-integrations.yml vendored
View File

@ -65,7 +65,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the # this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be # other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values: # multiplied by 8 based on these values:
# envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] # envoy-version: ["1.25.11", "1.26.6", "1.27.2", "1.28.0"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 4 TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -99,7 +99,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] envoy-version: ["1.25.11", "1.26.6", "1.27.2", "1.28.0"]
xds-target: ["server", "client"] xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env: env:

2
.github/workflows/test-integrations-windows.yml vendored
View File

@ -54,7 +54,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: [ "1.27.0" ] envoy-version: [ "1.28.0" ]
xds-target: [ "server", "client" ] xds-target: [ "server", "client" ]
env: env:
ENVOY_VERSION: ${{ matrix.envoy-version }} ENVOY_VERSION: ${{ matrix.envoy-version }}

7
.github/workflows/test-integrations.yml vendored
View File

@ -81,7 +81,6 @@ jobs:
strategy: strategy:
matrix: matrix:
nomad-version: ['v1.6.2', 'v1.5.9', 'v1.4.13'] nomad-version: ['v1.6.2', 'v1.5.9', 'v1.4.13']
steps: steps:
- name: Checkout Nomad - name: Checkout Nomad
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@ -260,8 +259,8 @@ jobs:
env: env:
# this is further going to multiplied in envoy-integration tests by the # this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be # other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 8 based on these values: # multiplied by 2 based on these values:
# envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] # envoy-version: ["1.28.0"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 4 TOTAL_RUNNERS: 4
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -295,7 +294,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.27.0"] envoy-version: ["1.28.0"]
xds-target: ["server", "client"] xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env: env:

8
envoyextensions/xdscommon/envoy_versioning_test.go
View File

@ -151,10 +151,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
} }
*/ */
for _, v := range []string{ for _, v := range []string{
"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10", "1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9", "1.25.10", "1.25.11",
"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9", "1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.26.5", "1.26.6",
"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.27.0", "1.27.1", "1.27.2",
"1.27.0", "1.28.0",
} { } {
cases[v] = testcase{expect: SupportedProxyFeatures{}} cases[v] = testcase{expect: SupportedProxyFeatures{}}
} }

8
envoyextensions/xdscommon/proxysupport.go
View File

@ -12,10 +12,10 @@ import "strings"
// //
// 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.27.0", "1.28.0",
"1.26.4", "1.27.2",
"1.25.9", "1.26.6",
"1.24.10", "1.25.11",
} }
// UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall // UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall

10
website/content/docs/connect/proxies/envoy.mdx
View File

@ -39,9 +39,9 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | -----------------------------------------------------------------------------------| | ------------------- | -----------------------------------------------------------------------------------|
| 1.16.x | 1.26.4, 1.25.9, 1.24.10, 1.23.12 | | 1.17.x | 1.27.2, 1.26.6, 1.25.11, 1.24.12 |
| 1.15.x | 1.25.9, 1.24.10, 1.23.12, 1.22.11 | | 1.16.x | 1.26.6, 1.25.11, 1.24.12, 1.23.12 |
| 1.14.x | 1.24.10, 1.23.12, 1.22.11, 1.21.6 | | 1.15.x | 1.25.11, 1.24.12, 1.23.12, 1.22.11 |
### Envoy and Consul Dataplane ### Envoy and Consul Dataplane
@ -49,9 +49,9 @@ The Consul dataplane component was introduced in Consul v1.14 as a way to manage
| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions | | Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
| ------------------- | ------------------------------------------------------------|----------------------------------------------| | ------------------- | ------------------------------------------------------------|----------------------------------------------|
| 1.16.x | 1.2.x (Envoy 1.26.x) | 1.1.x (Envoy 1.25.x) | | 1.17.x | 1.3.x (Envoy 1.27.x) | 1.2.x (Envoy 1.26.x) |
| 1.16.x | 1.2.x (Envoy 1.26.x) | 1.3.x (Envoy 1.27.x), 1.1.x (Envoy 1.25.x) |
| 1.15.x | 1.1.x (Envoy 1.25.x) | 1.2.x (Envoy 1.26.x), 1.0.x (Envoy 1.24.x) | | 1.15.x | 1.1.x (Envoy 1.25.x) | 1.2.x (Envoy 1.26.x), 1.0.x (Envoy 1.24.x) |
| 1.14.x | 1.0.x (Envoy 1.24.x) | 1.1.x (Envoy 1.25.x) |
## Getting Started ## Getting Started