kubernetes
/
kubelet
mirror of https://github.com/kubernetes/kubelet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 9ea30ea1a5
commit 0800c9d642
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -540,7 +540,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "801f67dca416"
"Rev": "0bfda2331c3c"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -548,11 +548,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b501d6e7bb38"
"Rev": "b6011de30ee5"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "fbdbc959442e"
"Rev": "947d876bc41b"
},
{
"ImportPath": "k8s.io/gengo",
@ -568,7 +568,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "6e3d28b6ed19"
"Rev": "0bdb4ca86cbc"
},
{
"ImportPath": "rsc.io/binaryregexp",

15
go.mod
View File

@ -8,15 +8,14 @@ require (
github.com/gogo/protobuf v1.3.1
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
google.golang.org/grpc v1.27.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20200717102341-0bfda2331c3c
k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/component-base v0.0.0-20200721132711-947d876bc41b
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kubelet => ../kubelet
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/component-base => k8s.io/component-base v0.0.0-20200721132711-947d876bc41b
)

4
go.sum
View File

@ -361,6 +361,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/component-base v0.0.0-20200721132711-947d876bc41b/go.mod h1:OpCVChRd2Nh7fWLHBYrappdUf6VQaAAI6k4RLtFhDKA=
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=