github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport of Bump Envoy Versions into release/1.18.x (#21290) 

* bump envoy versions for 1.18

* fix merge conflicts

* Update .github/workflows/test-integrations.yml

* Update .github/workflows/test-integrations.yml

---------

Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com>
Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com>
pull/21293/head
hc-github-team-consul-core 2024-06-10 12:51:48 -07:00 committed by GitHub
parent 1c1de8813d
commit 8cb2e62dcb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/21277.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:enhancement
mesh: update supported envoy version 1.28.4 and 1.27.6.
```

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

@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.5", "1.28.3"]
envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.6", "1.28.4"]
xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env:

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

@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.5"]
envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.6"]
xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env:

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

@ -106,7 +106,7 @@ jobs:
strategy:
fail-fast: false
matrix:
envoy-version: ["1.25.11", "1.26.8", "1.27.5", "1.28.3"]
envoy-version: ["1.25.11", "1.26.8", "1.27.6", "1.28.4"]
xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env:

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

@ -270,7 +270,7 @@ jobs:
# this is further going to multiplied in envoy-integration tests by the
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
# multiplied by 2 based on these values:
# envoy-version: ["1.28.3"]
# envoy-version: ["1.28.4"]
# xds-target: ["server", "client"]
TOTAL_RUNNERS: 2
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@ -305,7 +305,7 @@ jobs:
strategy:
fail-fast: false
matrix:
envoy-version: ["1.28.3"]
envoy-version: ["1.28.4"]
xds-target: ["server", "client"]
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
env:
@ -395,7 +395,7 @@ jobs:
id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read
env:
ENVOY_VERSION: "1.28.2"
ENVOY_VERSION: "1.28.4"
CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi"
steps:
- 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
# version detection in CI workflows (reusable-get-go-version.yml).
GOLANG_VERSION?=$(shell head -n 1 .go-version)
ENVOY_VERSION?='1.28.0'
ENVOY_VERSION?='1.28.4'
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")

4
envoyextensions/xdscommon/envoy_versioning_test.go
View File

@ -153,8 +153,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
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.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.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4", "1.27.5", "1.27.6",
"1.28.0", "1.28.1", "1.28.2", "1.28.3", "1.28.4",
} {
cases[v] = testcase{expect: SupportedProxyFeatures{}}
}

4
envoyextensions/xdscommon/proxysupport.go
View File

@ -12,8 +12,8 @@ import "strings"
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.28.3",
"1.27.5",
"1.28.4",
"1.27.6",
"1.26.8",
"1.25.11",
}

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

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