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 #100514 from joelsmith/release-1.18 

[1.18] Cherry pick of #98477: update gogo/protobuf to v1.3.2

Kubernetes-commit: 55c7f26659b8cf4ce1a424a4619197c2499e2247
This commit is contained in:
Kubernetes Publisher 2021-03-29 08:58:45 -07:00
parent e8579a78bb
commit 9fdf61fd44
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": "v1.3.1"
"Rev": "v1.3.2"
},
{
"ImportPath": "github.com/golang/glog",
@ -220,7 +220,7 @@
},
{
"ImportPath": "github.com/kisielk/errcheck",
"Rev": "v1.2.0"
"Rev": "v1.5.0"
},
{
"ImportPath": "github.com/kisielk/gotool",
@ -424,19 +424,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "828bab7a24bb"
"Rev": "b13e135d81e8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "c68ad1a85ac1"
"Rev": "937f6a48eb33"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b994da18bceb"
"Rev": "08715c7129b4"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "65ec7e9457fe"
"Rev": "7c1e350c3797"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,17 +5,16 @@ 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-20210329191935-937f6a48eb33
k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797
)
replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/text => golang.org/x/text v0.3.2
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-20210329192540-b13e135d81e8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33
k8s.io/client-go => k8s.io/client-go v0.0.0-20210329193311-08715c7129b4
k8s.io/component-base => k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797
)

4
go.sum
View File

@ -185,6 +185,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/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-20210329192540-b13e135d81e8/go.mod h1:ZRAcQsPNk4gU8YxE+gQW1OqoeF96zqlXAEnLGsIcnOQ=
k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33/go.mod h1:z3HWT24PKvOWfgF+z68R7+Jj761mphku1J34CGG9NDc=
k8s.io/client-go v0.0.0-20210329193311-08715c7129b4/go.mod h1:PYFn5dTdx4qG2kLG9aY4Wy855Nag9HcbU6HyhBep+aU=
k8s.io/component-base v0.0.0-20210329195147-7c1e350c3797/go.mod h1:T23522vweo61fjMl1MsN8Gy1HerR+Z97eovY6rriHYc=
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=