Merge pull request #104103 from pohly/logr-1.0

klog 2.20.0, logr v1.1.0, zapr v1.1.0

Kubernetes-commit: 5b49d125b76b4d92d5f782630b75b911fee75aaa
This commit is contained in:
Kubernetes Publisher 2021-09-09 14:28:56 -07:00
commit e1fdc439f6
2 changed files with 30 additions and 26 deletions

20
go.mod
View File

@ -5,17 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb
k8s.io/cloud-provider v0.0.0-20210907195636-20013a709e5a
k8s.io/controller-manager v0.0.0-20210907195527-8ae983242223
k8s.io/apimachinery v0.0.0-20210909232852-2694a9d8c2a6
k8s.io/cloud-provider v0.0.0-20210910000216-8c686a5a1bb3
k8s.io/controller-manager v0.0.0-20210910000103-8cb3fd5ab003
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210902155257-9cb86d9d6125
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210907193844-58d7996350b4
k8s.io/client-go => k8s.io/client-go v0.0.0-20210901080746-a31b18a6ac98
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210907195636-20013a709e5a
k8s.io/component-base => k8s.io/component-base v0.0.0-20210901040900-bed685b9e6f5
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210907195527-8ae983242223
k8s.io/api => k8s.io/api v0.0.0-20210909233056-897e446fab01
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210909232852-2694a9d8c2a6
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210909234328-e166d0daa0ca
k8s.io/client-go => k8s.io/client-go v0.0.0-20210909233348-92773dec0039
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210910000216-8c686a5a1bb3
k8s.io/component-base => k8s.io/component-base v0.0.0-20210909233903-eae60e423670
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210910000103-8cb3fd5ab003
)

36
go.sum
View File

@ -64,6 +64,7 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@ -132,8 +133,10 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.0.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.1.0 h1:nAbevmWlS2Ic4m4+/An5NXkaGqlqpbBgdcuThZxnZyI=
github.com/go-logr/logr v1.1.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/zapr v1.1.0/go.mod h1:YShqdLLTU346TNVu8Tvwe3bOo6gc75oZ1joeE+1lYdQ=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
@ -441,6 +444,7 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -841,22 +845,22 @@ 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-20210902155257-9cb86d9d6125 h1:CVD/hrllBKo7OM5ovOPzsMCM4tZgcEERxOhtg3XXek0=
k8s.io/api v0.0.0-20210902155257-9cb86d9d6125/go.mod h1:draCg0WF1Lr137sTJ2xg26MplnLcv5PRyIJaP89ntfc=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb h1:x865eFVcQlSLu6gCJ4NbCbKGqwgejXJ4yyaZuENYzcQ=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb/go.mod h1:YwXrbrp8hgDAA01lpP9HPMC6PS55tjfs3EAatyMMfeM=
k8s.io/apiserver v0.0.0-20210907193844-58d7996350b4/go.mod h1:0thlEiU5LQaKw279L1dfTxs/ReQLmyl/3bMViXeHfQg=
k8s.io/client-go v0.0.0-20210901080746-a31b18a6ac98/go.mod h1:LoKqAR7bihkfO2dEj4ExEfomATALXYAb4dj5K9ZVaT8=
k8s.io/cloud-provider v0.0.0-20210907195636-20013a709e5a h1:E9slhgehFUbCiGVzopxWExcvvB+PllYbOjl8qOhv0bI=
k8s.io/cloud-provider v0.0.0-20210907195636-20013a709e5a/go.mod h1:YPuLxzgx3c0eyllfXaojsdANDjWBPmYxGsXO9ecA/pU=
k8s.io/component-base v0.0.0-20210901040900-bed685b9e6f5 h1:qdnAC/+ttUxQ4Xhsk+zTX7UAdmCB2NZThIenpzu3lgU=
k8s.io/component-base v0.0.0-20210901040900-bed685b9e6f5/go.mod h1:qzazD/5P6Dbqm3mFJ5CzzrxN4Bi8hHMC/hGVlq+Y+6k=
k8s.io/controller-manager v0.0.0-20210907195527-8ae983242223 h1:p8mCoF4mzq3jbFbnZcKCZyCkKqGibdBx/mZ6T5z2QeE=
k8s.io/controller-manager v0.0.0-20210907195527-8ae983242223/go.mod h1:yvWbDvawGqeRiyMfw6i1MMbeZ6Kl7wnacoPvjVGvK4E=
k8s.io/api v0.0.0-20210909233056-897e446fab01 h1:n/0nzza1kIiP2DIXcZwABuQ04jxHcHL/LZpQ10RLFlY=
k8s.io/api v0.0.0-20210909233056-897e446fab01/go.mod h1:0nN0XcqrbGqTm7E11p5o0HXtTw4sWiQpWwP4ABSj9Us=
k8s.io/apimachinery v0.0.0-20210909232852-2694a9d8c2a6 h1:29ipmI/gyb6iqWT/4RBzb6yAOeV8lOWYaDHRRqKSylI=
k8s.io/apimachinery v0.0.0-20210909232852-2694a9d8c2a6/go.mod h1:ZPgmwNP53+C5GcWxpp1Nk2UcdC35zmuEjgRliNyZqgw=
k8s.io/apiserver v0.0.0-20210909234328-e166d0daa0ca/go.mod h1:oJnaWp7+Sq0rH6NtOTKctKHXRGQ53LSxOEMKVg0yDgQ=
k8s.io/client-go v0.0.0-20210909233348-92773dec0039/go.mod h1:s+NorGBbhxHU8ucpCMXP+ajvqFr2DHIcUfW3D8Lu7OE=
k8s.io/cloud-provider v0.0.0-20210910000216-8c686a5a1bb3 h1:aca61MOkBncBw3tOtUSj+axm/i5/55TwFP6X+pCTf1k=
k8s.io/cloud-provider v0.0.0-20210910000216-8c686a5a1bb3/go.mod h1:7nnexsqa4FThlcVrEeS8Vou/WFGFP9Zg5TKafknr4mk=
k8s.io/component-base v0.0.0-20210909233903-eae60e423670 h1:Q9PMSBver8seWekbtkqcKrrjncscm1AYjWoBl6+/bdA=
k8s.io/component-base v0.0.0-20210909233903-eae60e423670/go.mod h1:k++RedPnodUZvaB0SFPAdAljhOmueulpyr9wDkx1M+A=
k8s.io/controller-manager v0.0.0-20210910000103-8cb3fd5ab003 h1:ySyrrlaQojWD7jwlc39D0yVHfqaCaEScm2mysOQz6SE=
k8s.io/controller-manager v0.0.0-20210910000103-8cb3fd5ab003/go.mod h1:At6KYV8nZYzttdKNGokYj6MF6SWx5I675JO9dFQTFJg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/klog/v2 v2.20.0 h1:tlyxlSvd63k7axjhuchckaRJm+a92z5GSOrTOQY5sHw=
k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw=
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=