From e75989c0bf23c15d7e25a42f303d9944f43c6054 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Sun, 22 Mar 2020 19:26:46 -0700 Subject: [PATCH] Merge pull request #89341 from aojea/bumputils bump k8s.io utils Kubernetes-commit: 6273449fe06574b3b192b92fe487ddfbd16837af --- Godeps/Godeps.json | 6 +++--- go.mod | 13 ++++++------- go.sum | 4 ++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 5b15958..cb362cf 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -444,11 +444,11 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "b8fba595e8fa" + "Rev": "70eb4849511b" }, { "ImportPath": "k8s.io/component-base", - "Rev": "79b64fca65df" + "Rev": "bedba4b6402d" }, { "ImportPath": "k8s.io/gengo", @@ -464,7 +464,7 @@ }, { "ImportPath": "k8s.io/utils", - "Rev": "4a6ff033650d" + "Rev": "327a8059b905" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", diff --git a/go.mod b/go.mod index 3df9cca..bef4189 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-20200320122144-48159c651603 + k8s.io/component-base v0.0.0-20200323043823-bedba4b6402d ) 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-20200320042356-1fc28ea2498c + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200320122144-48159c651603 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200323042902-70eb4849511b + k8s.io/component-base => k8s.io/component-base v0.0.0-20200323043823-bedba4b6402d ) diff --git a/go.sum b/go.sum index 7d860f7..929be12 100644 --- a/go.sum +++ b/go.sum @@ -194,6 +194,10 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= 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-20200320042356-1fc28ea2498c/go.mod h1:5nMyHS4bWX496fulniJ+Sws3P6GLvaP43GadMObLf58= +k8s.io/apimachinery v0.0.0-20200320122144-48159c651603/go.mod h1:yKN3QjQfKl8UdUL9RQ+/1VkR7nIUs7w02zC5CXhD+G0= +k8s.io/client-go v0.0.0-20200323042902-70eb4849511b/go.mod h1:64IdCZeusi2RxFpEc1R4cLo9mtiRealqqsl6ysIAFeY= +k8s.io/component-base v0.0.0-20200323043823-bedba4b6402d/go.mod h1:MYp7rIzRSWn8bcyLHgOUkdtMR6Z7QY+t1ClL321ri4g= 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=