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 543688855f
commit 116445b61d
3 changed files with 47 additions and 37 deletions

50
Godeps/Godeps.json generated
View File

@ -172,7 +172,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",
@ -184,7 +184,7 @@
}, },
{ {
"ImportPath": "github.com/go-openapi/swag", "ImportPath": "github.com/go-openapi/swag",
"Rev": "v0.19.2" "Rev": "v0.19.5"
}, },
{ {
"ImportPath": "github.com/go-stack/stack", "ImportPath": "github.com/go-stack/stack",
@ -260,7 +260,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",
@ -340,7 +340,7 @@
}, },
{ {
"ImportPath": "github.com/mailru/easyjson", "ImportPath": "github.com/mailru/easyjson",
"Rev": "94de47d64c63" "Rev": "b2ccc519800e"
}, },
{ {
"ImportPath": "github.com/matttproud/golang_protobuf_extensions", "ImportPath": "github.com/matttproud/golang_protobuf_extensions",
@ -400,7 +400,7 @@
}, },
{ {
"ImportPath": "github.com/pkg/errors", "ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.0" "Rev": "v0.8.1"
}, },
{ {
"ImportPath": "github.com/pmezard/go-difflib", "ImportPath": "github.com/pmezard/go-difflib",
@ -452,7 +452,7 @@
}, },
{ {
"ImportPath": "github.com/spf13/pflag", "ImportPath": "github.com/spf13/pflag",
"Rev": "v1.0.3" "Rev": "v1.0.5"
}, },
{ {
"ImportPath": "github.com/spf13/viper", "ImportPath": "github.com/spf13/viper",
@ -484,7 +484,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",
@ -496,7 +496,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",
@ -504,31 +504,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",
@ -568,7 +572,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",
@ -588,27 +592,27 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "f0152ed5fdbc" "Rev": "665c8a257c1a"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "00d39968b57e" "Rev": "52af7e4fbc87"
}, },
{ {
"ImportPath": "k8s.io/cli-runtime", "ImportPath": "k8s.io/cli-runtime",
"Rev": "d1199d98239f" "Rev": "d1f4c7562f79"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "a57d0056dbf1" "Rev": "6f1579c35d23"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "9f431a56fdbc" "Rev": "35a828233ddd"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "c818e9b61295" "Rev": "aea44d161014"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -624,7 +628,7 @@
}, },
{ {
"ImportPath": "k8s.io/metrics", "ImportPath": "k8s.io/metrics",
"Rev": "0c7fcbf87db6" "Rev": "d3ccb962eb82"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",

27
go.mod
View File

@ -36,14 +36,14 @@ require (
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect gotest.tools v2.2.0+incompatible // indirect
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/cli-runtime v0.0.0 k8s.io/cli-runtime v0.0.0-20191107033206-d1f4c7562f79
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20191107030344-6f1579c35d23
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20191107031042-aea44d161014
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/metrics v0.0.0 k8s.io/metrics v0.0.0-20191107033012-d3ccb962eb82
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.1.0 sigs.k8s.io/yaml v1.1.0
@ -53,12 +53,11 @@ require (
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/cli-runtime => ../cli-runtime k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191107033206-d1f4c7562f79
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/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20191107031042-aea44d161014
k8s.io/kubectl => ../kubectl k8s.io/metrics => k8s.io/metrics v0.0.0-20191107033012-d3ccb962eb82
k8s.io/metrics => ../metrics
) )

7
go.sum
View File

@ -316,6 +316,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
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/cli-runtime v0.0.0-20191107033206-d1f4c7562f79/go.mod h1:OfPaYARwcyLbGV2XArEKPHd5ISpWQ0RcBTK59mo2J6A=
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/component-base v0.0.0-20191107031042-aea44d161014/go.mod h1:HrBDYnayl4WAKY3sdBIZNjeMk0wV4rQ1e2bmSiNVJyQ=
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/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@ -324,6 +330,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
k8s.io/metrics v0.0.0-20191107033012-d3ccb962eb82/go.mod h1:rhcZiEvJ9d4yhBtteoYoGVeFSt4aX5BmW48lucYVSVw=
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d h1:1P0iBJsBzxRmR+dIFnM+Iu4aLxnoa7lBqozW/0uHbT8= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d h1:1P0iBJsBzxRmR+dIFnM+Iu4aLxnoa7lBqozW/0uHbT8=
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=