Merge pull request #82809 from liggitt/go-1.13-no-modules

update to use go1.13.4

Kubernetes-commit: 695c3061dd92a6b6950f8adf0341ceb4a8dd44d7
This commit is contained in:
Kubernetes Publisher 2019-11-06 17:02:43 -08:00
parent fe7e76b7d4
commit 97ea7f1bbd
3 changed files with 35 additions and 28 deletions

42
Godeps/Godeps.json generated
View File

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

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12 go 1.12
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20191107030003-665c8a257c1a
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20191107025440-35a828233ddd
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20191107030003-665c8a257c1a
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191107025440-35a828233ddd
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -213,6 +213,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20191107030003-665c8a257c1a/go.mod h1:gBpbNJH4JlHuCXtSTkFwvuGtM+dvyfLKuFOTt1WtKAM=
k8s.io/apimachinery v0.0.0-20191107025710-52af7e4fbc87/go.mod h1:DJOb3m0kw91A0YaUsaoYChi4d7xVF84HLiuRCxGsV04=
k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23/go.mod h1:r4ENSfZ8DK7J8mJZMtvlUa7g9SGuvAkRS1IsMEK+sgY=
k8s.io/code-generator v0.0.0-20191107025440-35a828233ddd/go.mod h1:GWj84JAH5M9huodTus4PpRnC33JiW9lEAWF6FZvF2eU=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= 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-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM= k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=