Merge pull request #113459 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.24

Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to

Kubernetes-commit: d818028a1851891cdf934a543bb7ff959ec23d50
This commit is contained in:
Kubernetes Publisher
2022-11-16 01:20:50 -08:00
parent e25247bd37
commit d8a162e21a
2 changed files with 8 additions and 5 deletions

9
go.mod
View File

@@ -26,8 +26,8 @@ require (
golang.org/x/term v0.1.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20221116094747-a5cb4fed59cf
k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
@@ -72,7 +72,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-20221116094747-a5cb4fed59cf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567
)

4
go.sum
View File

@@ -610,6 +610,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-20221116094747-a5cb4fed59cf h1:H2XPmMgE55g2pvNUAVc23znDn31nSpa1Sf7pidcQVW0=
k8s.io/api v0.0.0-20221116094747-a5cb4fed59cf/go.mod h1:wDSX8/AkGF9dwaYtdyV4xonmSO+wcM6WJZLOyLxNwcw=
k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567 h1:boTtD9FkuvTHtLHIjuNF5XV97KZeFCYVAqslTo0sIvs=
k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567/go.mod h1:KuMOnNdYY8ZWrGp8F63IlL7Z1XrmrxcIeYEl3Csh8W4=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=