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 #103320 from jpbetz/fix-102749-1.20 

Manual cherry pick of #103318: Bump SMD to v4.1.2 to pick up #102749 fix

Kubernetes-commit: 86c8e960eeabd346a92457973d41abd865eccb5f
This commit is contained in:
Kubernetes Publisher 2021-07-09 12:24:54 -07:00
parent 8d9665fcc6
commit bf8488ea34
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
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-20210712061041-1113408b0e37
k8s.io/cloud-provider v0.0.0-20210712080450-6e3a1ba6a0d3
k8s.io/controller-manager v0.0.0-20210712080023-fdb37e233f67
)
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-20210712061735-c542627fda65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210712065938-75eaee9bfd05
k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210712080450-6e3a1ba6a0d3
k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210712080023-fdb37e233f67
)

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.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-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-20210712065938-75eaee9bfd05/go.mod h1:seci6/iYBM7m4VsFzLIPsnTj1elGDHKdzWJ8pvDMOqQ=
k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a/go.mod h1:Yxt2oTRRTtVUH3dLHRdYyl/dMP83rJyeSw3U4ktSkc0=
k8s.io/cloud-provider v0.0.0-20210712080450-6e3a1ba6a0d3 h1:3P5JJeydJbBsA/Zug0g7FyIhie7Nuo5bk2Dil9ErX+8=
k8s.io/cloud-provider v0.0.0-20210712080450-6e3a1ba6a0d3/go.mod h1:irm8LhtHH9umIWvd+MKKXJ7taVYwVilq/w5GmcSBZO4=
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-20210712080023-fdb37e233f67 h1:qKJtFw8X5vOkBLfSnw6Cw1ywqbefiuzKDMtA4Bt43AA=
k8s.io/controller-manager v0.0.0-20210712080023-fdb37e233f67/go.mod h1:WpJe9fmPOo7LQdT3wWuIFapul7VWw7KlMDUcAC9BGzo=
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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=