Merge pull request #113425 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.25

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

Kubernetes-commit: c8d0fbe009b48f96e36bba9c36e20dba79bfdd05
This commit is contained in:
Kubernetes Publisher 2022-11-15 17:08:47 -08:00
parent 75ca95e800
commit 42ad4e8dfb
2 changed files with 21 additions and 13 deletions

25
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677
k8s.io/cloud-provider v0.0.0-20221116024350-2c965368a106
k8s.io/controller-manager v0.0.0-20221116024149-2e28c73977dd
)
require (
@ -21,7 +21,7 @@ require (
golang.org/x/text v0.4.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0 // indirect
k8s.io/component-base v0.0.0-20221116020507-c17f995c3b74 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
@ -29,13 +29,12 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20221116015155-70abe330cadd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221116021458-d1d228e6d9f3
k8s.io/client-go => k8s.io/client-go v0.0.0-20221116015744-b63afdf260a7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221116024350-2c965368a106
k8s.io/component-base => k8s.io/component-base v0.0.0-20221116020507-c17f995c3b74
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221116020647-bf9a0e6a43d2
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221116024149-2e28c73977dd
)

9
go.sum
View File

@ -68,6 +68,15 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
k8s.io/api v0.0.0-20221116015155-70abe330cadd h1:VNC35xzZgL+LDL6rwGs98gChgFhytVdj44QCPvo/dGw=
k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677 h1:tvWPTjTVIWYcIq+qvIdKEi9h4N9kk/VbtfL6q4Vilfg=
k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677/go.mod h1:5lPbqMG43z11tv1mic52QrCRtTBVCMXP1o10nVUiomU=
k8s.io/cloud-provider v0.0.0-20221116024350-2c965368a106 h1:i4b1KsUSzEikc7qQE97NW4Aq4u54PKbzky4QrCoZi+0=
k8s.io/cloud-provider v0.0.0-20221116024350-2c965368a106/go.mod h1:GtksUKwWZox5C8wmf0TULDIaBvX0t9ECm39XSAAuiF0=
k8s.io/component-base v0.0.0-20221116020507-c17f995c3b74 h1:vsQ48V+DdRSiG71SOjAv16zSPzR3xDKclAvkWhhEjdo=
k8s.io/component-base v0.0.0-20221116020507-c17f995c3b74/go.mod h1:dutcZOhK4JO/x5nKJVWohyfAy41a76l0rTDjVvq0iDY=
k8s.io/controller-manager v0.0.0-20221116024149-2e28c73977dd h1:4Zz9VCzCirPzSCw8rozrNkdrfpPHKoejXJPAV2rvgvk=
k8s.io/controller-manager v0.0.0-20221116024149-2e28c73977dd/go.mod h1:y9acfXiboodsVVWv79KVLMQFg4IN7I/TPOv3ujaLggQ=
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=