Skip to content

Commit a5f5f44

Browse files
authored
Merge pull request kubernetes#123758 from liggitt/protobump
[CVE-2024-24786] Bump github.com/golang/protobuf v1.5.4, google.golang.org/protobuf v1.33.0
2 parents 546f7c3 + c6673d2 commit a5f5f44

File tree

123 files changed

+4129
-1428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+4129
-1428
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/gogo/protobuf v1.3.2
3535
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
3636
github.com/golang/mock v1.6.0
37-
github.com/golang/protobuf v1.5.3
37+
github.com/golang/protobuf v1.5.4
3838
github.com/google/cadvisor v0.49.0
3939
github.com/google/cel-go v0.17.8
4040
github.com/google/gnostic-models v0.6.8
@@ -84,7 +84,7 @@ require (
8484
google.golang.org/api v0.126.0
8585
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
8686
google.golang.org/grpc v1.58.3
87-
google.golang.org/protobuf v1.31.0
87+
google.golang.org/protobuf v1.33.0
8888
gopkg.in/square/go-jose.v2 v2.6.0
8989
gopkg.in/yaml.v2 v2.4.0
9090
gopkg.in/yaml.v3 v3.0.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
415415
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
416416
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
417417
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
418-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
419-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
418+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
419+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
420420
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
421421
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
422422
github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A=
@@ -1234,8 +1234,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
12341234
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
12351235
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
12361236
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1237-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
1238-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
1237+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
1238+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
12391239
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
12401240
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
12411241
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

staging/src/k8s.io/api/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
1515
github.com/go-logr/logr v1.4.1 // indirect
16-
github.com/golang/protobuf v1.5.3 // indirect
16+
github.com/golang/protobuf v1.5.4 // indirect
1717
github.com/google/go-cmp v0.6.0 // indirect
1818
github.com/google/gofuzz v1.2.0 // indirect
1919
github.com/json-iterator/go v1.1.12 // indirect
@@ -24,7 +24,7 @@ require (
2424
github.com/spf13/pflag v1.0.5 // indirect
2525
golang.org/x/net v0.21.0 // indirect
2626
golang.org/x/text v0.14.0 // indirect
27-
google.golang.org/protobuf v1.31.0 // indirect
27+
google.golang.org/protobuf v1.33.0 // indirect
2828
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2929
gopkg.in/inf.v0 v0.9.1 // indirect
3030
gopkg.in/yaml.v2 v2.4.0 // indirect

staging/src/k8s.io/api/go.sum

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
go.opentelemetry.io/otel/trace v1.19.0
2323
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
2424
google.golang.org/grpc v1.58.3
25-
google.golang.org/protobuf v1.31.0
25+
google.golang.org/protobuf v1.33.0
2626
gopkg.in/yaml.v2 v2.4.0
2727
k8s.io/api v0.0.0
2828
k8s.io/apimachinery v0.0.0
@@ -59,7 +59,7 @@ require (
5959
github.com/go-openapi/swag v0.22.3 // indirect
6060
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
6161
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
62-
github.com/golang/protobuf v1.5.3 // indirect
62+
github.com/golang/protobuf v1.5.4 // indirect
6363
github.com/google/btree v1.0.1 // indirect
6464
github.com/gorilla/websocket v1.5.0 // indirect
6565
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/evanphx/json-patch v4.12.0+incompatible
1111
github.com/fxamacker/cbor/v2 v2.6.0
1212
github.com/gogo/protobuf v1.3.2
13-
github.com/golang/protobuf v1.5.3
13+
github.com/golang/protobuf v1.5.4
1414
github.com/google/gnostic-models v0.6.8
1515
github.com/google/go-cmp v0.6.0
1616
github.com/google/gofuzz v1.2.0
@@ -52,7 +52,7 @@ require (
5252
golang.org/x/sys v0.17.0 // indirect
5353
golang.org/x/text v0.14.0 // indirect
5454
golang.org/x/tools v0.18.0 // indirect
55-
google.golang.org/protobuf v1.31.0 // indirect
55+
google.golang.org/protobuf v1.33.0 // indirect
5656
gopkg.in/yaml.v2 v2.4.0 // indirect
5757
gopkg.in/yaml.v3 v3.0.1 // indirect
5858
)

staging/src/k8s.io/apimachinery/go.sum

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
golang.org/x/time v0.3.0
4141
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
4242
google.golang.org/grpc v1.58.3
43-
google.golang.org/protobuf v1.31.0
43+
google.golang.org/protobuf v1.33.0
4444
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4545
gopkg.in/square/go-jose.v2 v2.6.0
4646
k8s.io/api v0.0.0
@@ -76,7 +76,7 @@ require (
7676
github.com/go-openapi/swag v0.22.3 // indirect
7777
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
7878
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
79-
github.com/golang/protobuf v1.5.3 // indirect
79+
github.com/golang/protobuf v1.5.4 // indirect
8080
github.com/google/btree v1.0.1 // indirect
8181
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
8282
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect

staging/src/k8s.io/apiserver/go.sum

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)