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 93c2e44338
commit b60d4fc3c5
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated
View File

@ -232,7 +232,7 @@
},
{
"ImportPath": "github.com/onsi/ginkgo",
"Rev": "v1.10.1"
"Rev": "v1.11.0"
},
{
"ImportPath": "github.com/onsi/gomega",
@ -372,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ca1d04f8b0d3"
"Rev": "5011a43dca10"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "442f8fb2f03a"
"Rev": "c48e860b1320"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a32a6f7a3052"
"Rev": "31f4619a2737"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "0b9b3c99f9f2"
"Rev": "6b257a9d6f46"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,19 +5,18 @@ 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-20191220233527-5011a43dca10
k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320
k8s.io/client-go v0.0.0-20191220233752-31f4619a2737
k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46
k8s.io/klog v1.0.0
)
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/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20191220233527-5011a43dca10
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320
k8s.io/client-go => k8s.io/client-go v0.0.0-20191220233752-31f4619a2737
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46
)

4
go.sum
View File

@ -220,6 +220,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-20191220233527-5011a43dca10/go.mod h1:HuVq7c0Eg8HUP98w/0ItOMn4ETl5Z3V027g4l56ZBMs=
k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s=
k8s.io/client-go v0.0.0-20191220233752-31f4619a2737/go.mod h1:wHlgYNqfpmZly2jO6nNt0h3Xi4MBN4uzGJBC1vZU4AY=
k8s.io/code-generator v0.0.0-20191220033320-6b257a9d6f46/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao=
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=