From c301d448ce6a774302e5364a16d31a44c9f898c1 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 | 11 ++++++----- go.sum | 7 ++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 567ca2da..ecb58941 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.27.1 - k8s.io/api v0.0.0-20220507182958-548c53c6e4e7 - k8s.io/apimachinery v0.0.0-20220507150116-b85d88926e14 + k8s.io/api v0.0.0 + k8s.io/apimachinery 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 @@ -46,7 +46,7 @@ require ( github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.4.9 // 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 @@ -72,6 +72,7 @@ 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/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 6f589e4a..7c1de799 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,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= @@ -607,10 +608,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/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=