From 5bfe7fc85c8bbd523c4ffbb9d5a32393616a442d Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 31 Mar 2022 11:26:57 +0200 Subject: [PATCH] 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 --- go.mod | 19 ++++++++++--------- go.sum | 13 ++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index a166af51c..4c70a14ab 100644 --- a/go.mod +++ b/go.mod @@ -38,10 +38,10 @@ require ( google.golang.org/grpc v1.44.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0-20220507182958-548c53c6e4e7 - k8s.io/apimachinery v0.0.0-20220507150116-b85d88926e14 - k8s.io/client-go v0.0.0-20220507183325-7c5b74295ff7 - k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.60.1 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 @@ -62,7 +62,7 @@ require ( github.com/dustin/go-humanize v1.0.0 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/form3tech-oss/jwt-go v3.2.3+incompatible // 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 @@ -118,8 +118,9 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220507182958-548c53c6e4e7 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220507150116-b85d88926e14 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220507183325-7c5b74295ff7 - k8s.io/component-base => k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base ) diff --git a/go.sum b/go.sum index d88e46658..c528b4ba6 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= 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/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/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -146,8 +148,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V 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.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= @@ -842,14 +845,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-20220507182958-548c53c6e4e7 h1:kuhoZ9Rn1L4/AcNWy0PPO4/6bEOtOkMTJQSPjddsOe0= -k8s.io/api v0.0.0-20220507182958-548c53c6e4e7/go.mod h1:154p/3ujIEyz3+etnCPssLfizV5fjmckTIQh4H9xaO8= -k8s.io/apimachinery v0.0.0-20220507150116-b85d88926e14 h1:uPq2qxnOUj45sSb9h5rdCSqQzEobqT5C+FqbkeR7mUo= -k8s.io/apimachinery v0.0.0-20220507150116-b85d88926e14/go.mod h1:uGY24s7SdIB7FcHv24gPLtIuAbIr6dUOurHRId4zkrk= -k8s.io/client-go v0.0.0-20220507183325-7c5b74295ff7 h1:oYP1y9DUw3fhpL6I8qMaOlXuAbZa36sDdh12CSgI97U= -k8s.io/client-go v0.0.0-20220507183325-7c5b74295ff7/go.mod h1:IxI8B9iIUyY1sm3XfiwN+b29XQm4xb7iyaUOgLW3GZM= -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/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=