From f1c08e5d4e7237d24b45888f6e3b628c8347774a Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 6 Feb 2020 17:48:01 -0800 Subject: [PATCH] Merge pull request #87830 from dims/update-sigs.k8s.io/yaml-to-v1.2.0 Updating dependency sigs.k8s.io/yaml to version v1.2.0 Kubernetes-commit: e4061baeac03793f300c2dd824cae5673d1c24cf --- Godeps/Godeps.json | 10 +++++----- go.mod | 13 ++++++------- go.sum | 4 ++++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 0da5c8d..64af5be 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -424,19 +424,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "812149543c99" + "Rev": "85a41f27a10c" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "f30c02351710" + "Rev": "52a338251bb2" }, { "ImportPath": "k8s.io/client-go", - "Rev": "1ae532aad6ad" + "Rev": "473926661c44" }, { "ImportPath": "k8s.io/component-base", - "Rev": "6bcd25baa4f4" + "Rev": "616550b070ba" }, { "ImportPath": "k8s.io/gengo", @@ -460,7 +460,7 @@ }, { "ImportPath": "sigs.k8s.io/yaml", - "Rev": "v1.1.0" + "Rev": "v1.2.0" } ] } \ No newline at end of file diff --git a/go.mod b/go.mod index 3df9cca..ff4791b 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager go 1.13 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/apimachinery v0.0.0-20200207025655-52a338251bb2 + k8s.io/component-base v0.0.0-20200207030544-616550b070ba ) replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // 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/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-20200207025841-85a41f27a10c + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200207025655-52a338251bb2 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200207030105-473926661c44 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200207030544-616550b070ba ) diff --git a/go.sum b/go.sum index 3877d88..1802e63 100644 --- a/go.sum +++ b/go.sum @@ -184,6 +184,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-20200207025841-85a41f27a10c/go.mod h1:SA5EjO7X3UBpRgCFnqrgyCg0rXvBmN8QpNZ4Bvmv9js= +k8s.io/apimachinery v0.0.0-20200207025655-52a338251bb2/go.mod h1:4JiEu5qfVX4iOPJG4zxNOGJ0HamEJ5OmJHxtHMChmZo= +k8s.io/client-go v0.0.0-20200207030105-473926661c44/go.mod h1:ourVHU91vVd0R4YiJhW1FNlt3K+HtokZ5ImtcAbqVh4= +k8s.io/component-base v0.0.0-20200207030544-616550b070ba/go.mod h1:xqOLjWJL1P+sXGSeMoLVvN0UM/adtUwVUp/mwh5H518= 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=