Skip to content

Commit 3a6f2fb

Browse files
security: bump envoy version and k8s.io/apimachinery (hashicorp#21017)
* security: bump envoy version * add changelog
1 parent bbd8080 commit 3a6f2fb

File tree

11 files changed

+29
-117
lines changed

11 files changed

+29
-117
lines changed

.changelog/21017.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
```release-note:security
2+
Upgrade to support Envoy `1.27.5 and 1.28.3`. This resolves CVE
3+
[CVE-2024-32475](https://nvd.nist.gov/vuln/detail/CVE-2024-32475) (`auto_sni`).
4+
```
5+
6+
```release-note:security
7+
Upgrade to support k8s.io/apimachinery `v0.18.7 or higher`. This resolves CVE
8+
[CVE-2020-8559](https://nvd.nist.gov/vuln/detail/CVE-2020-8559).
9+
```

.github/workflows/nightly-test-integrations-1.15.x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# this is further going to multiplied in envoy-integration tests by the
7575
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
7676
# 14 based on these values:
77-
# envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.4", "1.28.2"]
77+
# envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.5", "1.28.3"]
7878
# xds-target: ["server", "client"]
7979
TOTAL_RUNNERS: 7
8080
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -109,7 +109,7 @@ jobs:
109109
strategy:
110110
fail-fast: false
111111
matrix:
112-
envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.4", "1.28.2"]
112+
envoy-version: ["1.22.11", "1.23.12", "1.24.12", "1.25.11", "1.26.8", "1.27.5", "1.28.3"]
113113
xds-target: ["server", "client"]
114114
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
115115
env:

.github/workflows/nightly-test-integrations-1.17.x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# this is further going to multiplied in envoy-integration tests by the
7575
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
7676
# multiplied by 8 based on these values:
77-
# envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.4"]
77+
# envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.5"]
7878
# xds-target: ["server", "client"]
7979
TOTAL_RUNNERS: 4
8080
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -109,7 +109,7 @@ jobs:
109109
strategy:
110110
fail-fast: false
111111
matrix:
112-
envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.4"]
112+
envoy-version: ["1.24.12", "1.25.11", "1.26.8", "1.27.5"]
113113
xds-target: ["server", "client"]
114114
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
115115
env:

.github/workflows/nightly-test-integrations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
# this is further going to multiplied in envoy-integration tests by the
7272
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
7373
# multiplied by 8 based on these values:
74-
# envoy-version: ["1.25.11", "1.26.8", "1.27.4", "1.28.2"]
74+
# envoy-version: ["1.25.11", "1.26.8", "1.27.5", "1.28.3"]
7575
# xds-target: ["server", "client"]
7676
TOTAL_RUNNERS: 8
7777
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -106,7 +106,7 @@ jobs:
106106
strategy:
107107
fail-fast: false
108108
matrix:
109-
envoy-version: ["1.25.11", "1.26.8", "1.27.4", "1.28.2"]
109+
envoy-version: ["1.25.11", "1.26.8", "1.27.5", "1.28.3"]
110110
xds-target: ["server", "client"]
111111
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
112112
env:

.github/workflows/test-integrations-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
envoy-version: [ "1.28.2" ]
65+
envoy-version: [ "1.28.3" ]
6666
xds-target: [ "server", "client" ]
6767
env:
6868
ENVOY_VERSION: ${{ matrix.envoy-version }}

.github/workflows/test-integrations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ jobs:
270270
# this is further going to multiplied in envoy-integration tests by the
271271
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
272272
# multiplied by 2 based on these values:
273-
# envoy-version: ["1.28.2"]
273+
# envoy-version: ["1.28.3"]
274274
# xds-target: ["server", "client"]
275275
TOTAL_RUNNERS: 2
276276
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -305,7 +305,7 @@ jobs:
305305
strategy:
306306
fail-fast: false
307307
matrix:
308-
envoy-version: ["1.28.2"]
308+
envoy-version: ["1.28.3"]
309309
xds-target: ["server", "client"]
310310
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
311311
env:

envoyextensions/xdscommon/envoy_versioning_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
153153
for _, v := range []string{
154154
"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",
155155
"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",
156-
"1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4",
157-
"1.28.0", "1.28.1", "1.28.2",
156+
"1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4", "1.27.5",
157+
"1.28.0", "1.28.1", "1.28.2", "1.28.3",
158158
} {
159159
cases[v] = testcase{expect: SupportedProxyFeatures{}}
160160
}

envoyextensions/xdscommon/proxysupport.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import "strings"
1212
//
1313
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
1414
var EnvoyVersions = []string{
15-
"1.28.2",
16-
"1.27.4",
15+
"1.28.3",
16+
"1.27.5",
1717
"1.26.8",
1818
"1.25.11",
1919
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/hashicorp/go-checkpoint v0.5.0
5151
github.com/hashicorp/go-cleanhttp v0.5.2
5252
github.com/hashicorp/go-connlimit v0.3.0
53-
github.com/hashicorp/go-discover v0.0.0-20220714221025-1c234a67149a
53+
github.com/hashicorp/go-discover v0.0.0-20230724184603-e89ebd1b2f65
5454
github.com/hashicorp/go-hclog v1.5.0
5555
github.com/hashicorp/go-immutable-radix v1.3.1
5656
github.com/hashicorp/go-immutable-radix/v2 v2.1.0

0 commit comments

Comments
 (0)