diff --git a/go.mod b/go.mod index be4a4aeee4f..24f4f30ca54 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/go-openapi/validate v0.18.0 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01 github.com/golang/protobuf v1.2.0 diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod index 2dc067a1e15..c65fab83a8f 100644 --- a/staging/src/k8s.io/api/go.mod +++ b/staging/src/k8s.io/api/go.mod @@ -5,13 +5,12 @@ module k8s.io/api go 1.12 require ( - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/stretchr/testify v1.2.2 k8s.io/apimachinery v0.0.0 ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 4b1dfca44bd..65a4ee25a7d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-openapi/spec v0.17.2 github.com/go-openapi/strfmt v0.17.0 github.com/go-openapi/validate v0.18.0 - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -38,7 +38,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index 51d695656cb..59324225494 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550 - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/protobuf v1.2.0 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf @@ -36,7 +36,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index d25a862fb2b..41ea6f61991 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -22,7 +22,7 @@ require ( github.com/go-openapi/jsonreference v0.19.0 // indirect github.com/go-openapi/spec v0.17.2 github.com/go-openapi/swag v0.17.2 // indirect - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/google/go-cmp v0.2.0 // indirect github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf @@ -74,7 +74,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index 8d35fea230b..b7135168966 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -27,7 +27,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index bc20bde6209..de79431c9d1 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -10,7 +10,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda // indirect github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550 - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/protobuf v1.2.0 github.com/google/btree v0.0.0-20160524151835-7d79101e329e // indirect @@ -35,7 +35,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index 598d0c229ff..9d1cc85fac7 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -14,7 +14,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod index d41c1570fe3..6386920a660 100644 --- a/staging/src/k8s.io/cluster-bootstrap/go.mod +++ b/staging/src/k8s.io/cluster-bootstrap/go.mod @@ -10,7 +10,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index 1236eac0e98..931888c794b 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -5,7 +5,7 @@ module k8s.io/code-generator go 1.12 require ( - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/spf13/pflag v1.0.1 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 // indirect gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 @@ -15,7 +15,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index 7f75074de1b..9f198cf3fc4 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -12,7 +12,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index 82b696bbb58..6952bcc407c 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -6,7 +6,7 @@ go 1.12 require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -19,7 +19,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 k8s.io/cri-api => ../cri-api ) diff --git a/staging/src/k8s.io/csi-translation-lib/go.mod b/staging/src/k8s.io/csi-translation-lib/go.mod index 84699426b52..2f1a504dcb2 100644 --- a/staging/src/k8s.io/csi-translation-lib/go.mod +++ b/staging/src/k8s.io/csi-translation-lib/go.mod @@ -11,7 +11,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 34226ae7edd..02dacea5f75 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -8,7 +8,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 github.com/go-openapi/spec v0.17.2 - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/prometheus/client_golang v0.9.2 github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937 @@ -27,7 +27,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod index aa744ab8fc7..6730677a509 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.mod +++ b/staging/src/k8s.io/kube-controller-manager/go.mod @@ -10,7 +10,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kube-proxy/go.mod b/staging/src/k8s.io/kube-proxy/go.mod index 61f45ebdbf2..e44e1f20ec5 100644 --- a/staging/src/k8s.io/kube-proxy/go.mod +++ b/staging/src/k8s.io/kube-proxy/go.mod @@ -10,7 +10,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod index 30042bdb118..86853a88b88 100644 --- a/staging/src/k8s.io/kube-scheduler/go.mod +++ b/staging/src/k8s.io/kube-scheduler/go.mod @@ -10,7 +10,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index 6c34ea7823b..d9a5c936bfb 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -10,7 +10,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index c70db5e60f7..3f12ff4cf86 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -5,7 +5,7 @@ module k8s.io/metrics go 1.12 require ( - github.com/gogo/protobuf v1.1.1 + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/stretchr/testify v1.2.2 k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 @@ -14,7 +14,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/node-api/go.mod b/staging/src/k8s.io/node-api/go.mod index 374d80d488b..7e8457e571a 100644 --- a/staging/src/k8s.io/node-api/go.mod +++ b/staging/src/k8s.io/node-api/go.mod @@ -11,7 +11,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index 2a53f5c0fc7..b6e853b6f58 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -17,7 +17,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod index 9e73fe6f4a0..12f4fc41568 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.mod +++ b/staging/src/k8s.io/sample-cli-plugin/go.mod @@ -12,7 +12,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index 460ba3752f3..ecd8f00d557 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -13,7 +13,6 @@ require ( ) replace ( - github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 diff --git a/vendor/modules.txt b/vendor/modules.txt index 60ec2024948..7ec7c97af8f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -373,7 +373,7 @@ github.com/go-ozzo/ozzo-validation github.com/go-ozzo/ozzo-validation/is # github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 => github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 github.com/godbus/dbus -# github.com/gogo/protobuf v1.1.1 => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 +# github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 github.com/gogo/protobuf/gogoproto github.com/gogo/protobuf/plugin/compare github.com/gogo/protobuf/plugin/defaultcheck