From 27fce78ed6cb0dd5d707c2c04b43b3cdddd0f948 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 | 15 ++++++++------- go.sum | 10 ++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index d9da64a7..ba74e5b3 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,9 @@ require ( go.opentelemetry.io/otel/trace v0.20.0 go.uber.org/zap v1.19.0 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 - k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 - k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc - k8s.io/klog/v2 v2.70.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/klog/v2 v2.70.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 ) @@ -78,14 +78,15 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect - k8s.io/api v0.0.0-20220630195203-f18d381b8d01 // indirect + k8s.io/api v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) 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/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base ) diff --git a/go.sum b/go.sum index 94cab272..4e98b960 100644 --- a/go.sum +++ b/go.sum @@ -644,15 +644,9 @@ 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-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/client-go v0.0.0-20220630195635-a16e76eb69cc h1:adt+isvukAibGqNS//V4r2SocMAoKSnas6I4EB0YFwE= -k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc/go.mod h1:C5AJ1p6BVK4VtMjr+gCoCNVeaTHRu907PHZM3m9q10k= 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/kube-openapi v0.0.0-20220627174259-011e075b9cb8 h1:yEQKdMCjzAOvGeiTwG4hO/hNVNtDOuUFvMUZ0OlaIzs= k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8/go.mod h1:mbJ+NSUoAhuR14N0S63bPkh8MGVSo3VYSGZtH/mfMe0= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=