From ba386b5608e6d2f8003abc853c41527efc8cd8e8 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 15 Jan 2020 16:40:22 -0800 Subject: [PATCH] Merge pull request #87158 from dims/pick-closest-tags-for-a-few-packages Pick closest tags for a few packages and avoid random SHA Kubernetes-commit: 5d1c3016103d83df4ae91664639ba7e0a103c7ec --- 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 a2b60c9..9a4e1a2 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -84,7 +84,7 @@ }, { "ImportPath": "github.com/elazarl/goproxy", - "Rev": "c4fc26588b6e" + "Rev": "947c36da3153" }, { "ImportPath": "github.com/emicklei/go-restful", @@ -424,19 +424,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "3946df5ca773" + "Rev": "9bd6c7846cc9" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "44bd77c24ef9" + "Rev": "fb4ce0f53438" }, { "ImportPath": "k8s.io/client-go", - "Rev": "bcaa73156d59" + "Rev": "1aa326d7304e" }, { "ImportPath": "k8s.io/component-base", - "Rev": "11fea6cd3d41" + "Rev": "5acc2cc4b5e6" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 3df9cca..11ce13f 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-20200116033531-fb4ce0f53438 + k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6 ) 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-20200116033728-9bd6c7846cc9 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200116033531-fb4ce0f53438 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200116034004-1aa326d7304e + k8s.io/component-base => k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6 ) diff --git a/go.sum b/go.sum index 79b3ced..6cdb7b9 100644 --- a/go.sum +++ b/go.sum @@ -190,6 +190,10 @@ gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/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-20200116033728-9bd6c7846cc9/go.mod h1:YimCV7LQfzVoCjjhkBdIAm7uL5aQlEbctwxCcN1GdEo= +k8s.io/apimachinery v0.0.0-20200116033531-fb4ce0f53438/go.mod h1:Tqxz3+oiUZcPFxzovlPY3nu99cCW6NstQ26uH61ywi4= +k8s.io/client-go v0.0.0-20200116034004-1aa326d7304e/go.mod h1:nmHwfSYjYkRwvpBn84t4sGscLh3EG6poZyhLTM/ZD1I= +k8s.io/component-base v0.0.0-20200116034511-5acc2cc4b5e6/go.mod h1:gP5E+oe3zIKwBnsNziZgkx8Km7SAO0nEDXQIm0VfBSs= 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=