Merge pull request #77355 from apelisse/test-new-protoc

Use new reverse protobuf marshalling

Kubernetes-commit: a172e197b165f60c215b4467175bdd61d8a15e0e
This commit is contained in:
Kubernetes Publisher 2019-07-25 16:01:14 -07:00
parent f1955b1b1b
commit 86251eac5c
3 changed files with 17 additions and 8 deletions

14
Godeps/Godeps.json generated
View File

@ -72,7 +72,7 @@
},
{
"ImportPath": "github.com/gogo/protobuf",
"Rev": "v1.0.0"
"Rev": "v0.0.0-20190410021324-65acae22fc9"
},
{
"ImportPath": "github.com/golang/groupcache",
@ -110,6 +110,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"
@ -232,11 +240,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "0bb8574e0887"
"Rev": "641a75999153"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "b4f50308a616"
"Rev": "042c00bc1f9e"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190726022757-641a75999153
k8s.io/component-base v0.0.0-20190726023549-042c00bc1f9e
)
replace (
@ -15,7 +15,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/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190726022757-641a75999153
k8s.io/component-base => k8s.io/component-base v0.0.0-20190726023549-042c00bc1f9e
)

2
go.sum
View File

@ -90,6 +90,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/apimachinery v0.0.0-20190726022757-641a75999153/go.mod h1:eXR4ljjmbwK6Ng0PKsXRySPXnTUy/qBUa6kPDeckhQ0=
k8s.io/component-base v0.0.0-20190726023549-042c00bc1f9e/go.mod h1:KiJFR5KR5yaKNXFgCliO2CPcmAI6hdZCcb5XZyl0EhQ=
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=