From 7d531959090833d413bbb6baf1590980f455bc41 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 | 4 ++-- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 64eca14b..790f54ca 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -352,7 +352,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "b8fba595e8fa" + "Rev": "70eb4849511b" }, { "ImportPath": "k8s.io/code-generator", @@ -372,7 +372,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 28bfe5d9..d16e84bd 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,18 @@ module k8s.io/sample-controller go 1.13 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20200320042356-1fc28ea2498c + k8s.io/apimachinery v0.0.0-20200320122144-48159c651603 + k8s.io/client-go v0.0.0-20200323042902-70eb4849511b + k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece k8s.io/klog v1.0.0 ) 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/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + 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/code-generator => k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece ) diff --git a/go.sum b/go.sum index e13154af..f336d9bb 100644 --- a/go.sum +++ b/go.sum @@ -198,6 +198,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-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/code-generator v0.0.0-20200319201949-6bb2b634cece/go.mod h1:HgVCDA66DadRZIO1Ym1MX49lfUdXKOzJ8HA7GQVQTMI= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=