From c791cdac0aa7b6f8717dbd510c5dc82560f70069 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 | 27 ++++++++++++++------------- go.sum | 16 ++-------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 092686bc6..00e64640f 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ go 1.18 require ( github.com/google/gofuzz v1.1.0 github.com/spf13/cobra v1.4.0 - k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 - k8s.io/apiserver v0.0.0-20220630201059-472a3106c94f - k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc - k8s.io/code-generator v0.0.0-20220630194553-132cd9fb8581 - k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 ) @@ -93,9 +93,9 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.0.0-20220630195203-f18d381b8d01 // indirect + k8s.io/api v0.0.0 // indirect k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect - k8s.io/klog/v2 v2.70.0 // indirect + k8s.io/klog/v2 v2.70.1 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect @@ -103,10 +103,11 @@ 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/apiserver => k8s.io/apiserver v0.0.0-20220630201059-472a3106c94f - k8s.io/client-go => k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220630194553-132cd9fb8581 - k8s.io/component-base => k8s.io/component-base v0.0.0-20220630200448-4e01862a4d26 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/sample-apiserver => ../sample-apiserver ) diff --git a/go.sum b/go.sum index a00112ca5..b94bd2cb3 100644 --- a/go.sum +++ b/go.sum @@ -692,24 +692,12 @@ 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/apiserver v0.0.0-20220630201059-472a3106c94f h1:gh1nygtQvgtlMlnFDKzK+ueGJw+QWOEWEoVwgFV7BAg= -k8s.io/apiserver v0.0.0-20220630201059-472a3106c94f/go.mod h1:9OdSzJmxjYuQ2Nvs+lGKIHB432d6FxO26pDwqzKqdc0= -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/code-generator v0.0.0-20220630194553-132cd9fb8581 h1:bJOY7exk5o7lvkr/GxlgfapLnwX268WkwX0NVfPod/Y= -k8s.io/code-generator v0.0.0-20220630194553-132cd9fb8581/go.mod h1:oMC0boNjigJE5i5j6lb4CitTIJlBEu/3RHOMvP/0Jss= -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/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/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.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=