Merge pull request #87081 from dims/updating-protobuf-and-grpc

Updating protobuf (v1.3.1) and grpc (v1.26.0)

Kubernetes-commit: f4b6b751cdf2d46940355359443b263cb883d006
This commit is contained in:
Kubernetes Publisher 2020-01-18 13:01:36 -08:00
commit 4f155a6381
3 changed files with 32 additions and 32 deletions

18
Godeps/Godeps.json generated
View File

@ -188,7 +188,7 @@
},
{
"ImportPath": "github.com/gogo/protobuf",
"Rev": "65acae22fc9d"
"Rev": "v1.3.1"
},
{
"ImportPath": "github.com/golang/glog",
@ -408,7 +408,7 @@
},
{
"ImportPath": "github.com/prometheus/client_model",
"Rev": "v0.1.0"
"Rev": "14fe0d1b01d4"
},
{
"ImportPath": "github.com/prometheus/common",
@ -568,27 +568,27 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ddd293d80783"
"Rev": "7aecbd569fd4"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "fb4ce0f53438"
"Rev": "b615468efe04"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "feab07fccd0b"
"Rev": "b7dc99061fe0"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1aa326d7304e"
"Rev": "a432bd9ba7da"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "ff19ea5b1bbd"
"Rev": "48228b4f418f"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "5acc2cc4b5e6"
"Rev": "5735a1699056"
},
{
"ImportPath": "k8s.io/gengo",
@ -604,7 +604,7 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "104fffcb7841"
"Rev": "3407a290b84d"
},
{
"ImportPath": "k8s.io/utils",

26
go.mod
View File

@ -36,14 +36,14 @@ require (
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
gopkg.in/yaml.v2 v2.2.7
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20200118153702-ddd293d80783
k8s.io/apimachinery v0.0.0-20200116033531-fb4ce0f53438
k8s.io/cli-runtime v0.0.0-20200118155126-feab07fccd0b
k8s.io/client-go v0.0.0-20200116034004-1aa326d7304e
k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6
k8s.io/api v0.0.0-20200118233722-7aecbd569fd4
k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
k8s.io/cli-runtime v0.0.0-20200118235715-b7dc99061fe0
k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da
k8s.io/component-base v0.0.0-20200118234435-5735a1699056
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/metrics v0.0.0-20200116035750-104fffcb7841
k8s.io/metrics v0.0.0-20200118235605-3407a290b84d
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.1.0
@ -53,11 +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 => k8s.io/api v0.0.0-20200118153702-ddd293d80783
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200116033531-fb4ce0f53438
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200118155126-feab07fccd0b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200116034004-1aa326d7304e
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200115193335-ff19ea5b1bbd
k8s.io/component-base => k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6
k8s.io/metrics => k8s.io/metrics v0.0.0-20200116035750-104fffcb7841
k8s.io/api => k8s.io/api v0.0.0-20200118233722-7aecbd569fd4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200118235715-b7dc99061fe0
k8s.io/client-go => k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200118233344-48228b4f418f
k8s.io/component-base => k8s.io/component-base v0.0.0-20200118234435-5735a1699056
k8s.io/metrics => k8s.io/metrics v0.0.0-20200118235605-3407a290b84d
)

20
go.sum
View File

@ -85,8 +85,8 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -206,7 +206,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@ -317,12 +317,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-20200118153702-ddd293d80783/go.mod h1:YimCV7LQfzVoCjjhkBdIAm7uL5aQlEbctwxCcN1GdEo=
k8s.io/apimachinery v0.0.0-20200116033531-fb4ce0f53438/go.mod h1:Tqxz3+oiUZcPFxzovlPY3nu99cCW6NstQ26uH61ywi4=
k8s.io/cli-runtime v0.0.0-20200118155126-feab07fccd0b/go.mod h1:/BAAT/fIOZEaiZOwfd7YOdCM4hyOlorP62IIixKZQqA=
k8s.io/client-go v0.0.0-20200116034004-1aa326d7304e/go.mod h1:nmHwfSYjYkRwvpBn84t4sGscLh3EG6poZyhLTM/ZD1I=
k8s.io/code-generator v0.0.0-20200115193335-ff19ea5b1bbd/go.mod h1:WPgBROsoLFrWctCL2GsTBR5dOmq5qKze3vy4ssGz+MM=
k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6/go.mod h1:gP5E+oe3zIKwBnsNziZgkx8Km7SAO0nEDXQIm0VfBSs=
k8s.io/api v0.0.0-20200118233722-7aecbd569fd4/go.mod h1:iTnrvplu5Iag9UUDHF5+igjjHk++6USiI3t2qaW2bX8=
k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04/go.mod h1:j05cPXobKCShrrgR2gz+Wsw3flBA+nvUoLQLo1PdydY=
k8s.io/cli-runtime v0.0.0-20200118235715-b7dc99061fe0/go.mod h1:LV6a8Vt7HnVfrBjfyEkP0NnXrbPEr5zjR78CWms4iS0=
k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da/go.mod h1:q/VkAWSNaZSYCIh4i2xT6kRRgshtiFdeLxxVK/4Y+9w=
k8s.io/code-generator v0.0.0-20200118233344-48228b4f418f/go.mod h1:1Bsaqodc1TFZRb+hdtaQ1SJWc5RIkLIT9ZxThIv2S7M=
k8s.io/component-base v0.0.0-20200118234435-5735a1699056/go.mod h1:FkOXiiponoAxWNDDcjOwEgl4TVmMFI/SJx6TjeWfYHU=
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,7 +331,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-20200116035750-104fffcb7841/go.mod h1:PSle2Um1YCO48kF3ak8p28nfU1u+slnoXWBLw+7J9Z0=
k8s.io/metrics v0.0.0-20200118235605-3407a290b84d/go.mod h1:fNclKak9wrro175izH25zNWea4h4ZwXZ8sgiMHxCq5Y=
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc h1:MUttqhwRgupMiA5ps5F3d2/NLkU8EZSECTGxrQxqM54=
k8s.io/utils v0.0.0-20191217005138-9e5e9d854fcc/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=