Merge pull request #92219 from voor/update-golang-text

[security] Vulnerability in golang.org/x/text/encoding/unicode v0.3.2

Kubernetes-commit: 08ab50d1a870d12044081f58c6f9fa18b989597f
This commit is contained in:
Kubernetes Publisher 2020-06-19 11:37:34 -07:00
parent 1f9c16310a
commit 20c9e35af5
3 changed files with 15 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -464,7 +464,7 @@
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "v0.3.2" "Rev": "v0.3.3"
}, },
{ {
"ImportPath": "golang.org/x/time", "ImportPath": "golang.org/x/time",
@ -540,19 +540,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "8dc28b782f8e" "Rev": "fd326d3007d3"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "c1bd2c2a276f" "Rev": "2d992b89ee69"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "3c831c893e8a" "Rev": "58357f96bf43"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "6c60a4d2ed11" "Rev": "5cd58fa2c139"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13 go 1.13
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200619211815-2d992b89ee69
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20200619212909-5cd58fa2c139
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20200619212010-fd326d3007d3
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200619211815-2d992b89ee69
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20200619212250-58357f96bf43
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20200619212909-5cd58fa2c139
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

4
go.sum
View File

@ -302,6 +302,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/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.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=
k8s.io/api v0.0.0-20200619212010-fd326d3007d3/go.mod h1:ZABjG3iJlkyRBRLgm8C9YMUfxRTxkqde+hKrHyLy8T8=
k8s.io/apimachinery v0.0.0-20200619211815-2d992b89ee69/go.mod h1:PEdH+SOrD19FEfB7ciLjjkHmv6vOtf8ABeo3JqletDo=
k8s.io/client-go v0.0.0-20200619212250-58357f96bf43/go.mod h1:H8iLD98YoTsJUXPpZVY5vnXKhO1imt79gFahNFoQjrc=
k8s.io/component-base v0.0.0-20200619212909-5cd58fa2c139/go.mod h1:s1DiWY4TsH6Tk0UnOVqWuyw43g1z7UZO1fXNexmKHkc=
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 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=