Skip to content

Commit d9c54f6

Browse files
authored
Merge pull request kubernetes#124174 from dims/update-x/net-for-CVE-2023-45288
Update x/net for CVE-2023-45288
2 parents 6673e7a + 99fac38 commit d9c54f6

File tree

81 files changed

+1170
-405
lines changed

Some content is hidden

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

81 files changed

+1170
-405
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ require (
7373
go.opentelemetry.io/proto/otlp v1.0.0
7474
go.uber.org/goleak v1.3.0
7575
go.uber.org/zap v1.26.0
76-
golang.org/x/crypto v0.19.0
77-
golang.org/x/net v0.21.0
76+
golang.org/x/crypto v0.21.0
77+
golang.org/x/net v0.23.0
7878
golang.org/x/oauth2 v0.10.0
7979
golang.org/x/sync v0.6.0
80-
golang.org/x/sys v0.17.0
81-
golang.org/x/term v0.17.0
80+
golang.org/x/sys v0.18.0
81+
golang.org/x/term v0.18.0
8282
golang.org/x/time v0.3.0
8383
golang.org/x/tools v0.18.0
8484
google.golang.org/api v0.126.0

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
823823
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
824824
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
825825
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
826-
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
827-
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
826+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
827+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
828828
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
829829
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
830830
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -906,8 +906,8 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
906906
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
907907
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
908908
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
909-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
910-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
909+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
910+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
911911
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
912912
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
913913
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1001,13 +1001,13 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
10011001
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10021002
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10031003
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1004-
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
1005-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1004+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
1005+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
10061006
golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
10071007
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
10081008
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
1009-
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
1010-
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
1009+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
1010+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
10111011
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10121012
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10131013
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/modern-go/reflect2 v1.0.2 // indirect
2323
github.com/pmezard/go-difflib v1.0.0 // indirect
2424
github.com/spf13/pflag v1.0.5 // indirect
25-
golang.org/x/net v0.21.0 // indirect
25+
golang.org/x/net v0.23.0 // indirect
2626
golang.org/x/text v0.14.0 // indirect
2727
google.golang.org/protobuf v1.33.0 // indirect
2828
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

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

Lines changed: 5 additions & 5 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ require (
104104
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
105105
go.uber.org/multierr v1.11.0 // indirect
106106
go.uber.org/zap v1.26.0 // indirect
107-
golang.org/x/crypto v0.19.0 // indirect
107+
golang.org/x/crypto v0.21.0 // indirect
108108
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
109109
golang.org/x/mod v0.15.0 // indirect
110-
golang.org/x/net v0.21.0 // indirect
110+
golang.org/x/net v0.23.0 // indirect
111111
golang.org/x/oauth2 v0.10.0 // indirect
112112
golang.org/x/sync v0.6.0 // indirect
113-
golang.org/x/sys v0.17.0 // indirect
114-
golang.org/x/term v0.17.0 // indirect
113+
golang.org/x/sys v0.18.0 // indirect
114+
golang.org/x/term v0.18.0 // indirect
115115
golang.org/x/text v0.14.0 // indirect
116116
golang.org/x/time v0.3.0 // indirect
117117
golang.org/x/tools v0.18.0 // indirect

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

Lines changed: 8 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
@@ -20,7 +20,7 @@ require (
2020
github.com/onsi/ginkgo/v2 v2.15.0
2121
github.com/spf13/pflag v1.0.5
2222
github.com/stretchr/testify v1.8.4
23-
golang.org/x/net v0.21.0
23+
golang.org/x/net v0.23.0
2424
golang.org/x/time v0.3.0
2525
gopkg.in/inf.v0 v0.9.1
2626
k8s.io/klog/v2 v2.120.1
@@ -49,7 +49,7 @@ require (
4949
github.com/pmezard/go-difflib v1.0.0 // indirect
5050
github.com/rogpeppe/go-internal v1.10.0 // indirect
5151
github.com/x448/float16 v0.8.4 // indirect
52-
golang.org/x/sys v0.17.0 // indirect
52+
golang.org/x/sys v0.18.0 // indirect
5353
golang.org/x/text v0.14.0 // indirect
5454
golang.org/x/tools v0.18.0 // indirect
5555
google.golang.org/protobuf v1.33.0 // indirect

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

Lines changed: 6 additions & 6 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ require (
3333
go.opentelemetry.io/otel/sdk v1.19.0
3434
go.opentelemetry.io/otel/trace v1.19.0
3535
go.uber.org/zap v1.26.0
36-
golang.org/x/crypto v0.19.0
37-
golang.org/x/net v0.21.0
36+
golang.org/x/crypto v0.21.0
37+
golang.org/x/net v0.23.0
3838
golang.org/x/sync v0.6.0
39-
golang.org/x/sys v0.17.0
39+
golang.org/x/sys v0.18.0
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
@@ -114,7 +114,7 @@ require (
114114
go.uber.org/multierr v1.11.0 // indirect
115115
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
116116
golang.org/x/oauth2 v0.10.0 // indirect
117-
golang.org/x/term v0.17.0 // indirect
117+
golang.org/x/term v0.18.0 // indirect
118118
golang.org/x/text v0.14.0 // indirect
119119
google.golang.org/appengine v1.6.7 // indirect
120120
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect

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

Lines changed: 8 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)