Merge pull request #91634 from jpbetz/latest-utils

Bump k8s.io/utils to 6e3d28 to pick up nested trace

Kubernetes-commit: a7e4973cb9d163fa9df2ecc0955d156d507a9a71
This commit is contained in:
Kubernetes Publisher 2020-06-22 21:59:55 -07:00
parent 1236412d0a
commit 9141af77bb
3 changed files with 13 additions and 10 deletions

6
Godeps/Godeps.json generated
View File

@ -548,11 +548,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "58357f96bf43"
"Rev": "57681663d939"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "5cd58fa2c139"
"Rev": "2737b78048f4"
},
{
"ImportPath": "k8s.io/gengo",
@ -568,7 +568,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "2df71ebbae66"
"Rev": "6e3d28b6ed19"
},
{
"ImportPath": "rsc.io/binaryregexp",

13
go.mod
View File

@ -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-20200619211815-2d992b89ee69
k8s.io/component-base v0.0.0-20200623052606-2737b78048f4
)
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-20200619212010-fd326d3007d3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200619211815-2d992b89ee69
k8s.io/client-go => k8s.io/client-go v0.0.0-20200623052157-57681663d939
k8s.io/component-base => k8s.io/component-base v0.0.0-20200623052606-2737b78048f4
)

4
go.sum
View File

@ -302,6 +302,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200619212010-fd326d3007d3/go.mod h1:ZABjG3iJlkyRBRLgm8C9YMUfxRTxkqde+hKrHyLy8T8=
k8s.io/apimachinery v0.0.0-20200619211815-2d992b89ee69/go.mod h1:PEdH+SOrD19FEfB7ciLjjkHmv6vOtf8ABeo3JqletDo=
k8s.io/client-go v0.0.0-20200623052157-57681663d939/go.mod h1:t7Ys8P1+3hAXXIg/YAxFablaeuzkaDs8hVcOk/Z3et8=
k8s.io/component-base v0.0.0-20200623052606-2737b78048f4/go.mod h1:DWwajeb3EtduS+TQviR83PYkt5Empgqjbfn+hzYFrP4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=