From f6abbe189ba70a02bef32624da321e62c9b36144 Mon Sep 17 00:00:00 2001 From: Patrick Ohly <patrick.ohly@intel.com> 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 | 11 ++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 5bd7a2bc..d697c3fa 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.18 require ( - k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc - k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78 - k8s.io/client-go v0.0.0-20220505103316-c0ab12afa7f1 - k8s.io/code-generator v0.0.0-20220505102505-8ed2cce65b96 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 k8s.io/klog/v2 v2.60.1 ) @@ -18,7 +18,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/evanphx/json-patch v4.12.0+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 @@ -61,8 +61,9 @@ 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/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/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/sample-controller => ../sample-controller ) diff --git a/go.sum b/go.sum index f7e0912e..779c9425 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,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= @@ -497,14 +498,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/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/code-generator v0.0.0-20220505102505-8ed2cce65b96 h1:qBZF8GDFQJt0uE7ialbWL3T4ABP8YLSKtFFkfD82+J4= -k8s.io/code-generator v0.0.0-20220505102505-8ed2cce65b96/go.mod h1:IhnAe7I27dbCx3QcS1y2Ov3vNPIkQ4s/McUCFlD0T/0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=