From 58e1087cbd7d31cc3f49368979a2f8b2cbf9cd9a Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 22 Oct 2021 15:13:47 +0200 Subject: [PATCH] klog 2.30.0, logr 1.2.0, zapr 1.2.0 The new releases fix logging of KObj in JSON output: klog implements the new logr.Marshaler interface and zapr uses it instead of Stringer when logging the ObjectRef created by KObj. Kubernetes-commit: 169e8b65a00b45ef8bbc7a14cd985df1c835953b --- go.mod | 19 ++++++++++--------- go.sum | 17 ++++------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 03141e68..efb025bd 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0-20211022043400-0d109423f7b5 - k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e - k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466 - k8s.io/code-generator v0.0.0-20211022043037-03c63d7042ab - k8s.io/klog/v2 v2.20.0 + 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.30.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20211022043400-0d109423f7b5 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e - k8s.io/client-go => k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211022043037-03c63d7042ab + 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 f8a64982..3d005b7c 100644 --- a/go.sum +++ b/go.sum @@ -86,9 +86,8 @@ 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.0.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.1.0 h1:nAbevmWlS2Ic4m4+/An5NXkaGqlqpbBgdcuThZxnZyI= -github.com/go-logr/logr v1.1.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +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-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,21 +606,13 @@ 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-20211022043400-0d109423f7b5 h1:OR4i+jKzSQRW7o8MoZh0Wa6MnAITjJ9bDSIFoYdWWBY= -k8s.io/api v0.0.0-20211022043400-0d109423f7b5/go.mod h1:lxgi4b+2bgUh27XvISfH38vuHh72U1JW7aximf11zWQ= -k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e h1:NkM0Ub6zH1mP5EYI4e1ID1PrN1aKJZ8C6AvMTag3fl8= -k8s.io/apimachinery v0.0.0-20211022043216-a7973b273a7e/go.mod h1:2IUp7UotDtXUsLByLqAfQHbesreQsxx8loqZwLf6/uw= -k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466 h1:HVDkjmIPnvTiDKIl5+NCCYvdUGvfFfoXc9D+l/fumFE= -k8s.io/client-go v0.0.0-20211022043623-d8ccb0e45466/go.mod h1:RyL7SL68TDoGSPWExfr/7d1vjJOLq3rNCKAi5n3zaN8= -k8s.io/code-generator v0.0.0-20211022043037-03c63d7042ab h1:qN4pjRSSzee+XgP30TfDRZzh+ZzQ1pvY0XteejgqWek= -k8s.io/code-generator v0.0.0-20211022043037-03c63d7042ab/go.mod h1:pxmv1vqS30f8CieYQvITL/Z2lV5G6+/Ze3wRjS3HXFo= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA= 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= -k8s.io/klog/v2 v2.20.0 h1:tlyxlSvd63k7axjhuchckaRJm+a92z5GSOrTOQY5sHw= -k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw= +k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 h1:Xxl9TLJ30BJ1pGWfGZnqbpww2rwOt3RAzbSz+omQGtg= k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=