From 1bf9e33e6328327ead9aac3c4afa28b9d1156243 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 | 10 +++++----- go.mod | 27 +++++++++++++-------------- go.sum | 7 +++++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index f0c689ad1..2c2dd0ee1 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -576,11 +576,11 @@ }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "e7ded9ab204b" + "Rev": "c5a29d532eb1" }, { "ImportPath": "k8s.io/client-go", - "Rev": "b8fba595e8fa" + "Rev": "70eb4849511b" }, { "ImportPath": "k8s.io/code-generator", @@ -588,7 +588,7 @@ }, { "ImportPath": "k8s.io/component-base", - "Rev": "79b64fca65df" + "Rev": "bedba4b6402d" }, { "ImportPath": "k8s.io/gengo", @@ -604,11 +604,11 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "19241c92e931" + "Rev": "3b095ae3e67e" }, { "ImportPath": "k8s.io/utils", - "Rev": "4a6ff033650d" + "Rev": "327a8059b905" }, { "ImportPath": "sigs.k8s.io/kustomize", diff --git a/go.mod b/go.mod index bfd46c733..da3492fe4 100644 --- a/go.mod +++ b/go.mod @@ -34,14 +34,14 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20200320042356-1fc28ea2498c + k8s.io/apimachinery v0.0.0-20200320122144-48159c651603 + k8s.io/cli-runtime v0.0.0-20200323050020-c5a29d532eb1 + k8s.io/client-go v0.0.0-20200323042902-70eb4849511b + k8s.io/component-base v0.0.0-20200323043823-bedba4b6402d k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20200323045820-3b095ae3e67e k8s.io/utils v0.0.0-20200322164244-327a8059b905 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -51,12 +51,11 @@ require ( 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/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20200320042356-1fc28ea2498c + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200320122144-48159c651603 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200323050020-c5a29d532eb1 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200323042902-70eb4849511b + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece + k8s.io/component-base => k8s.io/component-base v0.0.0-20200323043823-bedba4b6402d + k8s.io/metrics => k8s.io/metrics v0.0.0-20200323045820-3b095ae3e67e ) diff --git a/go.sum b/go.sum index 17c95076b..5224e8f65 100644 --- a/go.sum +++ b/go.sum @@ -314,6 +314,12 @@ 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/cli-runtime v0.0.0-20200323050020-c5a29d532eb1/go.mod h1:wTCA9N28mT3TbLT9ZNny22D5bBGkRwgZr+dha/ewwb8= +k8s.io/client-go v0.0.0-20200323042902-70eb4849511b/go.mod h1:64IdCZeusi2RxFpEc1R4cLo9mtiRealqqsl6ysIAFeY= +k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece/go.mod h1:HgVCDA66DadRZIO1Ym1MX49lfUdXKOzJ8HA7GQVQTMI= +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/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -322,6 +328,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/metrics v0.0.0-20200323045820-3b095ae3e67e/go.mod h1:155+LOvfvgDSwqf+1sTf0yTfedzTZHje3wdCFAnei6M= k8s.io/utils v0.0.0-20200322164244-327a8059b905 h1:bbO8bYwd3CdH0B2+xhhVShn6HPgpCLmWdYd95I9D/7w= k8s.io/utils v0.0.0-20200322164244-327a8059b905/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=