Merge pull request #92611 from liggitt/go1.13

Tolerate go 1.13 builds

Kubernetes-commit: 896da2253c77d15fc551843e515039c6e9c86c99
This commit is contained in:
Kubernetes Publisher 2020-07-09 00:05:50 -07:00
commit 5ab99756f6
3 changed files with 9 additions and 9 deletions

4
Godeps/Godeps.json generated
View File

@ -440,11 +440,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "984543161440"
"Rev": "02047b7ecbbf"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "3c2682fedbf2"
"Rev": "106aebdc1c0a"
},
{
"ImportPath": "k8s.io/gengo",

10
go.mod
View File

@ -2,7 +2,7 @@
module k8s.io/client-go
go 1.14
go 1.13
require (
cloud.google.com/go v0.51.0 // indirect
@ -26,14 +26,14 @@ 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-20200709130929-984543161440
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/api v0.0.0-20200709130931-02047b7ecbbf
k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
k8s.io/klog/v2 v2.2.0
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20200709130929-984543161440
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/api => k8s.io/api v0.0.0-20200709130931-02047b7ecbbf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
)

4
go.sum
View File

@ -332,8 +332,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-20200709130929-984543161440/go.mod h1:PFJ2b4cud2iXU+DzN8Tf+HsJsN2KKcJUfbMmckp2bhI=
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2/go.mod h1:87+lSRzC+mGLZTTwIcPY67sorIVlqPhdNrvsToaUUns=
k8s.io/api v0.0.0-20200709130931-02047b7ecbbf/go.mod h1:lt1s4IKF4+kDlOlxxSmcNyf8j64o27uSvvnZ8BcI0FQ=
k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU=
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=