Merge pull request #115642 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.26

Pin golang.org/x/net to v0.4.0 in 1.26

Kubernetes-commit: 5ae2e75abe3a631e770b7136f8e3bd2a6051ba18
This commit is contained in:
Kubernetes Publisher 2023-02-10 00:05:38 -08:00
parent a63cafbe6a
commit e643581b48
2 changed files with 22 additions and 14 deletions

27
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19 go 1.19
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20230210193909-89a3291d11b3
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20230210192847-d5fa192b8258
) )
require ( require (
@ -21,7 +21,7 @@ require (
golang.org/x/text v0.5.0 // indirect golang.org/x/text v0.5.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0 // indirect k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 // indirect
k8s.io/klog/v2 v2.80.1 // indirect k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
@ -29,14 +29,13 @@ require (
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230210165428-05e39c775240
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230210193909-89a3291d11b3
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230210161308-c4d25816b7cc
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230210192847-d5fa192b8258
k8s.io/kms => ../kms k8s.io/kms => k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

9
go.sum
View File

@ -66,6 +66,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 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ=
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis=
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U=
k8s.io/cloud-provider v0.0.0-20230210193909-89a3291d11b3 h1:V8TDQZ+hZRQABLa3DGYAPFAnyl/rss5qrENvO0sTPxc=
k8s.io/cloud-provider v0.0.0-20230210193909-89a3291d11b3/go.mod h1:wIGJ5mkvKt4QC3Qv+hjEIRXwTemt0DZNRznNTFd3bsM=
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 h1:Wyx2zUTgx24uE38TvovTGFw+bGhQQXsOyIHeur5/pT8=
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284/go.mod h1:3Vr9lpWind8jJlqQjSNyw43+mk5QmPcLmDFJnxtIvGc=
k8s.io/controller-manager v0.0.0-20230210192847-d5fa192b8258 h1:jsdoASiPEcWlcTybNsGSWO2AiCaq1CXU02GEExXQqIY=
k8s.io/controller-manager v0.0.0-20230210192847-d5fa192b8258/go.mod h1:oUBZ+9c9ssmHwSFEfJWaApXy41By1ulih6y6pa8/Irc=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=