Merge pull request from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.16

[1.16] Automated cherry pick of : bump gopkg.in/yaml.v2 v2.2.4

Kubernetes-commit: a2ff5d71deafff1d9688eb6f7533dd239980c420
This commit is contained in:
Kubernetes Publisher 2019-10-04 00:49:56 -07:00
parent e872298ce7
commit d040c2be0d
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated

@ -360,7 +360,7 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.2"
"Rev": "v2.2.4"
},
{
"ImportPath": "honnef.co/go/tools",
@ -368,19 +368,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "518b3a755175"
"Rev": "195af9ec3521"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "93cd198ca677"
"Rev": "a2eda9f80ab8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "dd35e17ce261"
"Rev": "f06fe3961ca9"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "969864c73cc1"
"Rev": "8e001e5d1894"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20191004120104-195af9ec3521
k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/client-go v0.0.0-20191004120905-f06fe3961ca9
k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
k8s.io/klog v0.4.0
)
@ -20,9 +20,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20191004120104-195af9ec3521
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/client-go => k8s.io/client-go v0.0.0-20191004120905-f06fe3961ca9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
)

4
go.sum

@ -200,6 +200,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/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-20191004120104-195af9ec3521/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ=
k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ=
k8s.io/client-go v0.0.0-20191004120905-f06fe3961ca9/go.mod h1:SWvdcS3Tytgk/J84dR0j2Qdfia3vQ2RD182ZrtHKRxU=
k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=