kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.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 5657a64877
commit 7eedd3775c
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -752,7 +752,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "801f67dca416"
"Rev": "0bfda2331c3c"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -760,11 +760,11 @@
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "cff514ef790b"
"Rev": "d0e0dc9524a2"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b501d6e7bb38"
"Rev": "b6011de30ee5"
},
{
"ImportPath": "k8s.io/code-generator",
@ -772,7 +772,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "fbdbc959442e"
"Rev": "947d876bc41b"
},
{
"ImportPath": "k8s.io/gengo",
@ -788,11 +788,11 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "79d93e699e42"
"Rev": "c395a09c1c8d"
},
{
"ImportPath": "k8s.io/utils",
"Rev": "6e3d28b6ed19"
"Rev": "0bdb4ca86cbc"
},
{
"ImportPath": "rsc.io/binaryregexp",

27
go.mod
View File

@ -34,14 +34,14 @@ require (
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go 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/cli-runtime v0.0.0-20200721134632-d0e0dc9524a2
k8s.io/client-go v0.0.0-20200721132109-b6011de30ee5
k8s.io/component-base v0.0.0-20200721132711-947d876bc41b
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200721134447-c395a09c1c8d
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
@ -49,12 +49,11 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20200717102341-0bfda2331c3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200712171229-2c8b1211fea9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200721134632-d0e0dc9524a2
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
k8s.io/component-base => k8s.io/component-base v0.0.0-20200721132711-947d876bc41b
k8s.io/metrics => k8s.io/metrics v0.0.0-20200721134447-c395a09c1c8d
)

7
go.sum
View File

@ -501,6 +501,12 @@ 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/cli-runtime v0.0.0-20200721134632-d0e0dc9524a2/go.mod h1:GlBSrRsj4kxg81X+IUoWyTrX/aArWbQ98X11gx2PDN8=
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/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/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -508,6 +514,7 @@ k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 h1:5NC2ITmvg8RoxoH0wgmL4zn4VZqXGsKbxrikjaQx6s4=
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9/go.mod h1:bfCVj+qXcEaE5SCvzBaqpOySr6tuCcpPKqF6HD8nyCw=
k8s.io/metrics v0.0.0-20200721134447-c395a09c1c8d/go.mod h1:zdHAd0hXqeGzgRTKyP6b+axCS2GP4pKyzQIAtzhuwc0=
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc h1:GiXZzevctVRRBh56shqcqB9s9ReWMU6GTsFyE2RCFJQ=
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=