Merge pull request #87639 from cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.16

Update gopkg.in/yaml.v2 to v2.2.8

Kubernetes-commit: a1e6da402568572f56e7605c0091f3e57009eb20
This commit is contained in:
Kubernetes Publisher 2020-01-31 02:37:21 -08:00
parent 48823f85f7
commit 13b3f231e4
3 changed files with 15 additions and 12 deletions

10
Godeps/Godeps.json generated
View File

@ -368,7 +368,7 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.4"
"Rev": "v2.2.8"
},
{
"ImportPath": "honnef.co/go/tools",
@ -376,19 +376,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "17cfeff5d095"
"Rev": "d64dbec685a4"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "f69eda767ee8"
"Rev": "0c9ec93240c9"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "23563064f4f1"
"Rev": "537443fada71"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "31489c1247bd"
"Rev": "409d4deb41dd"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,15 +5,14 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20200131112707-d64dbec685a4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200131113135-537443fada71
k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd
)

4
go.sum
View File

@ -169,6 +169,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-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc=
k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
k8s.io/client-go v0.0.0-20200131113135-537443fada71/go.mod h1:u2dO5+oOGXUU6N5RS0nbrk8uLjpRqzLX8n+Te7tppS0=
k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY=
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=