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 5891c585d3
commit a623e63f4a
3 changed files with 15 additions and 12 deletions
+3 -3
View File
@@ -440,7 +440,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "801f67dca416"
"Rev": "0bfda2331c3c"
},
{
"ImportPath": "k8s.io/apimachinery",
@@ -448,7 +448,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b501d6e7bb38"
"Rev": "b6011de30ee5"
},
{
"ImportPath": "k8s.io/code-generator",
@@ -468,7 +468,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "6e3d28b6ed19"
"Rev": "0bdb4ca86cbc"
},
{
"ImportPath": "rsc.io/binaryregexp",
+8 -9
View File
@@ -5,17 +5,16 @@ 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-20200717102341-0bfda2331c3c
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5
k8s.io/code-generator v0.0.0-20200712171229-f87d2adcd297
k8s.io/klog/v2 v2.2.0
)
replace (
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-20200717102341-0bfda2331c3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200712171229-f87d2adcd297
)
+4
View File
@@ -345,6 +345,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-20200717102341-0bfda2331c3c/go.mod h1:cxPAYAuEKCBUKMa/dalW3GjafStRSFWZWTXwOZgIXnk=
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0=
k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5/go.mod h1:qc0Hh7WHuavANJslDovxDd5E+sOPXOvwVygod4/wBtw=
k8s.io/code-generator v0.0.0-20200712171229-f87d2adcd297/go.mod h1:uR3gwQvtcOjBrvwXhFF1lw5kq9BOOAfSKl/pZZ1zW3I=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=