kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103702 from cheftako/automated-cherry-pick-of-#103126-upstream-release-1.20 

Updated to use konnectivity client v0.0.20, and implemented placeholder context

Kubernetes-commit: 26edf32cbd936b283f0c50bef86e6f1c9eb48769
This commit is contained in:
Kubernetes Publisher 2021-07-22 15:43:16 -07:00
parent 964f97761d
commit a25a95ae4f
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.15 go 1.15
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20210723033813-e9024237db80
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20210723033531-64be014452da
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210712061735-c542627fda65
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210723025239-d3d0d24cf979
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210723033813-e9024237db80
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210723033531-64be014452da
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

12
go.sum
View File

@ -586,6 +586,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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210712061735-c542627fda65 h1:hNU7BYfSkjgg4e6RiDnAcmCB0oowEB4KNUuAAYczqZQ=
k8s.io/api v0.0.0-20210712061735-c542627fda65/go.mod h1:46MConCeKv5gXizJs2U/jhw5xCH0WBWbqGc5j5fAnaM=
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37 h1:rz55eMOF7F/F4281jjtEB75DcQXeCPgjrNJPfcH9Yzc=
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37/go.mod h1:kQa//VOAwyVwJ2+L9kOREbsnryfsGSkSM1przND4+mw=
k8s.io/apiserver v0.0.0-20210723025239-d3d0d24cf979/go.mod h1:4rylaMfCZ5AM5RPMrggjVBre2hg0QvKUEnFzfLKrxk0=
k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a/go.mod h1:Yxt2oTRRTtVUH3dLHRdYyl/dMP83rJyeSw3U4ktSkc0=
k8s.io/cloud-provider v0.0.0-20210723033813-e9024237db80 h1:3KxFbHHdbeDtHgLm5Ak/cOFFuKJXyUzWqOAqvCJL7Lg=
k8s.io/cloud-provider v0.0.0-20210723033813-e9024237db80/go.mod h1:0Ecv/t1bYQpMzWjrQ9bcJc+WrzAt/OXuDY4sVacksUc=
k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22 h1:UGpIEjQ1Ng49Dr2d7ks5cP/VgX9WteIEvvSuT7Uf6T0=
k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22/go.mod h1:qcPTmKgs9wUVYSofT018hFmsYSUUmEVdIGePJMcspPM=
k8s.io/controller-manager v0.0.0-20210723033531-64be014452da h1:x7h0O/gSQ+WKPI7lhw0genKUnJkvKZV06o1u16+RFMA=
k8s.io/controller-manager v0.0.0-20210723033531-64be014452da/go.mod h1:SNWSSheiEwqINoU/6FwibszGd1MclT/bExqS7OA1GTA=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=