Skip to content

Commit 0dc083b

Browse files
Backport of security: bump envoy version and k8s.io/apimachinery (#21033)
* security: bump envoy version and k8s.io/apimachinery * add changelog
1 parent 13fe5f7 commit 0dc083b

9 files changed

+21
-109
lines changed

.changelog/21033.txt

+9
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.17.x.yml

+2-2
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.6", "1.27.2"]
77+
# envoy-version: ["1.24.12", "1.25.11", "1.26.6", "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.6", "1.27.2"]
112+
envoy-version: ["1.24.12", "1.25.11", "1.26.6", "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

+2-2
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.24.12", "1.25.11", "1.26.6", "1.27.2"]
74+
# envoy-version: ["1.24.12", "1.25.11", "1.26.6", "1.27.5"]
7575
# xds-target: ["server", "client"]
7676
TOTAL_RUNNERS: 4
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.24.12", "1.25.11", "1.26.6", "1.27.2"]
109+
envoy-version: ["1.24.12", "1.25.11", "1.26.6", "1.27.5"]
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

+1-1
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.27.4" ]
65+
envoy-version: [ "1.27.5" ]
6666
xds-target: [ "server", "client" ]
6767
env:
6868
ENVOY_VERSION: ${{ matrix.envoy-version }}

.github/workflows/test-integrations.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ jobs:
271271
# this is further going to multiplied in envoy-integration tests by the
272272
# other dimensions in the matrix. Currently TOTAL_RUNNERS would be
273273
# multiplied by 2 based on these values:
274-
# envoy-version: ["1.27.4"]
274+
# envoy-version: ["1.27.5"]
275275
# xds-target: ["server", "client"]
276276
TOTAL_RUNNERS: 4
277277
JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
@@ -306,7 +306,7 @@ jobs:
306306
strategy:
307307
fail-fast: false
308308
matrix:
309-
envoy-version: ["1.27.4"]
309+
envoy-version: ["1.27.5"]
310310
xds-target: ["server", "client"]
311311
test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
312312
env:

envoyextensions/xdscommon/envoy_versioning_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
154154
"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.24.11", "1.24.12",
155155
"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",
156156
"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",
157-
"1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4",
157+
"1.27.0", "1.27.1", "1.27.2", "1.27.3", "1.27.4", "1.27.5",
158158
} {
159159
cases[v] = testcase{expect: SupportedProxyFeatures{}}
160160
}

envoyextensions/xdscommon/proxysupport.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import "strings"
1212
//
1313
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
1414
var EnvoyVersions = []string{
15-
"1.27.4",
15+
"1.27.5",
1616
"1.26.8",
1717
"1.25.11",
1818
"1.24.12",

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/hashicorp/go-checkpoint v0.5.0
4848
github.com/hashicorp/go-cleanhttp v0.5.2
4949
github.com/hashicorp/go-connlimit v0.3.0
50-
github.com/hashicorp/go-discover v0.0.0-20220714221025-1c234a67149a
50+
github.com/hashicorp/go-discover v0.0.0-20230724184603-e89ebd1b2f65
5151
github.com/hashicorp/go-hclog v1.5.0
5252
github.com/hashicorp/go-immutable-radix v1.3.1
5353
github.com/hashicorp/go-memdb v1.3.4

go.sum

+2-99
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)