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: eedb7d6eb9948a015e45ff6bbb7a0e36144c181f
This commit is contained in:
Kubernetes Publisher 2020-08-13 16:11:39 +00:00
parent c223c36d4d
commit 5427ebf248
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -760,27 +760,27 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "fbbb12e99c8e"
"Rev": "964aaeff6c60"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d2b2215ad471"
"Rev": "658236199ef9"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "07db6acac0c7"
"Rev": "6e165a020c37"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "16ae2a83e32a"
"Rev": "f28aff35751d"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "649de32797ee"
"Rev": "1c3794b15e35"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "73a14f4c1c73"
"Rev": "044ed31edf51"
},
{
"ImportPath": "k8s.io/gengo",
@ -792,11 +792,11 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "656914f816f9"
"Rev": "6aeccd4b50c6"
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "c536b68bb748"
"Rev": "becf97d18972"
},
{
"ImportPath": "k8s.io/utils",
@ -811,8 +811,8 @@
"Rev": "v2.0.3"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "43c19bbb7fba"
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",

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-20200813172118-964aaeff6c60
k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9
k8s.io/cli-runtime v0.0.0-20200813180037-6e165a020c37
k8s.io/client-go v0.0.0-20200813172717-f28aff35751d
k8s.io/component-base v0.0.0-20200813173350-044ed31edf51
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20200813175812-becf97d18972
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
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-20200813172118-964aaeff6c60
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200813180037-6e165a020c37
k8s.io/client-go => k8s.io/client-go v0.0.0-20200813172717-f28aff35751d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35
k8s.io/component-base => k8s.io/component-base v0.0.0-20200813173350-044ed31edf51
k8s.io/metrics => k8s.io/metrics v0.0.0-20200813175812-becf97d18972
)

7
go.sum
View File

@ -509,6 +509,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-20200813172118-964aaeff6c60/go.mod h1:kxqZgwyrn3pjZ2td+6t9jG0Xut0Q06kxKM9OG8mFICo=
k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9/go.mod h1:1z+ESypfBDWAQXahXbqiOO581DaYTRgdaHAi60KXR1s=
k8s.io/cli-runtime v0.0.0-20200813180037-6e165a020c37/go.mod h1:qV6mUz2DpBEcuTIXZccgmVFXC3EPuUmwKcmuA0Kent0=
k8s.io/client-go v0.0.0-20200813172717-f28aff35751d/go.mod h1:bqG9Stej1Z/hV5hxJ5ZUE0TCc6UzM5DKeWoR3hvzUFw=
k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/component-base v0.0.0-20200813173350-044ed31edf51/go.mod h1:ti+moAAgHRlErGY7YCyANTu6RfOlfDNXGVov0wL5u7k=
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=
@ -516,6 +522,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-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/metrics v0.0.0-20200813175812-becf97d18972/go.mod h1:06gO/yWekVums02+f9mb3i0vORuLmQBKg2hOgy3o+X8=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=