From ae55fd72b01f6c0c534fb29ea07975352afe0af2 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 7 Jul 2022 12:54:08 +0200 Subject: [PATCH] build: update to klog v2.70.1 This makes ktesting more resilient against logging from leaked goroutines, which is a problem that came up in kubelet node shutdown tests (https://github.com/kubernetes/kubernetes/issues/110854). Kubernetes-commit: 3581e308835c69b11b2c9437db44073129e0e2bf --- go.mod | 17 +++++++++-------- go.sum | 10 ++-------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index c83d59e..01c6df1 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/gogo/protobuf v1.3.2 golang.org/x/net v0.0.0-20220225172249-27dd8689420f google.golang.org/grpc v1.47.0 - k8s.io/api v0.0.0-20220630195203-f18d381b8d01 - k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 - k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) require ( @@ -30,7 +30,7 @@ require ( google.golang.org/protobuf v1.27.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/klog/v2 v2.70.0 // indirect + k8s.io/klog/v2 v2.70.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect @@ -38,8 +38,9 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220630195203-f18d381b8d01 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc - k8s.io/component-base => k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26 + 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 1ce3dfb..6a7603a 100644 --- a/go.sum +++ b/go.sum @@ -195,15 +195,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= 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-20220630195203-f18d381b8d01 h1:lsctqpUULMfNVvYZM+wge9s20nTyR4RO3TIWuLo845E= -k8s.io/api v0.0.0-20220630195203-f18d381b8d01/go.mod h1:8xLknj7VYyQxjY6zTjssvX0nZGgprHTz/PCRvwsupmQ= -k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 h1:iPALyE8SMNRKOKR4sLdS7o3H01SB+wwuOdQH4EJ0kSg= -k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48/go.mod h1:vKWzUhIiF0QCkg/XOm3IS9daPl07j7FOqnNdmmHazTw= -k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26 h1:fYwD9VieQYTxtAVxqD2Gk82d1sldemp4ZAj8v3anyBg= -k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26/go.mod h1:xqOiWYqGbF6U3lnib82r7/iVyhrlQgXbs5nGi50w0p8= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=