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

go.mod

@@ -26,8 +26,8 @@ require (
 	golang.org/x/term v0.5.0
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
 	google.golang.org/protobuf v1.28.0
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20230215103432-f3470a715e29
+	k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82
 	k8s.io/klog/v2 v2.70.1
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
@@ -70,7 +70,6 @@ require (
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.0.0-20230215103432-f3470a715e29
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82
 )

go.sum

@@ -667,6 +667,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.0.0-20230215103432-f3470a715e29 h1:Q1GuQ2EGrE+reDnyLQhuVoK1P+duSxT6C6WjaZfBRQI=
+k8s.io/api v0.0.0-20230215103432-f3470a715e29/go.mod h1:PODrj/kfloACfq4+DILXmsfiyfPS9QP1vz1HY6q+7Tc=
+k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82 h1:SiAoLKhyRlWb22AOCekM4z6e/DBPpwWfBBHCs9bqWuc=
+k8s.io/apimachinery v0.0.0-20230215101942-8df78a92da82/go.mod h1:ZTl0drTQaFi5gMM3snYI5tWV1XJmRH1gfnDx2QCLsxk=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=