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
parent c5433de92c
commit c86096c6f9
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -440,19 +440,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "70c9750ce4ed"
"Rev": "02047b7ecbbf"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "8a773a02ba6b"
"Rev": "106aebdc1c0a"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bdcd046d6cbf"
"Rev": "5ab99756f65d"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "29a41fee4a12"
"Rev": "850155609be4"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200709130931-02047b7ecbbf
k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
k8s.io/client-go v0.0.0-20200709131500-5ab99756f65d
k8s.io/code-generator v0.0.0-20200709130115-850155609be4
k8s.io/klog/v2 v2.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20200709130931-02047b7ecbbf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
k8s.io/client-go => k8s.io/client-go v0.0.0-20200709131500-5ab99756f65d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200709130115-850155609be4
)

4
go.sum
View File

@ -345,6 +345,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-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-20200709130931-02047b7ecbbf/go.mod h1:lt1s4IKF4+kDlOlxxSmcNyf8j64o27uSvvnZ8BcI0FQ=
k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU=
k8s.io/client-go v0.0.0-20200709131500-5ab99756f65d/go.mod h1:FtCso/qJj5wuFWDAKCISjGDjJHrTHf7nwTkERLsat8k=
k8s.io/code-generator v0.0.0-20200709130115-850155609be4/go.mod h1:9w314dZncjv/zcv1Qvm7eXiAW3bh6BgMUrhZSSpdMgM=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=