From cf4deeb7ea52ad2cc2fce524dd0d79990811ea16 Mon Sep 17 00:00:00 2001 From: Michael Zalimeni Date: Wed, 26 Jul 2023 17:48:29 -0400 Subject: [PATCH] Update list of Envoy versions (#18300) Update supported envoy versions to 1.24.10, 1.25.9, 1.26.4, 1.27.0. --- .changelog/18300.txt | 3 +++ .github/workflows/test-integrations-windows.yml | 2 +- .github/workflows/test-integrations.yml | 4 ++-- envoyextensions/xdscommon/envoy_versioning_test.go | 8 ++++---- envoyextensions/xdscommon/proxysupport.go | 8 ++++---- 5 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 .changelog/18300.txt diff --git a/.changelog/18300.txt b/.changelog/18300.txt new file mode 100644 index 0000000000..717a697777 --- /dev/null +++ b/.changelog/18300.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.24.10, 1.25.9, 1.26.4, 1.27.0 +``` diff --git a/.github/workflows/test-integrations-windows.yml b/.github/workflows/test-integrations-windows.yml index 79359c481b..7361f1b379 100644 --- a/.github/workflows/test-integrations-windows.yml +++ b/.github/workflows/test-integrations-windows.yml @@ -57,7 +57,7 @@ jobs: strategy: fail-fast: false matrix: - envoy-version: [ "1.23.10", "1.24.8", "1.25.7", "1.26.2" ] + envoy-version: [ "1.24.10", "1.25.9", "1.26.4", "1.27.0" ] xds-target: [ "server", "client" ] env: ENVOY_VERSION: ${{ matrix.envoy-version }} diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 6c96b5da1d..2646d59cb7 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -240,7 +240,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 8 based on these values: - # envoy-version: ["1.23.10", "1.24.8", "1.25.7", "1.26.2"] + # envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] # xds-target: ["server", "client"] TOTAL_RUNNERS: 4 JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' @@ -274,7 +274,7 @@ jobs: strategy: fail-fast: false matrix: - envoy-version: ["1.23.10", "1.24.8", "1.25.7", "1.26.2"] + envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"] xds-target: ["server", "client"] test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }} env: diff --git a/envoyextensions/xdscommon/envoy_versioning_test.go b/envoyextensions/xdscommon/envoy_versioning_test.go index cc2134c732..8cf3948f8a 100644 --- a/envoyextensions/xdscommon/envoy_versioning_test.go +++ b/envoyextensions/xdscommon/envoy_versioning_test.go @@ -151,10 +151,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { } */ for _, v := range []string{ - "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.23.8", "1.23.9", "1.23.10", - "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.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", - "1.26.0", "1.26.1", "1.26.2", + "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.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4", + "1.27.0", } { cases[v] = testcase{expect: SupportedProxyFeatures{}} } diff --git a/envoyextensions/xdscommon/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go index 250133a138..290d4e03b8 100644 --- a/envoyextensions/xdscommon/proxysupport.go +++ b/envoyextensions/xdscommon/proxysupport.go @@ -12,10 +12,10 @@ import "strings" // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ - "1.26.2", - "1.25.7", - "1.24.8", - "1.23.10", + "1.27.0", + "1.26.4", + "1.25.9", + "1.24.10", } // UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall