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 4696972848
commit 457bb3d8fe
3 changed files with 9 additions and 8 deletions

6
Godeps/Godeps.json generated
View File

@ -164,15 +164,15 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.4"
"Rev": "v2.2.8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "31ade1b30762"
"Rev": "0cd702f8b7f4"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "d5138742ad72"
"Rev": "6d0e514d4f25"
},
{
"ImportPath": "k8s.io/klog",

9
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-20200131232151-0cd702f8b7f4
k8s.io/component-base v0.0.0-20200131233309-6d0e514d4f25
)
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/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131232151-0cd702f8b7f4
k8s.io/component-base => k8s.io/component-base v0.0.0-20200131233309-6d0e514d4f25
)

2
go.sum
View File

@ -58,6 +58,8 @@ 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/apimachinery v0.0.0-20200131232151-0cd702f8b7f4/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
k8s.io/component-base v0.0.0-20200131233309-6d0e514d4f25/go.mod h1:tU+DnYfQjB0nrTrRCaxJHQkVN91EVAU2KM5cNejiAOo=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=