From 60cd5cbc0179d91c1b2d3c0aa8bd08b5e2f28f80 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 24 Feb 2022 12:40:13 -0800 Subject: [PATCH] Merge pull request #108335 from rphillips/backport/107637 [release-1.21] backports k/utils bump (PR#107637) to 1.21 Kubernetes-commit: 9947659f9f39cc847cf9780ae8935686be01016b --- go.mod | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6aeee066f..eb9e1b167 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20220222193518-ee3732ac1699 + k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 k8s.io/klog/v2 v2.9.0 k8s.io/utils v0.0.0-20211116205334-6203023598ed sigs.k8s.io/structured-merge-diff/v4 v4.2.1 @@ -36,7 +36,6 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20220222193518-ee3732ac1699 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 ) diff --git a/go.sum b/go.sum index c9d4dec9e..7bbf6b084 100644 --- a/go.sum +++ b/go.sum @@ -417,6 +417,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= +k8s.io/api v0.0.0-20220222193518-ee3732ac1699 h1:GOWuLWNnzmQtVqjbIMsV1rx26TvIz4M90M5qB9dt9fU= +k8s.io/api v0.0.0-20220222193518-ee3732ac1699/go.mod h1:1rXHa5F5YY7BxmZm5XoXjqq5GH54ggnxTlrxLwHlhU4= +k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 h1:mf2T8QRJGaH7h0qKnSq22AW9lUrPhWZoFILJQHjo/y8= +k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=