From e6114e99075f725edc5161c8852295bd9a3e33c6 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 | 9 ++++++--- go.sum | 6 ++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 9e8e034278..e2288e6779 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ go 1.19 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.7.0 - k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 + k8s.io/apimachinery v0.0.0 ) require ( @@ -27,11 +27,14 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.80.0 // indirect + k8s.io/klog/v2 v2.80.1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) -replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220902183049-31bc292891b6 +replace ( + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery +) diff --git a/go.sum b/go.sum index afd4654bc2..72523df9c9 100644 --- a/go.sum +++ b/go.sum @@ -81,11 +81,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -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/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/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=