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 #102602 from jonesbr17/automated-cherry-pick-of-#102409-upstream-release-1.20 

Automated cherry pick of #102409: Bump golang.org/x/text to v0.3.6

Kubernetes-commit: 4aceb6799141cb2ed8195a6fa6f028e571eec935
This commit is contained in:
Kubernetes Publisher 2021-10-06 05:34:32 -07:00
parent 2fd33c6d87 32521df7d9
commit 8e52c7c3f4
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
go.mod
View File

@ -5,17 +5,17 @@ module k8s.io/kube-controller-manager
go 1.15
require (
k8s.io/apimachinery v0.0.0-20210712061041-1113408b0e37
k8s.io/cloud-provider v0.0.0-20210729030616-61e151eb13ef
k8s.io/controller-manager v0.0.0-20210729030438-65a100e47734
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
k8s.io/cloud-provider v0.0.0-20211006172508-290dddd524e1
k8s.io/controller-manager v0.0.0-20211006172328-df02d223fb8f
)
replace (
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-20210729023828-67b01460fa87
k8s.io/client-go => k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210729030616-61e151eb13ef
k8s.io/component-base => k8s.io/component-base v0.0.0-20210712064538-64ffc3181e22
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210729030438-65a100e47734
k8s.io/api => k8s.io/api v0.0.0-20211006163548-14384843a070
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211006165617-789b58d69fa7
k8s.io/client-go => k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211006172508-290dddd524e1
k8s.io/component-base => k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211006172328-df02d223fb8f
)

28
go.sum
View File

@ -453,8 +453,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -586,18 +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-20210729023828-67b01460fa87/go.mod h1:1La0rB3IVijrwHwZQUhmnYigC/R3AFu9PCyZxAoZDEM=
k8s.io/client-go v0.0.0-20210712063100-235fdccdc92a/go.mod h1:Yxt2oTRRTtVUH3dLHRdYyl/dMP83rJyeSw3U4ktSkc0=
k8s.io/cloud-provider v0.0.0-20210729030616-61e151eb13ef h1:wARFGPdmcDs8lQPSBdCfRyCqbucIQ64LIIZvLUeT4hU=
k8s.io/cloud-provider v0.0.0-20210729030616-61e151eb13ef/go.mod h1:zUEj6z20TV3sgEzfkrXGaQn0rUd7ZRygWTQN7cu8P/o=
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-20210729030438-65a100e47734 h1:aAHM+LgkS3Z/XOMVrJNlhCxQMz6bTABaVGnkOydE8MQ=
k8s.io/controller-manager v0.0.0-20210729030438-65a100e47734/go.mod h1:Shkja4Rr5qIE+N3szzTnrxCPP5Q94Smu8LWAivo1akA=
k8s.io/api v0.0.0-20211006163548-14384843a070 h1:PrGxR6a22mtoEErqSzyltsRxQageCzbVz8mteNEPMZo=
k8s.io/api v0.0.0-20211006163548-14384843a070/go.mod h1:gHOy/bdYum9Xwc8Ku9HoIGlC1tK+Ca3mlbXyeZ2/m/g=
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71 h1:eyFEspMIgGSOTKwfII+oBcWX9gXJ6uXkNeeyymDHYRI=
k8s.io/apimachinery v0.0.0-20211006163247-43d03ae97b71/go.mod h1:uM7hCI0NyBymUwgshMgZyte475lxhr+QH6h3cvdnzEc=
k8s.io/apiserver v0.0.0-20211006165617-789b58d69fa7/go.mod h1:WR7/iKT4S5YF9VtvrE+lZwYeBiMOJ53bR9yIMdGOe8Y=
k8s.io/client-go v0.0.0-20211006163948-3fc097df6b87/go.mod h1:fFi+f8HlL6qZD1lkepeJAf+COWsznTlc6FanXk8VWw4=
k8s.io/cloud-provider v0.0.0-20211006172508-290dddd524e1 h1:RdPxp9AAzf8lTWqXtakW2yZDAvgc2YVWHYrhumjzN+0=
k8s.io/cloud-provider v0.0.0-20211006172508-290dddd524e1/go.mod h1:4oU8MI9/u7vS3R5PjrFAo+/VmFUmDkbEMbSks3MY5HU=
k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062 h1:TGn6A7j7u7KNM1FKo4IumJXxPoiK3GUdz4CHPfB0gmk=
k8s.io/component-base v0.0.0-20211006165103-7d13e2a0e062/go.mod h1:5HjuZhcUqTEgu0RbviT4QN+MFnT8hbITUF7FsgDfOOc=
k8s.io/controller-manager v0.0.0-20211006172328-df02d223fb8f h1:8CWHR/sPDfshKMzPMwMx0x5aPBjw6l5pVWMZcKTZhdU=
k8s.io/controller-manager v0.0.0-20211006172328-df02d223fb8f/go.mod h1:ySy0GHk9rvqz5iu6St7Wwq3nocxhy2uLCaqY46c1ZjI=
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=