dependencies: logr and zapr v1.2.3

The updated zapr is more resilient against MarshalLog crashing. Not a known
problem in Kubernetes, though.

Kubernetes-commit: 3e6974e0ba67a8f598e7bc4ccedfdab928935551
This commit is contained in:
Patrick Ohly 2022-03-31 11:26:57 +02:00 committed by Kubernetes Publisher
parent 2416f156cf
commit 21a0f85608
2 changed files with 16 additions and 23 deletions

27
go.mod
View File

@ -5,13 +5,13 @@ module k8s.io/kube-controller-manager
go 1.18 go 1.18
require ( require (
k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78 k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0-20220505110717-c85e0117cd60 k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0-20220505110541-5ef82cb0ec9c k8s.io/controller-manager v0.0.0
) )
require ( require (
github.com/go-logr/logr v1.2.0 // indirect github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect github.com/json-iterator/go v1.1.12 // indirect
@ -22,7 +22,7 @@ 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-20220505103914-99e6e4beb802 // indirect k8s.io/component-base v0.0.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
@ -30,12 +30,13 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc k8s.io/api => ../api
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78 k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220505104441-4e6d1b48562a k8s.io/apiserver => ../apiserver
k8s.io/client-go => k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1 k8s.io/client-go => ../client-go
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220505110717-c85e0117cd60 k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 k8s.io/component-base => ../component-base
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220505104041-62c4b8b733ad k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220505110541-5ef82cb0ec9c k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

12
go.sum
View File

@ -2,8 +2,9 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
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/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
@ -71,15 +72,6 @@ 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.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc h1:3eogb8wDT+GiQJxc0MX2W1Wu1T1yAS2OxwKjPQ8xxJE=
k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78 h1:RLa23e5iS06TPEQnMll7tRyktuUuSZcOf7dkI/GoOPk=
k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78/go.mod h1:uGY24s7SdIB7FcHv24gPLtIuAbIr6dUOurHRId4zkrk=
k8s.io/cloud-provider v0.0.0-20220505110717-c85e0117cd60 h1:6W9cpFplNvNg9lokmo3hqh/7iw9CbblefunSm2gMU9I=
k8s.io/cloud-provider v0.0.0-20220505110717-c85e0117cd60/go.mod h1:TSfvqyivEZuxdoOwrsamlkb8vWQUt/X3jZVyT0FxT/I=
k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 h1:kGVA+g2Y2TH7xKi9caFzJUwJBBJOViq7Qw6BxEJYEWw=
k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802/go.mod h1:2kFEoUhXOXJvpnO9kvscK8z/rLae+d0dWtc/fefnRyc=
k8s.io/controller-manager v0.0.0-20220505110541-5ef82cb0ec9c h1:TKKSFot/3xfT/W6dsAP8+1PKoRW6CZFzjGVkU49IUYE=
k8s.io/controller-manager v0.0.0-20220505110541-5ef82cb0ec9c/go.mod h1:K6Bju2jIbK5C1rpYBSAY6lLPnXYe7EqqCGc/6LR7zdw=
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.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=