Merge remote-tracking branch 'origin/master' into release-1.19

Kubernetes-commit: 223a4e974f77c585bd47ce008c3d6f80ded653dd
This commit is contained in:
Kubernetes Publisher
2020-07-21 10:01:26 +00:00
parent d3dc2f4702
commit b6011de30e
3 changed files with 8 additions and 7 deletions

4
Godeps/Godeps.json generated
View File

@@ -440,7 +440,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "801f67dca416"
"Rev": "0bfda2331c3c"
},
{
"ImportPath": "k8s.io/apimachinery",
@@ -460,7 +460,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "6e3d28b6ed19"
"Rev": "0bdb4ca86cbc"
},
{
"ImportPath": "rsc.io/binaryregexp",

9
go.mod
View File

@@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20200717102341-0bfda2331c3c
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/klog/v2 v2.2.0
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20200717102341-0bfda2331c3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
)

2
go.sum
View File

@@ -332,6 +332,8 @@ 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-20200717102341-0bfda2331c3c/go.mod h1:cxPAYAuEKCBUKMa/dalW3GjafStRSFWZWTXwOZgIXnk=
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=