Merge pull request #102409 from dims/bump-golang.org/x/text-to-v0.3.6

Bump golang.org/x/text to v0.3.6

Kubernetes-commit: e0cb30170415cc122226360f722126930b451f88
This commit is contained in:
Kubernetes Publisher 2021-06-01 09:29:26 -07:00
parent afa931bdd2
commit e6a61ec109
3 changed files with 30 additions and 19 deletions

16
Godeps/Godeps.json generated
View File

@ -828,7 +828,7 @@
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "v0.3.4" "Rev": "v0.3.6"
}, },
{ {
"ImportPath": "golang.org/x/time", "ImportPath": "golang.org/x/time",
@ -924,31 +924,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "c1965f366614" "Rev": "0b55fc9ab6bb"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "44113beed5d3" "Rev": "1e82f3b632c6"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "a51432467630" "Rev": "35fc33c4e799"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "fe090a55f17e" "Rev": "caa2ddeb897a"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "f455a1849f71" "Rev": "b910d8ca7287"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "fd43e6f3a496" "Rev": "4ceecfef9988"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "981411fb3f9c" "Rev": "bb06bcfab1f9"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20210601201429-b910d8ca7287
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20210601201321-bb06bcfab1f9
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210601195800-35fc33c4e799
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210601201429-b910d8ca7287
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210601201321-bb06bcfab1f9
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

12
go.sum
View File

@ -608,6 +608,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-20210601194609-0b55fc9ab6bb h1:bjPb0/AjLmHbYb+sYorOHImcVSqA+dMsHqYjPbfBmNQ=
k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb/go.mod h1:G/aFk75uPvZtPzIzRb9OjwlDQCp9fVTsMnh1+PICcQc=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRKnexm0pPua15G2Aos6hFeg=
k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c=
k8s.io/apiserver v0.0.0-20210601195800-35fc33c4e799/go.mod h1:bHFA862iC1XaiOjwXrKHAOqagCrwNI/yFmJh65CLRCg=
k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10=
k8s.io/cloud-provider v0.0.0-20210601201429-b910d8ca7287 h1:BbgaBW4zyRFQhbgKvNZa+gqhVSvl6YE9tVeHkPD5nls=
k8s.io/cloud-provider v0.0.0-20210601201429-b910d8ca7287/go.mod h1:0Mf95MSfQNwFmncpNmyyYbhaZ2ZeYbbnXGgR8y/93hU=
k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988 h1:KJ6MfMyZ9VqEhcLiFKVyBjNPY9QgcjYI6ZRdvm/Ek6s=
k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988/go.mod h1:2WZUc89fIx0SVZdEMOAk/C4nCWsz60y9ttdZpgxuEfU=
k8s.io/controller-manager v0.0.0-20210601201321-bb06bcfab1f9 h1:gG/+YfEcT+CwVQr9UrSaKnZtxn7iyBjiuCIziGsyXZo=
k8s.io/controller-manager v0.0.0-20210601201321-bb06bcfab1f9/go.mod h1:SX7xi4f1gfxNEsK//ZMCj+C8dnC84gyzsyVkoBYVrR4=
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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=