Merge pull request #103699 from cheftako/automated-cherry-pick-of-#103126-upstream-release-1.21

Automated cherry pick of #103126 upstream release 1.21: Updated to use konnectivity client v0.0.21, and implemented placehold…

Kubernetes-commit: a74b4554e4dd50cb0d3a1aca5cef1547f639a3c8
This commit is contained in:
Kubernetes Publisher 2021-07-22 15:37:18 -07:00
parent f030f2a3e7
commit b77c3e3d4c
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -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-20210723033856-fd43c1f6fbe7
k8s.io/controller-manager v0.0.0-20210723033605-2e11b833829b
)
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-20210723025504-52bc967a4477
k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210723033856-fd43c1f6fbe7
k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064623-3889627966a2
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210723033605-2e11b833829b
)

12
go.sum
View File

@ -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-20210723025504-52bc967a4477/go.mod h1:S2hTrFzY1TLAdi1FD6SrDQoCvEz2K//BxxgqYM+QBA8=
k8s.io/client-go v0.0.0-20210712063639-fefd2ad85b0e/go.mod h1:deZddpbEnssEoTj+691wut0R5QED4V7yW9lad1s/VU8=
k8s.io/cloud-provider v0.0.0-20210723033856-fd43c1f6fbe7 h1:/oSEQjN8bxm6/fbo5RTp4cDUQ3QVykok9xK+C5u2n14=
k8s.io/cloud-provider v0.0.0-20210723033856-fd43c1f6fbe7/go.mod h1:QS9+b25bxBESkcOiJ6gip7YdQCDwC7Yqs6jFXsA9IDQ=
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-20210723033605-2e11b833829b h1:aN1s3WrOS+rRpl0m5yaKDcZGq/Rr84no/UoEiwCQGR0=
k8s.io/controller-manager v0.0.0-20210723033605-2e11b833829b/go.mod h1:m3hgWpASwKSeKyoMzJaM/n53dVx7uQA6veG05M8GZuQ=
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=