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 aafdd7a698
commit 082ffae2be
2 changed files with 20 additions and 31 deletions

33
go.mod
View File

@ -29,15 +29,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc
k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78
k8s.io/cli-runtime v0.0.0-20220505105816-2c0f33452662
k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1
k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802
k8s.io/component-helpers v0.0.0-20220505104041-62c4b8b733ad
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/metrics v0.0.0-20220505105639-8a3b86da3ca4
k8s.io/metrics v0.0.0
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2
sigs.k8s.io/kustomize/kustomize/v4 v4.5.4
@ -52,7 +52,7 @@ require (
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
@ -98,12 +98,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220505105816-2c0f33452662
k8s.io/client-go => k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220505102505-8ed2cce65b96
k8s.io/component-base => k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220505104041-62c4b8b733ad
k8s.io/metrics => k8s.io/metrics v0.0.0-20220505105639-8a3b86da3ca4
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
)

18
go.sum
View File

@ -54,6 +54,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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@ -114,8 +115,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
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.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@ -758,18 +760,6 @@ 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-20220505102950-a2ee8c7e6bdc h1:3eogb8wDT+GiQJxc0MX2W1Wu1T1yAS2OxwKjPQ8xxJE=
k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc/go.mod h1:OOLghH2+yu555ffGNZj4oONfTzZ5Z4/0cccT4Q+0Ggc=
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/cli-runtime v0.0.0-20220505105816-2c0f33452662 h1:Rkcs+eYhgr/lh1pSSYFd1S07Y7LC+MDuf4REZKoQeGk=
k8s.io/cli-runtime v0.0.0-20220505105816-2c0f33452662/go.mod h1:xD9OiC2mPS+zEMgGOgiBfPzwfOSQOY/F/2L7Wo7gMZo=
k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1 h1:h+Jldwv5q1plOR7TffsQcf3kfj2q4jj2ca+mt+njKT4=
k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1/go.mod h1:f+d3P+jG3hKUuh3x+X8hj/nWgsHtrfVoxXjAuGTEb9Y=
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/component-helpers v0.0.0-20220505104041-62c4b8b733ad h1:TH+c9SRkc2sR2AFu/MouTae+iC+LaX62luuUe89p4jc=
k8s.io/component-helpers v0.0.0-20220505104041-62c4b8b733ad/go.mod h1:JSclmZm148dbEG8OmuUgnf10juV6LxF4WD6nn0+3SiU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -779,8 +769,6 @@ k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU=
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
k8s.io/metrics v0.0.0-20220505105639-8a3b86da3ca4 h1:axZ1mUgX5YMRUgHX/CRzcyzYoDPxILTy/2OMN8wbmiQ=
k8s.io/metrics v0.0.0-20220505105639-8a3b86da3ca4/go.mod h1:M2waclPVLpkxpRy7tzxRa7YVQmIZsZ+Mwsdu2fHDDKs=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=