From 71f248492a81bfcc4e36d7e41b78bb2c9d2c1a82 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 9 Jul 2021 14:38:54 -0700 Subject: [PATCH] Merge pull request #103319 from jpbetz/fix-102749-1.21 Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: c17d7c574149af1619dc8edd9c48a41dc07695e8 --- go.mod | 21 ++++++++++----------- go.sum | 12 ++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 2405d3d..71f308b 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager go 1.16 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8 + k8s.io/cloud-provider v0.0.0-20210712080534-9680a2fb3a13 + k8s.io/controller-manager v0.0.0-20210712080058-d7fa15afd983 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/component-base => ../component-base - k8s.io/controller-manager => ../controller-manager - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20210712061851-e7183502f6db + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f + k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210712080534-9680a2fb3a13 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064623-3889627966a2 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210712080058-d7fa15afd983 ) diff --git a/go.sum b/go.sum index 43b284c..f831979 100644 --- a/go.sum +++ b/go.sum @@ -595,6 +595,18 @@ 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-20210712061851-e7183502f6db h1:24QxDYhEfdh+XCGIhv16ciVMeE/xE9fOh71LE/YlCTc= +k8s.io/api v0.0.0-20210712061851-e7183502f6db/go.mod h1:/+YgqSJs7JFYq7KD73gQIBmg22nIhE35kwb2jhrVYnA= +k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8 h1:1OmwvcyF2eOmfatOSyhLzDgk+oq+TuO7w0iQIQA53AY= +k8s.io/apimachinery v0.0.0-20210712061153-f916759cb6b8/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= +k8s.io/apiserver v0.0.0-20210712070218-70ee56d27a6f/go.mod h1:7wCuJu4Nr8wuXjMvWtQGikJic9G0qWAmd53GMg5SECU= +k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e/go.mod h1:deZddpbEnssEoTj+691wut0R5QED4V7yW9lad1s/VU8= +k8s.io/cloud-provider v0.0.0-20210712080534-9680a2fb3a13 h1:PXGxGRV83uA/A4DCaa4X61mduQJFh9McaFIYhulQaJs= +k8s.io/cloud-provider v0.0.0-20210712080534-9680a2fb3a13/go.mod h1:9BOgHY1DZXEm9am/xml49y75mb1NWlJ4VaIe68j5j+E= +k8s.io/component-base v0.0.0-20210712064623-3889627966a2 h1:mwTR65Fu3Oq3hcHiecu3boHEO8IRtbCHXUctJsRdpnE= +k8s.io/component-base v0.0.0-20210712064623-3889627966a2/go.mod h1:9U5+ZgrnmsBuUQUXzkhT1mYyLLqakRRJBCIeFZ5r6rI= +k8s.io/controller-manager v0.0.0-20210712080058-d7fa15afd983 h1:YNO4e3xeky96EXU0FbUZ7xhH/Ic9WzqzkLCRtxcE/Fo= +k8s.io/controller-manager v0.0.0-20210712080058-d7fa15afd983/go.mod h1:Seb62wQO9VQ/Os8GAzVy9fK3BYVmtgh49BpULla87DU= 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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=