Merge pull request #87640 from cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.15

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

Kubernetes-commit: f0df81892db55b76406c40dec4c4528e4b3cdc80
This commit is contained in:
Kubernetes Publisher 2020-01-31 13:43:29 -08:00
parent 03779fa10c
commit 56a5941a3d
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -212,19 +212,19 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.4"
"Rev": "v2.2.8"
},
{
"ImportPath": "k8s.io/api",
"Rev": "3a12735a829a"
"Rev": "e3a917c59b04"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "31ade1b30762"
"Rev": "0cd702f8b7f4"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b2f42092e376"
"Rev": "c06521ac77c2"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@ -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-20200131232428-e3a917c59b04
k8s.io/apimachinery v0.0.0-20200131232151-0cd702f8b7f4
k8s.io/client-go v0.0.0-20200131232729-c06521ac77c2
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/klog v0.3.1
)
@ -16,9 +16,8 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
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-20200131232428-e3a917c59b04
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131232151-0cd702f8b7f4
k8s.io/client-go => k8s.io/client-go v0.0.0-20200131232729-c06521ac77c2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
)

4
go.sum
View File

@ -96,6 +96,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20200131232428-e3a917c59b04/go.mod h1:c0dE/sqPGKi2K8Egtmgs+Lh2S8Vdj0rIAaENkm/3Z6w=
k8s.io/apimachinery v0.0.0-20200131232151-0cd702f8b7f4/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
k8s.io/client-go v0.0.0-20200131232729-c06521ac77c2/go.mod h1:18ml60QzAysxQhO2GvIMaV61cyY1FeLbZbtcVHY0irY=
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=