Merge pull request #85019 from liggitt/go-1.13-1.16

[v1.16.5] Update to go1.13.4

Kubernetes-commit: 74eb9f2b701ab3e8baaab5d34f151e82500918d2
This commit is contained in:
Kubernetes Publisher 2019-12-19 00:05:59 -08:00
parent 746907b08d
commit 6e4eb60e6d
3 changed files with 36 additions and 29 deletions

44
Godeps/Godeps.json generated
View File

@ -96,7 +96,7 @@
},
{
"ImportPath": "github.com/go-openapi/jsonpointer",
"Rev": "v0.19.2"
"Rev": "v0.19.3"
},
{
"ImportPath": "github.com/go-openapi/jsonreference",
@ -108,7 +108,7 @@
},
{
"ImportPath": "github.com/go-openapi/swag",
"Rev": "v0.19.2"
"Rev": "v0.19.5"
},
{
"ImportPath": "github.com/gogo/protobuf",
@ -168,7 +168,7 @@
},
{
"ImportPath": "github.com/gregjones/httpcache",
"Rev": "787624de3eb7"
"Rev": "9cad4c3443a7"
},
{
"ImportPath": "github.com/hashicorp/golang-lru",
@ -212,7 +212,7 @@
},
{
"ImportPath": "github.com/mailru/easyjson",
"Rev": "94de47d64c63"
"Rev": "b2ccc519800e"
},
{
"ImportPath": "github.com/modern-go/concurrent",
@ -256,7 +256,7 @@
},
{
"ImportPath": "github.com/spf13/pflag",
"Rev": "v1.0.3"
"Rev": "v1.0.5"
},
{
"ImportPath": "github.com/stretchr/objx",
@ -272,7 +272,7 @@
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "e84da0312774"
"Rev": "60c769a6c586"
},
{
"ImportPath": "golang.org/x/exp",
@ -284,7 +284,7 @@
},
{
"ImportPath": "golang.org/x/lint",
"Rev": "8f45f776aaf1"
"Rev": "5614ed5bae6f"
},
{
"ImportPath": "golang.org/x/mobile",
@ -292,31 +292,35 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "cdfb69ac37fc"
"Rev": "13f9640d40b9"
},
{
"ImportPath": "golang.org/x/oauth2",
"Rev": "9f3314589c9a"
"Rev": "0f29369cfe45"
},
{
"ImportPath": "golang.org/x/sync",
"Rev": "42b317875d0f"
"Rev": "112230192c58"
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "3b5209105503"
"Rev": "fde4db37ae7a"
},
{
"ImportPath": "golang.org/x/text",
"Rev": "e6919f6577db"
"Rev": "v0.3.2"
},
{
"ImportPath": "golang.org/x/time",
"Rev": "f51c12702a4d"
"Rev": "9d24e82272b4"
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "6e04913cbbac"
"Rev": "65e3620a7ae7"
},
{
"ImportPath": "golang.org/x/xerrors",
"Rev": "a985d3407aa7"
},
{
"ImportPath": "gonum.org/v1/gonum",
@ -352,7 +356,7 @@
},
{
"ImportPath": "gopkg.in/inf.v0",
"Rev": "v0.9.0"
"Rev": "v0.9.1"
},
{
"ImportPath": "gopkg.in/tomb.v1",
@ -368,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "195af9ec3521"
"Rev": "17cfeff5d095"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "a2eda9f80ab8"
"Rev": "f69eda767ee8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f06fe3961ca9"
"Rev": "23563064f4f1"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "8e001e5d1894"
"Rev": "f86ae06843c6"
},
{
"ImportPath": "k8s.io/gengo",
@ -388,7 +392,7 @@
},
{
"ImportPath": "k8s.io/klog",
"Rev": "v0.4.0"
"Rev": "v1.0.0"
},
{
"ImportPath": "k8s.io/kube-openapi",

17
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/sample-controller
go 1.12
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-20191219150132-17cfeff5d095
k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8
k8s.io/client-go v0.0.0-20191219150614-23563064f4f1
k8s.io/code-generator v0.0.0-20191219145618-f86ae06843c6
k8s.io/klog v1.0.0
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20191219150132-17cfeff5d095
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8
k8s.io/client-go => k8s.io/client-go v0.0.0-20191219150614-23563064f4f1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191219145618-f86ae06843c6
)

4
go.sum
View File

@ -222,6 +222,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191219150132-17cfeff5d095/go.mod h1:VTIBWh+oVNX3+w6a85XIJE6jGsm0GCZKZmRQ6cdjfyA=
k8s.io/apimachinery v0.0.0-20191219145857-f69eda767ee8/go.mod h1:mhhO3hoLkWO+2eCvqjPtH2Ly92l9nJDwsswzWKpkN2w=
k8s.io/client-go v0.0.0-20191219150614-23563064f4f1/go.mod h1:oNb1OjlhaOHSeFuiXhyEMt+fVarI3qgJb1wMV1VeIgA=
k8s.io/code-generator v0.0.0-20191219145618-f86ae06843c6/go.mod h1:2aiDuxDU7RQK2PVypXAXHo6+YwOlF33iezHQbSmKSA4=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=