Merge pull request #100501 from joelsmith/automated-cherry-pick-of-#98477-upstream-release-1.20

[1.20] Automated cherry pick of #98477: update gogo/protobuf to v1.3.2

Kubernetes-commit: 67f7cc9db9f07c9fb10dadf5911af72dd9a57be1
This commit is contained in:
Kubernetes Publisher
2021-03-29 09:22:46 -07:00
parent 2e2f04240b
commit 720ea497dc
3 changed files with 17 additions and 12 deletions

18
Godeps/Godeps.json generated
View File

@@ -180,7 +180,7 @@
},
{
"ImportPath": "github.com/gogo/protobuf",
"Rev": "v1.3.1"
"Rev": "v1.3.2"
},
{
"ImportPath": "github.com/golang/glog",
@@ -264,7 +264,7 @@
},
{
"ImportPath": "github.com/kisielk/errcheck",
"Rev": "v1.2.0"
"Rev": "v1.5.0"
},
{
"ImportPath": "github.com/kisielk/gotool",
@@ -350,6 +350,10 @@
"ImportPath": "github.com/stretchr/testify",
"Rev": "v1.6.1"
},
{
"ImportPath": "github.com/yuin/goldmark",
"Rev": "v1.2.1"
},
{
"ImportPath": "go.opencensus.io",
"Rev": "v0.22.3"
@@ -376,7 +380,7 @@
},
{
"ImportPath": "golang.org/x/mod",
"Rev": "v0.2.0"
"Rev": "v0.3.0"
},
{
"ImportPath": "golang.org/x/net",
@@ -388,7 +392,7 @@
},
{
"ImportPath": "golang.org/x/sync",
"Rev": "cd5d95a43a6e"
"Rev": "67f06af15bc9"
},
{
"ImportPath": "golang.org/x/sys",
@@ -404,7 +408,7 @@
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "95d2e580d8eb"
"Rev": "113979e3529a"
},
{
"ImportPath": "golang.org/x/xerrors",
@@ -464,11 +468,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "d610c6e6c135"
"Rev": "4cbcd86ea749"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2641dba65d8c"
"Rev": "640a6275d2b0"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
)

2
go.sum
View File

@@ -425,6 +425,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210329192759-4cbcd86ea749/go.mod h1:cgILOv2D1tPmboo8I/DGUMNkV0C3JtN5aAEYvcTyKQc=
k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=