Merge pull request #92438 from liggitt/1.14

go1.14 fixup

Kubernetes-commit: 4de511a4cfdb8e49e804be18245911bf3270fb2f
This commit is contained in:
Kubernetes Publisher 2020-06-23 18:21:18 -07:00
parent ead3ce5ade
commit 5fade4ec57
3 changed files with 11 additions and 10 deletions

10
Godeps/Godeps.json generated
View File

@ -356,7 +356,7 @@
},
{
"ImportPath": "golang.org/x/mod",
"Rev": "v0.1.0"
"Rev": "c90efee705ee"
},
{
"ImportPath": "golang.org/x/net",
@ -372,7 +372,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "fde4db37ae7a"
"Rev": "915c9c3d4ccf"
},
{
"ImportPath": "golang.org/x/text",
@ -384,7 +384,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "65e3620a7ae7"
"Rev": "7b8e75db28f4"
},
{
"ImportPath": "golang.org/x/xerrors",
@ -440,11 +440,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "fd326d3007d3"
"Rev": "6f8e0fa87f2f"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2d992b89ee69"
"Rev": "eed6a5257d68"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -26,8 +26,8 @@ require (
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20200624085548-6f8e0fa87f2f
k8s.io/apimachinery v0.0.0-20200624084815-eed6a5257d68
k8s.io/klog/v2 v2.1.0
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
sigs.k8s.io/yaml v1.2.0
@ -35,7 +35,6 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20200201011859-915c9c3d4ccf // pinned to release-branch.go1.14-std
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20200624085548-6f8e0fa87f2f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200624084815-eed6a5257d68
)

2
go.sum
View File

@ -310,6 +310,8 @@ 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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200624085548-6f8e0fa87f2f/go.mod h1:0NI05lw6YVHu83nOP2Ayou4el+63LIYkL/anfX/Xgeg=
k8s.io/apimachinery v0.0.0-20200624084815-eed6a5257d68/go.mod h1:FzS272GL9jln/XO9XVCgkNL+ufOU3vbiON3UVVLEc3k=
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/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=