From 26b506437f0b14d146f2a11d41f6968354c59ef5 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 | 11 ++++++----- go.sum | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index e591030743..e6d58add2d 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,9 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.27.1 - k8s.io/api v0.0.0-20220707013944-8488949db193 - k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 - k8s.io/klog/v2 v2.70.0 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/structured-merge-diff/v4 v4.2.1 @@ -61,6 +61,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220707013944-8488949db193 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 0ad66768f5..d2d693164c 100644 --- a/go.sum +++ b/go.sum @@ -479,13 +479,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-20220707013944-8488949db193 h1:AZdiWBEb9JlpKwf+0hABjSRDfGNm1pmOXTthS6DDbWg= -k8s.io/api v0.0.0-20220707013944-8488949db193/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/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=