From f07f584e4c4076b259baa55b3214210f6f3beee1 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 30 Jun 2021 14:03:03 -0700 Subject: [PATCH] Merge pull request #103318 from jpbetz/fix-102749 Bump SMD to v4.1.2 to pick up #102749 fix Kubernetes-commit: 0dad7d1c47c41f232b21cdd5c21be6683e545e9d --- go.mod | 21 ++++++++++----------- go.sum | 12 ++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 2405d3d..4852e83 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-20210630214150-3272933c38f1 + k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 + k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 ) 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-20210630214335-e14d3f91c1fb + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210630215546-6490793cbf59 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 + k8s.io/component-base => k8s.io/component-base v0.0.0-20210630215151-284cd21cb037 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 ) diff --git a/go.sum b/go.sum index 17ba997..fdb0ad2 100644 --- a/go.sum +++ b/go.sum @@ -678,6 +678,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-20210630214335-e14d3f91c1fb h1:5gLwTuhudEs0MG9K6WSBu+ZU20B/S14sP0LSH8Vvhpk= +k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb/go.mod h1:QUF4odb7cdl7zfuvctTckDbkEtvkCYAh3dFFz2L9tKM= +k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1 h1:7OgDmfxP0iHGe53HMiXFEPPju/kG6nQG8ygS3teYDsI= +k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1/go.mod h1:nl5vA2gQ1rZlqYe97ozT8wfbPFvI1zFQ1kilS6u/8Ks= +k8s.io/apiserver v0.0.0-20210630215546-6490793cbf59/go.mod h1:rjmm2kdcbhugL7jJZyjMb4Y9I8fwWoCEtPK/KJCKE7o= +k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1/go.mod h1:y7pYxLEebfazKsc0Y4PfxgDxDGKL3ICTTL53cr55ay8= +k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 h1:WWuONTmp1CTBFTqttaEY2saBm8jt61aEREH5n1skQOQ= +k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9/go.mod h1:5y/2nih2RpfXypwDGqtA6LBQh+UPW6ILGyDOdw8Ic8Y= +k8s.io/component-base v0.0.0-20210630215151-284cd21cb037 h1:WyX8Vx493iNqK8fbvH2OLotuD14nub2/v7GC3HTvvHY= +k8s.io/component-base v0.0.0-20210630215151-284cd21cb037/go.mod h1:3WGDFbwm/gsCYsIHucVkTm/+nQakZ/zfRYIGKbACVC8= +k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 h1:Py2/4T6xCMdx51GJXi2C3Gu8vo9+EAO/e3M1ZUH7QvE= +k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747/go.mod h1:ILnWxRXYWQEico+NWZzYjiTexWZv/7/GFuKgxLAI578= 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=