From 87b136706cd3ab334c166b42face4f944e2e6f1d Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 9 Sep 2022 13:11:55 +0200 Subject: [PATCH] build: update to klog v2.80.1 The fix for https://github.com/kubernetes/klog/issues/348 is required before https://github.com/kubernetes/kubernetes/pull/111998 can be merged because the way how a unit test in that PR uses klog triggers the data race. Kubernetes-commit: 60d92dd96a4ba3873dd9e061c3e332c16c213e30 --- go.mod | 15 ++++++++------- go.sum | 10 ++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 9c797fa..b957578 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,10 @@ go 1.19 require ( github.com/google/go-cmp v0.5.8 - k8s.io/api v0.0.0-20220902183307-6dd661f59220 - k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 - k8s.io/client-go v0.0.0-20220902183624-b8b620636cbb - k8s.io/klog/v2 v2.80.0 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed ) @@ -52,7 +52,8 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220902183307-6dd661f59220 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220902183624-b8b620636cbb + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-helpers => ../component-helpers ) diff --git a/go.sum b/go.sum index 3d0ae6b..0349377 100644 --- a/go.sum +++ b/go.sum @@ -461,15 +461,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-20220902183307-6dd661f59220 h1:b+NdHWOhLTKviv3QHZvUrs1+6n9W03D7u6Sjd71RkEA= -k8s.io/api v0.0.0-20220902183307-6dd661f59220/go.mod h1:79dXRhEG/Q3WjCgZ7l8YtD1tVlH/shHuG6msPmRw/DQ= -k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 h1:BH5hWQ9ueHKgA42ApyJ9RXSibEUHvd9TDr1RBZ6e7lE= -k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6/go.mod h1:L+XGzqdcOht8VoBmzPAoKcYLqUOWkB5nxGF/6z4/ubo= -k8s.io/client-go v0.0.0-20220902183624-b8b620636cbb h1:N76sNHMfkl7Ra/T4Jtv2rW0FsBxRQvxbs5iL43bviPQ= -k8s.io/client-go v0.0.0-20220902183624-b8b620636cbb/go.mod h1:x0u4dsmdtq/VgDJFLu+jsd5yaEJqRyJOzMUhTBjxYuo= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.80.0 h1:lyJt0TWMPaGoODa8B8bUuxgHS3W/m/bNr2cca3brA/g= -k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=