From cbfa3a891adec137a37743479d18bfb8a4ec4dbb Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 20 Dec 2019 13:11:32 -0800 Subject: [PATCH] Merge pull request #86013 from carlosedp/ginkgo_bump Bump Ginkgo to support building on riscv64 arch Kubernetes-commit: 4ff692861908697c530b6b8ba48a5eb442bd7ed7 --- Godeps/Godeps.json | 16 ++++++++-------- go.mod | 27 +++++++++++++-------------- go.sum | 7 +++++++ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 446a7716..87d8074b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -380,7 +380,7 @@ }, { "ImportPath": "github.com/onsi/ginkgo", - "Rev": "v1.10.1" + "Rev": "v1.11.0" }, { "ImportPath": "github.com/onsi/gomega", @@ -592,27 +592,27 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "ca1d04f8b0d3" + "Rev": "5011a43dca10" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "0ee8b4573e3a" + "Rev": "c48e860b1320" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "e6dc6d5c8724" + "Rev": "e0353efa44c8" }, { "ImportPath": "k8s.io/client-go", - "Rev": "0b8da7416048" + "Rev": "31f4619a2737" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "0b9b3c99f9f2" + "Rev": "6b257a9d6f46" }, { "ImportPath": "k8s.io/component-base", - "Rev": "d868452632e2" + "Rev": "170d998483ab" }, { "ImportPath": "k8s.io/gengo", @@ -628,7 +628,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "6b1944c9f765" + "Rev": "362e464d0583" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 094e0168..4ce88daf 100644 --- a/go.mod +++ b/go.mod @@ -36,14 +36,14 @@ require ( golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20191220233527-5011a43dca10 + k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320 + k8s.io/cli-runtime v0.0.0-20191220235439-e0353efa44c8 + k8s.io/client-go v0.0.0-20191220233752-31f4619a2737 + k8s.io/component-base v0.0.0-20191220234223-170d998483ab k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20191220235329-362e464d0583 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 @@ -53,12 +53,11 @@ 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/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20191220233527-5011a43dca10 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191220233347-c48e860b1320 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191220235439-e0353efa44c8 + 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 + k8s.io/component-base => k8s.io/component-base v0.0.0-20191220234223-170d998483ab + k8s.io/metrics => k8s.io/metrics v0.0.0-20191220235329-362e464d0583 ) diff --git a/go.sum b/go.sum index a948274e..96b99cec 100644 --- a/go.sum +++ b/go.sum @@ -323,6 +323,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= 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-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/cli-runtime v0.0.0-20191220235439-e0353efa44c8/go.mod h1:pD4BL7Sqegpn/eeol/nXvwn3mpCfKoIUC7v2LN+OoHk= +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/component-base v0.0.0-20191220234223-170d998483ab/go.mod h1:96rgeObDu0DCoWbnFIomPmy5BF+ZgfsIBxNWC4RZrA0= 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/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -331,6 +337,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/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/metrics v0.0.0-20191220235329-362e464d0583/go.mod h1:rWXLSx7m1m5bQ1cx/YIEEAc9l5dlWWN8PQg3cQt3fS4= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=