kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: update to klog v2.80.1 

The fix for https://github.com/kubernetes/klog/issues/348 is required before
https://github.com/kubernetes/kubernetes/pull/111998 can be merged because the
way how a unit test in that PR uses klog triggers the data race.

Kubernetes-commit: 60d92dd96a4ba3873dd9e061c3e332c16c213e30
This commit is contained in:
Patrick Ohly 2022-09-09 13:11:55 +02:00 committed by Kubernetes Publisher
parent 5bd13245ef
commit 6d23d3df27
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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-20220902183049-31bc292891b6 k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0-20220902190614-e509d11d881e k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0-20220902190454-c18cb782829b k8s.io/controller-manager v0.0.0
) )
require ( require (
@ -21,20 +21,21 @@ require (
golang.org/x/text v0.3.7 // indirect golang.org/x/text v0.3.7 // 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-20220902184152-5e2346794287 // indirect k8s.io/component-base v0.0.0 // indirect
k8s.io/klog/v2 v2.80.0 // indirect k8s.io/klog/v2 v2.80.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
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220902183307-6dd661f59220 k8s.io/api => ../api
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220902184729-9bf92e08171c k8s.io/apiserver => ../apiserver
k8s.io/client-go => k8s.io/client-go v0.0.0-20220902183624-b8b620636cbb k8s.io/client-go => ../client-go
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220902190614-e509d11d881e k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => k8s.io/component-base v0.0.0-20220902184152-5e2346794287 k8s.io/component-base => ../component-base
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220902184303-45ebc612ec25 k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220902190454-c18cb782829b k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

13
go.sum
View File

@ -68,18 +68,9 @@ 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-20220902183307-6dd661f59220 h1:b+NdHWOhLTKviv3QHZvUrs1+6n9W03D7u6Sjd71RkEA=
k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 h1:BH5hWQ9ueHKgA42ApyJ9RXSibEUHvd9TDr1RBZ6e7lE=
k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6/go.mod h1:L+XGzqdcOht8VoBmzPAoKcYLqUOWkB5nxGF/6z4/ubo=
k8s.io/cloud-provider v0.0.0-20220902190614-e509d11d881e h1:r0jdAmF0/JIvf3T+mZRw22uGQLvQLhKyYj2YID5Kefs=
k8s.io/cloud-provider v0.0.0-20220902190614-e509d11d881e/go.mod h1:hMC+xohS6AnqN9pEToiPlWg8p1CgUEjuv5H0DO3fNqY=
k8s.io/component-base v0.0.0-20220902184152-5e2346794287 h1:mEdEDiklmkJ92qomCqvJLdJiz8/Q74TfZF1R/1B40MU=
k8s.io/component-base v0.0.0-20220902184152-5e2346794287/go.mod h1:RelNPEgymauqYWX/ml+Ar+xEmoYZ4r695gq+z3+HxPg=
k8s.io/controller-manager v0.0.0-20220902190454-c18cb782829b h1:nCFoIrQjFSJaM3k6YALZYe4IC9TZIZMgEuBhlrfKKcA=
k8s.io/controller-manager v0.0.0-20220902190454-c18cb782829b/go.mod h1:1xu3R9Yjn6C4E4HpjEhusrQGgumczXNA6E+ZmYUZdtM=
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.80.0 h1:lyJt0TWMPaGoODa8B8bUuxgHS3W/m/bNr2cca3brA/g= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=