From a1f6f50fa653a11224289d6567cb2eb1f39d6b7a 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 | 17 +++++++++-------- go.sum | 9 ++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 21a0b28..08aa7ee 100644 --- a/go.mod +++ b/go.mod @@ -8,13 +8,13 @@ require ( github.com/gogo/protobuf v1.3.2 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd google.golang.org/grpc v1.44.0 - k8s.io/api v0.0.0-20220505102950-a2ee8c7e6bdc - k8s.io/apimachinery v0.0.0-20220505102722-5f6d692e6a78 - k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) require ( - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.5 // indirect github.com/google/gofuzz v1.1.0 // indirect @@ -36,8 +36,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/component-base => k8s.io/component-base v0.0.0-20220505103914-99e6e4beb802 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kubelet => ../kubelet ) diff --git a/go.sum b/go.sum index 79aaf0d..496227a 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,9 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -183,12 +184,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -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/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/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=