Merge pull request #86013 from carlosedp/ginkgo_bump

Bump Ginkgo to support building on riscv64 arch

Kubernetes-commit: 4ff692861908697c530b6b8ba48a5eb442bd7ed7
This commit is contained in:
Kubernetes Publisher 2019-12-20 13:11:32 -08:00
parent 12aee9c4f0
commit 31f4619a27
3 changed files with 9 additions and 8 deletions

6
Godeps/Godeps.json generated
View File

@ -228,7 +228,7 @@
},
{
"ImportPath": "github.com/onsi/ginkgo",
"Rev": "v1.10.1"
"Rev": "v1.11.0"
},
{
"ImportPath": "github.com/onsi/gomega",
@ -348,11 +348,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ca1d04f8b0d3"
"Rev": "5011a43dca10"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "0ee8b4573e3a"
"Rev": "c48e860b1320"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -28,8 +28,8 @@ require (
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
google.golang.org/appengine v1.5.0 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20191220233527-5011a43dca10
k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
sigs.k8s.io/yaml v1.1.0
@ -38,7 +38,6 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20191220233527-5011a43dca10
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320
)

2
go.sum
View File

@ -193,6 +193,8 @@ 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-20191220233527-5011a43dca10/go.mod h1:HuVq7c0Eg8HUP98w/0ItOMn4ETl5Z3V027g4l56ZBMs=
k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=