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

Merge pull request #100514 from joelsmith/release-1.18

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

12
Godeps/Godeps.json generated
View File

@ -108,7 +108,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",
@ -188,7 +188,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,19 +352,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "828bab7a24bb" "Rev": "b13e135d81e8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "c68ad1a85ac1" "Rev": "937f6a48eb33"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "b994da18bceb" "Rev": "08715c7129b4"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "a1aab0144d81" "Rev": "2558db0b36b5"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.13 go 1.13
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20210329192540-b13e135d81e8
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20210329193311-08715c7129b4
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
@ -16,9 +16,8 @@ replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 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/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 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/api => k8s.io/api v0.0.0-20210329192540-b13e135d81e8
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210329193311-08715c7129b4
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -199,6 +199,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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/code-generator v0.0.0-20210329191452-2558db0b36b5/go.mod h1:l5yJd8cLSvkIb0ZJMsQdWuDOx5rWfLNpgmHQyl3LmBE=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=