klog 2.30.0, logr 1.2.0, zapr 1.2.0

The new releases fix logging of KObj in JSON output: klog implements the new
logr.Marshaler interface and zapr uses it instead of Stringer when logging the
ObjectRef created by KObj.

Kubernetes-commit: 169e8b65a00b45ef8bbc7a14cd985df1c835953b
This commit is contained in:
Patrick Ohly 2021-10-22 15:13:47 +02:00 committed by Kubernetes Publisher
parent 6d0bb8dc52
commit de7eb39b07
2 changed files with 16 additions and 28 deletions

21
go.mod
View File

@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e
k8s.io/cloud-provider v0.0.0-20211022050127-bb5da34e6085
k8s.io/controller-manager v0.0.0-20211022050011-b53965c553e8
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211022043400-0d109423f7b5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211022044437-95d95677f5ee
k8s.io/client-go => k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211022050127-bb5da34e6085
k8s.io/component-base => k8s.io/component-base v0.0.0-20211022044054-a5c708bda26e
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211022050011-b53965c553e8
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/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
)

23
go.sum
View File

@ -133,10 +133,9 @@ 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 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-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro=
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=
@ -847,22 +846,10 @@ 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-20211022043400-0d109423f7b5 h1:OR4i+jKzSQRW7o8MoZh0Wa6MnAITjJ9bDSIFoYdWWBY=
k8s.io/api v0.0.0-20211022043400-0d109423f7b5/go.mod h1:lxgi4b+2bgUh27XvISfH38vuHh72U1JW7aximf11zWQ=
k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e h1:NkM0Ub6zH1mP5EYI4e1ID1PrN1aKJZ8C6AvMTag3fl8=
k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e/go.mod h1:2IUp7UotDtXUsLByLqAfQHbesreQsxx8loqZwLf6/uw=
k8s.io/apiserver v0.0.0-20211022044437-95d95677f5ee/go.mod h1:VVjHipo2Gb9bfHbZZUnhq2GTakowRYynAMDhldESij8=
k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466/go.mod h1:RyL7SL68TDoGSPWExfr/7d1vjJOLq3rNCKAi5n3zaN8=
k8s.io/cloud-provider v0.0.0-20211022050127-bb5da34e6085 h1:BxZS+5FDJR9DL6NXVtGr1dcFVDl1eRQCOU1paRCMY5A=
k8s.io/cloud-provider v0.0.0-20211022050127-bb5da34e6085/go.mod h1:U2qFgNg8HDcUMe1wvPwIaN409AELfBAYvSf/t8ohXPc=
k8s.io/component-base v0.0.0-20211022044054-a5c708bda26e h1:q7o6fMOYL0ITSGY8nuW+EDucwz0aXsDyHKCH+n4WFns=
k8s.io/component-base v0.0.0-20211022044054-a5c708bda26e/go.mod h1:9dw9LezAAfu8ujEhXaUEsBI6A+CkYkTn689U9NqaY/c=
k8s.io/controller-manager v0.0.0-20211022050011-b53965c553e8 h1:TMQwlq9rTI+4ttyewSeOJd/WfU+Zkmyaw/EHF3nbaqw=
k8s.io/controller-manager v0.0.0-20211022050011-b53965c553e8/go.mod h1:7Gyviy9I8xsdNjHCS8QNBP04wuz+ZgSf4mP4HdIibT4=
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.20.0 h1:tlyxlSvd63k7axjhuchckaRJm+a92z5GSOrTOQY5sHw=
k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw=
k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=
k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
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-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=