From a9c895e7f2ac31438d0943909ce348e934e77f9c Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 25 Jul 2019 16:01:14 -0700 Subject: [PATCH] Merge pull request #77355 from apelisse/test-new-protoc Use new reverse protobuf marshalling Kubernetes-commit: a172e197b165f60c215b4467175bdd61d8a15e0e --- Godeps/Godeps.json | 14 +++++++++++--- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 88711d81..db5dbd75 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -76,7 +76,7 @@ }, { "ImportPath": "github.com/gogo/protobuf", - "Rev": "v1.0.0" + "Rev": "v0.0.0-20190410021324-65acae22fc9" }, { "ImportPath": "github.com/golang/groupcache", @@ -130,6 +130,14 @@ "ImportPath": "github.com/json-iterator/go", "Rev": "v1.1.6" }, + { + "ImportPath": "github.com/kisielk/errcheck", + "Rev": "v1.2.0" + }, + { + "ImportPath": "github.com/kisielk/gotool", + "Rev": "v1.0.0" + }, { "ImportPath": "github.com/kr/pretty", "Rev": "v0.1.0" @@ -252,11 +260,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "b90922c02518" + "Rev": "69e1bce1dad5" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "bfcf53abc9f8" + "Rev": "641a75999153" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 353c6b39..0269a170 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a golang.org/x/time v0.0.0-20161028155119-f51c12702a4d 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-20190726022912-69e1bce1dad5 + k8s.io/apimachinery v0.0.0-20190726022757-641a75999153 k8s.io/klog v0.3.1 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a sigs.k8s.io/yaml v1.1.0 @@ -40,7 +40,6 @@ replace ( 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 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20190726022912-69e1bce1dad5 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190726022757-641a75999153 ) diff --git a/go.sum b/go.sum index 5b75b60c..d6f0c362 100644 --- a/go.sum +++ b/go.sum @@ -124,6 +124,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/api v0.0.0-20190726022912-69e1bce1dad5/go.mod h1:V6cpJ9D7WqSy0wqcE096gcbj+W//rshgQgmj1Shdwi8= +k8s.io/apimachinery v0.0.0-20190726022757-641a75999153/go.mod h1:eXR4ljjmbwK6Ng0PKsXRySPXnTUy/qBUa6kPDeckhQ0= 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=