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

feat: update supported envoy to 1.29 (#21142)

This commit is contained in:
Dan Stough 2024-05-24 13:26:07 -04:00 committed by GitHub
parent 912c5f5a3c
commit cf1c030043
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 18 additions and 1232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/21142.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:enhancement
mesh: update supported envoy version 1.29.4 in addition to 1.28.3, 1.27.5, 1.26.8.
```

2
.github/workflows/nightly-test-integ-peering_commontopo.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
name: '${{matrix.test-case}}' name: '${{matrix.test-case}}'
env: env:
ENVOY_VERSION: "1.24.6" ENVOY_VERSION: "1.29.4"
steps: steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos. # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.

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

@ -71,7 +71,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.25.11", "1.26.8", "1.27.5", "1.28.3"] # envoy-version: ["1.26.8", "1.27.5", "1.28.3", "1.29.4"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 8 TOTAL_RUNNERS: 8
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -106,7 +106,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.25.11", "1.26.8", "1.27.5", "1.28.3"] envoy-version: ["1.26.8", "1.27.5", "1.28.3", "1.29.4"]
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:
@ -201,13 +201,13 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
consul-version: [ "1.16", "1.17"] consul-version: [ "1.17", "1.18"]
env: env:
CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
# ENVOY_VERSION should be the latest version upported by all # ENVOY_VERSION should be the latest version upported by all
# consul versions in the matrix.consul-version, since we are testing upgrade from # consul versions in the matrix.consul-version, since we are testing upgrade from
# an older consul version, e.g., 1.26.6 is supported by both 1.16 and 1.17. # an older consul version, e.g., 1.27.5 is supported by both 1.16 and 1.17.
ENVOY_VERSION: "1.26.6" ENVOY_VERSION: "1.27.5"
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

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

File diff suppressed because it is too large Load Diff

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

@ -272,7 +272,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 2 based on these values: # multiplied by 2 based on these values:
# envoy-version: ["1.28.3"] # envoy-version: ["1.29.4"]
# xds-target: ["server", "client"] # xds-target: ["server", "client"]
TOTAL_RUNNERS: 2 TOTAL_RUNNERS: 2
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -307,7 +307,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
envoy-version: ["1.28.3"] envoy-version: ["1.29.4"]
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:
@ -397,7 +397,7 @@ jobs:
id-token: write # NOTE: this permission is explicitly required for Vault auth. id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read contents: read
env: env:
ENVOY_VERSION: "1.28.2" ENVOY_VERSION: "1.29.4"
CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi" CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi"
steps: steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

2
Makefile
View File

@ -71,7 +71,7 @@ CONSUL_IMAGE_VERSION?=latest
# When changing the method of Go version detection, also update # When changing the method of Go version detection, also update
# version detection in CI workflows (reusable-get-go-version.yml). # version detection in CI workflows (reusable-get-go-version.yml).
GOLANG_VERSION?=$(shell head -n 1 .go-version) GOLANG_VERSION?=$(shell head -n 1 .go-version)
ENVOY_VERSION?='1.28.0' ENVOY_VERSION?='1.29.4'
CONSUL_DATAPLANE_IMAGE := $(or $(CONSUL_DATAPLANE_IMAGE),"docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi") CONSUL_DATAPLANE_IMAGE := $(or $(CONSUL_DATAPLANE_IMAGE),"docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi")
DEPLOYER_CONSUL_DATAPLANE_IMAGE := $(or $(DEPLOYER_CONSUL_DATAPLANE_IMAGE), "docker.io/hashicorppreview/consul-dataplane:1.3-dev") DEPLOYER_CONSUL_DATAPLANE_IMAGE := $(or $(DEPLOYER_CONSUL_DATAPLANE_IMAGE), "docker.io/hashicorppreview/consul-dataplane:1.3-dev")

2
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.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.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.26.5", "1.26.6", "1.26.7", "1.26.8", "1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", "1.26.5", "1.26.6", "1.26.7", "1.26.8",
"1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4", "1.27.5", "1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4", "1.27.5",
"1.28.0", "1.28.1", "1.28.2", "1.28.3", "1.28.0", "1.28.1", "1.28.2", "1.28.3",
"1.29.0", "1.29.1", "1.29.2", "1.29.3", "1.29.4",
} { } {
cases[v] = testcase{expect: SupportedProxyFeatures{}} cases[v] = testcase{expect: SupportedProxyFeatures{}}
} }

2
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.29.4",
"1.28.3", "1.28.3",
"1.27.5", "1.27.5",
"1.26.8", "1.26.8",
"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

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

@ -15,7 +15,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.27.0"} ENVOY_VERSION=${ENVOY_VERSION:-"1.29.4"}
export ENVOY_VERSION export ENVOY_VERSION
export DOCKER_BUILDKIT=1 export DOCKER_BUILDKIT=1

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

@ -58,6 +58,7 @@ apply to both Consul Enterprise and Consul community edition (CE).
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| -------------- | -------------------------------------- | | -------------- | -------------------------------------- |
| 1.19.x CE | 1.29.4, 1.28.3, 1.27.5, 1.26.8 |
| 1.18.x CE | 1.28.3, 1.27.5, 1.26.8, 1.25.11 | | 1.18.x CE | 1.28.3, 1.27.5, 1.26.8, 1.25.11 |
| 1.17.x | 1.27.5, 1.26.8, 1.25.11, 1.24.12 | | 1.17.x | 1.27.5, 1.26.8, 1.25.11, 1.24.12 |
| 1.16.x | 1.26.8, 1.25.11, 1.24.12, 1.23.12 | | 1.16.x | 1.26.8, 1.25.11, 1.24.12, 1.23.12 |
@ -104,6 +105,7 @@ apply to both Consul Enterprise and Consul community edition (CE).
| Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions | | Consul Version | Default `consul-dataplane` Version | Other compatible `consul-dataplane` Versions |
| -------------- | -------------------------------------|----------------------------------------------| | -------------- | -------------------------------------|----------------------------------------------|
| 1.19.x CE | 1.5.x (Envoy 1.29.x) | 1.4.x (Envoy 1.28.x) |
| 1.18.x CE | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) | | 1.18.x CE | 1.4.x (Envoy 1.28.x) | 1.3.x (Envoy 1.27.x) |
| 1.17.x | 1.3.x (Envoy 1.27.x) | 1.4.x (Envoy 1.28.x), 1.2.x (Envoy 1.26.x) | | 1.17.x | 1.3.x (Envoy 1.27.x) | 1.4.x (Envoy 1.28.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.16.x | 1.2.x (Envoy 1.26.x) | 1.3.x (Envoy 1.27.x), 1.1.x (Envoy 1.25.x) |