diff --git a/.changelog/5200.txt b/.changelog/5200.txt new file mode 100644 index 000000000..289c22215 --- /dev/null +++ b/.changelog/5200.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.23.8, 1.24.6, 1.25.4, 1.26.0 +``` \ No newline at end of file diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 731045d8c..3c44198ed 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -153,7 +153,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.22.11", "1.23.8", "1.24.6", "1.25.4"] + # envoy-version: ["1.23.8", "1.24.6", "1.25.4", "1.26.0"] # xds-target: ["server", "client"] TOTAL_RUNNERS: 4 JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]' @@ -186,7 +186,7 @@ jobs: strategy: fail-fast: false matrix: - envoy-version: ["1.22.11", "1.23.8", "1.24.6", "1.25.4"] + envoy-version: ["1.23.8", "1.24.6", "1.25.4", "1.26.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 96f6f305d..ff9318239 100644 --- a/envoyextensions/xdscommon/envoy_versioning_test.go +++ b/envoyextensions/xdscommon/envoy_versioning_test.go @@ -81,50 +81,62 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { // Just the bad versions cases := map[string]testcase{ - "1.9.0": {expectErr: "Envoy 1.9.0 " + errTooOld}, - "1.10.0": {expectErr: "Envoy 1.10.0 " + errTooOld}, - "1.11.0": {expectErr: "Envoy 1.11.0 " + errTooOld}, - "1.12.0": {expectErr: "Envoy 1.12.0 " + errTooOld}, - "1.12.1": {expectErr: "Envoy 1.12.1 " + errTooOld}, - "1.12.2": {expectErr: "Envoy 1.12.2 " + errTooOld}, - "1.12.3": {expectErr: "Envoy 1.12.3 " + errTooOld}, - "1.12.4": {expectErr: "Envoy 1.12.4 " + errTooOld}, - "1.12.5": {expectErr: "Envoy 1.12.5 " + errTooOld}, - "1.12.6": {expectErr: "Envoy 1.12.6 " + errTooOld}, - "1.12.7": {expectErr: "Envoy 1.12.7 " + errTooOld}, - "1.13.0": {expectErr: "Envoy 1.13.0 " + errTooOld}, - "1.13.1": {expectErr: "Envoy 1.13.1 " + errTooOld}, - "1.13.2": {expectErr: "Envoy 1.13.2 " + errTooOld}, - "1.13.3": {expectErr: "Envoy 1.13.3 " + errTooOld}, - "1.13.4": {expectErr: "Envoy 1.13.4 " + errTooOld}, - "1.13.5": {expectErr: "Envoy 1.13.5 " + errTooOld}, - "1.13.6": {expectErr: "Envoy 1.13.6 " + errTooOld}, - "1.13.7": {expectErr: "Envoy 1.13.7 " + errTooOld}, - "1.14.0": {expectErr: "Envoy 1.14.0 " + errTooOld}, - "1.14.1": {expectErr: "Envoy 1.14.1 " + errTooOld}, - "1.14.2": {expectErr: "Envoy 1.14.2 " + errTooOld}, - "1.14.3": {expectErr: "Envoy 1.14.3 " + errTooOld}, - "1.14.4": {expectErr: "Envoy 1.14.4 " + errTooOld}, - "1.14.5": {expectErr: "Envoy 1.14.5 " + errTooOld}, - "1.14.6": {expectErr: "Envoy 1.14.6 " + errTooOld}, - "1.14.7": {expectErr: "Envoy 1.14.7 " + errTooOld}, - "1.15.0": {expectErr: "Envoy 1.15.0 " + errTooOld}, - "1.15.1": {expectErr: "Envoy 1.15.1 " + errTooOld}, - "1.15.2": {expectErr: "Envoy 1.15.2 " + errTooOld}, - "1.15.3": {expectErr: "Envoy 1.15.3 " + errTooOld}, - "1.15.4": {expectErr: "Envoy 1.15.4 " + errTooOld}, - "1.15.5": {expectErr: "Envoy 1.15.5 " + errTooOld}, - "1.16.1": {expectErr: "Envoy 1.16.1 " + errTooOld}, - "1.16.2": {expectErr: "Envoy 1.16.2 " + errTooOld}, - "1.16.3": {expectErr: "Envoy 1.16.3 " + errTooOld}, - "1.16.4": {expectErr: "Envoy 1.16.4 " + errTooOld}, - "1.16.5": {expectErr: "Envoy 1.16.5 " + errTooOld}, - "1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld}, - "1.17.4": {expectErr: "Envoy 1.17.4 " + errTooOld}, - "1.18.6": {expectErr: "Envoy 1.18.6 " + errTooOld}, - "1.19.5": {expectErr: "Envoy 1.19.5 " + errTooOld}, - "1.20.7": {expectErr: "Envoy 1.20.7 " + errTooOld}, - "1.21.5": {expectErr: "Envoy 1.21.5 " + errTooOld}, + "1.9.0": {expectErr: "Envoy 1.9.0 " + errTooOld}, + "1.10.0": {expectErr: "Envoy 1.10.0 " + errTooOld}, + "1.11.0": {expectErr: "Envoy 1.11.0 " + errTooOld}, + "1.12.0": {expectErr: "Envoy 1.12.0 " + errTooOld}, + "1.12.1": {expectErr: "Envoy 1.12.1 " + errTooOld}, + "1.12.2": {expectErr: "Envoy 1.12.2 " + errTooOld}, + "1.12.3": {expectErr: "Envoy 1.12.3 " + errTooOld}, + "1.12.4": {expectErr: "Envoy 1.12.4 " + errTooOld}, + "1.12.5": {expectErr: "Envoy 1.12.5 " + errTooOld}, + "1.12.6": {expectErr: "Envoy 1.12.6 " + errTooOld}, + "1.12.7": {expectErr: "Envoy 1.12.7 " + errTooOld}, + "1.13.0": {expectErr: "Envoy 1.13.0 " + errTooOld}, + "1.13.1": {expectErr: "Envoy 1.13.1 " + errTooOld}, + "1.13.2": {expectErr: "Envoy 1.13.2 " + errTooOld}, + "1.13.3": {expectErr: "Envoy 1.13.3 " + errTooOld}, + "1.13.4": {expectErr: "Envoy 1.13.4 " + errTooOld}, + "1.13.5": {expectErr: "Envoy 1.13.5 " + errTooOld}, + "1.13.6": {expectErr: "Envoy 1.13.6 " + errTooOld}, + "1.13.7": {expectErr: "Envoy 1.13.7 " + errTooOld}, + "1.14.0": {expectErr: "Envoy 1.14.0 " + errTooOld}, + "1.14.1": {expectErr: "Envoy 1.14.1 " + errTooOld}, + "1.14.2": {expectErr: "Envoy 1.14.2 " + errTooOld}, + "1.14.3": {expectErr: "Envoy 1.14.3 " + errTooOld}, + "1.14.4": {expectErr: "Envoy 1.14.4 " + errTooOld}, + "1.14.5": {expectErr: "Envoy 1.14.5 " + errTooOld}, + "1.14.6": {expectErr: "Envoy 1.14.6 " + errTooOld}, + "1.14.7": {expectErr: "Envoy 1.14.7 " + errTooOld}, + "1.15.0": {expectErr: "Envoy 1.15.0 " + errTooOld}, + "1.15.1": {expectErr: "Envoy 1.15.1 " + errTooOld}, + "1.15.2": {expectErr: "Envoy 1.15.2 " + errTooOld}, + "1.15.3": {expectErr: "Envoy 1.15.3 " + errTooOld}, + "1.15.4": {expectErr: "Envoy 1.15.4 " + errTooOld}, + "1.15.5": {expectErr: "Envoy 1.15.5 " + errTooOld}, + "1.16.1": {expectErr: "Envoy 1.16.1 " + errTooOld}, + "1.16.2": {expectErr: "Envoy 1.16.2 " + errTooOld}, + "1.16.3": {expectErr: "Envoy 1.16.3 " + errTooOld}, + "1.16.4": {expectErr: "Envoy 1.16.4 " + errTooOld}, + "1.16.5": {expectErr: "Envoy 1.16.5 " + errTooOld}, + "1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld}, + "1.17.4": {expectErr: "Envoy 1.17.4 " + errTooOld}, + "1.18.6": {expectErr: "Envoy 1.18.6 " + errTooOld}, + "1.19.5": {expectErr: "Envoy 1.19.5 " + errTooOld}, + "1.20.7": {expectErr: "Envoy 1.20.7 " + errTooOld}, + "1.21.5": {expectErr: "Envoy 1.21.5 " + errTooOld}, + "1.22.0": {expectErr: "Envoy 1.22.0 " + errTooOld}, + "1.22.1": {expectErr: "Envoy 1.22.1 " + errTooOld}, + "1.22.2": {expectErr: "Envoy 1.22.2 " + errTooOld}, + "1.22.3": {expectErr: "Envoy 1.22.3 " + errTooOld}, + "1.22.4": {expectErr: "Envoy 1.22.4 " + errTooOld}, + "1.22.5": {expectErr: "Envoy 1.22.5 " + errTooOld}, + "1.22.6": {expectErr: "Envoy 1.22.6 " + errTooOld}, + "1.22.7": {expectErr: "Envoy 1.22.7 " + errTooOld}, + "1.22.8": {expectErr: "Envoy 1.22.8 " + errTooOld}, + "1.22.9": {expectErr: "Envoy 1.22.9 " + errTooOld}, + "1.22.10": {expectErr: "Envoy 1.22.10 " + errTooOld}, + "1.22.11": {expectErr: "Envoy 1.22.11 " + errTooOld}, } // Insert a bunch of valid versions. @@ -139,10 +151,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { } */ for _, v := range []string{ - "1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", "1.22.11", "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.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", - "1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", + "1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.26.0", } { cases[v] = testcase{expect: SupportedProxyFeatures{}} } @@ -152,6 +163,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { t.Run(name, func(t *testing.T) { sf, err := DetermineSupportedProxyFeaturesFromString(name) if tc.expectErr == "" { + require.NoError(t, err) require.Equal(t, tc.expect, sf) } else { testutil.RequireErrorContains(t, err, tc.expectErr) diff --git a/envoyextensions/xdscommon/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go index c4a96e818..ff4b79d73 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.0", "1.25.4", "1.24.6", "1.23.8", - "1.22.11", } // UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall