Skip to content

Commit 1cc6a8b

Browse files
Merge pull request #115788 from liggitt/net-0.7.0-1.25
[1.25] Update golang.org/x/net to v0.7.0 Kubernetes-commit: 8972d2b73a497eb0d15615b24fa7ca82d5b38b86
1 parent 3b0c62d commit 1cc6a8b

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
go.opentelemetry.io/otel/trace v0.20.0
2525
go.uber.org/zap v1.19.0
2626
golang.org/x/sys v0.5.0
27-
k8s.io/apimachinery v0.0.0
28-
k8s.io/client-go v0.0.0
27+
k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82
28+
k8s.io/client-go v0.0.0-20230215112115-d51156025a6a
2929
k8s.io/klog/v2 v2.70.1
3030
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
3131
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
@@ -78,15 +78,14 @@ require (
7878
gopkg.in/yaml.v2 v2.4.0 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect
8080
gotest.tools/v3 v3.0.3 // indirect
81-
k8s.io/api v0.0.0 // indirect
81+
k8s.io/api v0.0.0-20230215103432-f3470a715e29 // indirect
8282
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
8383
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8484
sigs.k8s.io/yaml v1.2.0 // indirect
8585
)
8686

8787
replace (
88-
k8s.io/api => ../api
89-
k8s.io/apimachinery => ../apimachinery
90-
k8s.io/client-go => ../client-go
91-
k8s.io/component-base => ../component-base
88+
k8s.io/api => k8s.io/api v0.0.0-20230215103432-f3470a715e29
89+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82
90+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230215112115-d51156025a6a
9291
)

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
643643
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
644644
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
645645
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
646+
k8s.io/api v0.0.0-20230215103432-f3470a715e29 h1:Q1GuQ2EGrE+reDnyLQhuVoK1P+duSxT6C6WjaZfBRQI=
647+
k8s.io/api v0.0.0-20230215103432-f3470a715e29/go.mod h1:PODrj/kfloACfq4+DILXmsfiyfPS9QP1vz1HY6q+7Tc=
648+
k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82 h1:SiAoLKhyRlWb22AOCekM4z6e/DBPpwWfBBHCs9bqWuc=
649+
k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82/go.mod h1:ZTl0drTQaFi5gMM3snYI5tWV1XJmRH1gfnDx2QCLsxk=
650+
k8s.io/client-go v0.0.0-20230215112115-d51156025a6a h1:hU90UtSYjd/6TsBokQDC9HkogNgrIGjk/K2BjVUxVsw=
651+
k8s.io/client-go v0.0.0-20230215112115-d51156025a6a/go.mod h1:xy59ltzc8JR3hz6jeTjG5/nyEmzrIT3QfvsdolGBuD4=
646652
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
647653
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
648654
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=

0 commit comments

Comments
 (0)