kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 354ed75281
commit 8daeed3565
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -136,7 +136,7 @@
},
{
"ImportPath": "github.com/gogo/protobuf",
"Rev": "65acae22fc9d"
"Rev": "v1.3.1"
},
{
"ImportPath": "github.com/golang/glog",
@ -300,7 +300,7 @@
},
{
"ImportPath": "github.com/prometheus/client_model",
"Rev": "v0.1.0"
"Rev": "14fe0d1b01d4"
},
{
"ImportPath": "github.com/prometheus/common",
@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "9bd6c7846cc9"
"Rev": "7aecbd569fd4"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "fb4ce0f53438"
"Rev": "b615468efe04"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1aa326d7304e"
"Rev": "a432bd9ba7da"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "5acc2cc4b5e6"
"Rev": "5735a1699056"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
k8s.io/component-base v0.0.0-20200118234435-5735a1699056
)
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/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20200118233722-7aecbd569fd4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04
k8s.io/client-go => k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da
k8s.io/component-base => k8s.io/component-base v0.0.0-20200118234435-5735a1699056
)

4
go.sum
View File

@ -190,6 +190,10 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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-20200118233722-7aecbd569fd4/go.mod h1:iTnrvplu5Iag9UUDHF5+igjjHk++6USiI3t2qaW2bX8=
k8s.io/apimachinery v0.0.0-20200118233534-b615468efe04/go.mod h1:j05cPXobKCShrrgR2gz+Wsw3flBA+nvUoLQLo1PdydY=
k8s.io/client-go v0.0.0-20200118233946-a432bd9ba7da/go.mod h1:q/VkAWSNaZSYCIh4i2xT6kRRgshtiFdeLxxVK/4Y+9w=
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/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=