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

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

Kubernetes-commit: 641272fbcf7a75a06fb55909b5514523271737ef
This commit is contained in:
Kubernetes Publisher 2023-02-10 01:05:42 -08:00
parent 368f2d258b
commit d5d2859d8d
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 go 1.19
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20230210193658-062f73578c04
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20230210192803-7d4444cf28e2
) )
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-20230210155653-035c1bee3454 // indirect
k8s.io/klog/v2 v2.70.1 // indirect k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
@ -29,13 +29,12 @@ require (
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20230210143720-61b78067ef2e
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230210164327-f28892c29090
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20230210152741-e42bae1174fa
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230210193658-062f73578c04
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155653-035c1bee3454
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230210161134-1ce307e407a7
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230210192803-7d4444cf28e2
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

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 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-20230210143720-61b78067ef2e h1:lWyvynY+r1veWNNoaf7Pss4A0l7xq8A2WDQa2aq0/KU=
k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8 h1:AL6FJNNR+xuwnV8QA3VTIYrJoJjQwAr9wUhoM7pm/qo=
k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8/go.mod h1:7XUKBww8n9iYmxWjyQkuqNOBe46nRApEQxAsPFWAZ/E=
k8s.io/cloud-provider v0.0.0-20230210193658-062f73578c04 h1:65uUj02MDRDvzW2FbotcH1YrJ2JzQcAcvS/Pmw/bTms=
k8s.io/cloud-provider v0.0.0-20230210193658-062f73578c04/go.mod h1:LNzEx1KWrCzOEbeakVxEzOXGmr5ZKNDuX4x3Euqncss=
k8s.io/component-base v0.0.0-20230210155653-035c1bee3454 h1:VwJGob7UwbngP0qebV0YYTY6Cx1sDvzGUe4FF8nByPA=
k8s.io/component-base v0.0.0-20230210155653-035c1bee3454/go.mod h1:R5cW4BQbMdH3GW8yVYPazWtu4AY7G7hBK1lckxX6Na4=
k8s.io/controller-manager v0.0.0-20230210192803-7d4444cf28e2 h1:9gBhzk4x1LZo/DCUf5lEibShibX97cxpeZuQP2mtqrs=
k8s.io/controller-manager v0.0.0-20230210192803-7d4444cf28e2/go.mod h1:H/Do6E0GM9BchEUmhDpF9ATEfa65zp8gKUpCeXCDzWI=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= 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 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=