github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-04-02 05:02:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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 d16442a167
commit f25add6017
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -180,7 +180,7 @@
}, },
{ {
"ImportPath": "github.com/gogo/protobuf", "ImportPath": "github.com/gogo/protobuf",
"Rev": "v1.3.1" "Rev": "v1.3.2"
}, },
{ {
"ImportPath": "github.com/golang/glog", "ImportPath": "github.com/golang/glog",
@ -264,7 +264,7 @@
}, },
{ {
"ImportPath": "github.com/kisielk/errcheck", "ImportPath": "github.com/kisielk/errcheck",
"Rev": "v1.2.0" "Rev": "v1.5.0"
}, },
{ {
"ImportPath": "github.com/kisielk/gotool", "ImportPath": "github.com/kisielk/gotool",
@ -352,7 +352,7 @@
}, },
{ {
"ImportPath": "github.com/yuin/goldmark", "ImportPath": "github.com/yuin/goldmark",
"Rev": "v1.1.27" "Rev": "v1.2.1"
}, },
{ {
"ImportPath": "go.opencensus.io", "ImportPath": "go.opencensus.io",
@ -392,7 +392,7 @@
}, },
{ {
"ImportPath": "golang.org/x/sync", "ImportPath": "golang.org/x/sync",
"Rev": "cd5d95a43a6e" "Rev": "67f06af15bc9"
}, },
{ {
"ImportPath": "golang.org/x/sys", "ImportPath": "golang.org/x/sys",
@ -408,7 +408,7 @@
}, },
{ {
"ImportPath": "golang.org/x/tools", "ImportPath": "golang.org/x/tools",
"Rev": "c1934b75d054" "Rev": "113979e3529a"
}, },
{ {
"ImportPath": "golang.org/x/xerrors", "ImportPath": "golang.org/x/xerrors",
@ -468,19 +468,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "d610c6e6c135" "Rev": "4cbcd86ea749"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "2641dba65d8c" "Rev": "640a6275d2b0"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "717704b917f6" "Rev": "720ea497dc06"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "3f1cbd4ff5a7" "Rev": "48c1e31cd8b3"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15 go 1.15
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20210329194426-720ea497dc06
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210329192759-4cbcd86ea749
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329192153-640a6275d2b0
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210329194426-720ea497dc06
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -424,6 +424,10 @@ 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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= 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/client-go v0.0.0-20210329194426-720ea497dc06/go.mod h1:1C1ztLCJQP6JaCIcN/gJ4tjQI5EDBsuD3fQ6wQCY17I=
k8s.io/code-generator v0.0.0-20210329191617-48c1e31cd8b3/go.mod h1:i6FmG+QxaLxvJsezvZp0q/gAEzzOz3U53KFibghWToU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE= k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=