Merge pull request #92691 from zhouya0/change_kubectl_list_option_stdout

Change kubectl label and annotation list option stdout

Kubernetes-commit: 6cedc0853faa118df0ba3d41b48b993422ad3df6
This commit is contained in:
Kubernetes Publisher 2020-07-02 06:41:39 -07:00
parent 384af9bcb2
commit 10a2ba5463
3 changed files with 16 additions and 16 deletions

8
Godeps/Godeps.json generated
View File

@ -752,11 +752,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "70c9750ce4ed"
"Rev": "16d572fe0f9f"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "8a773a02ba6b"
"Rev": "3c2682fedbf2"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -764,7 +764,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bdcd046d6cbf"
"Rev": "9676485b71b9"
},
{
"ImportPath": "k8s.io/code-generator",
@ -772,7 +772,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "df61fd08516e"
"Rev": "b3613baa4e60"
},
{
"ImportPath": "k8s.io/gengo",

16
go.mod
View File

@ -34,11 +34,11 @@ 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-20200702090434-70c9750ce4ed
k8s.io/apimachinery v0.0.0-20200702090250-8a773a02ba6b
k8s.io/api v0.0.0-20200702130436-16d572fe0f9f
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63
k8s.io/client-go v0.0.0-20200702090709-bdcd046d6cbf
k8s.io/component-base v0.0.0-20200702091254-df61fd08516e
k8s.io/client-go v0.0.0-20200702130712-9676485b71b9
k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
k8s.io/metrics v0.0.0-20200702092548-05982dac5179
@ -49,11 +49,11 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20200702090434-70c9750ce4ed
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200702090250-8a773a02ba6b
k8s.io/api => k8s.io/api v0.0.0-20200702130436-16d572fe0f9f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63
k8s.io/client-go => k8s.io/client-go v0.0.0-20200702090709-bdcd046d6cbf
k8s.io/client-go => k8s.io/client-go v0.0.0-20200702130712-9676485b71b9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200702090103-29a41fee4a12
k8s.io/component-base => k8s.io/component-base v0.0.0-20200702091254-df61fd08516e
k8s.io/component-base => k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60
k8s.io/metrics => k8s.io/metrics v0.0.0-20200702092548-05982dac5179
)

8
go.sum
View File

@ -501,12 +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-20200702090434-70c9750ce4ed/go.mod h1:HR/wcd+VVmWH+8EkObXAc3HxXswsfrA0kiXfT5EFy8s=
k8s.io/apimachinery v0.0.0-20200702090250-8a773a02ba6b/go.mod h1:87+lSRzC+mGLZTTwIcPY67sorIVlqPhdNrvsToaUUns=
k8s.io/api v0.0.0-20200702130436-16d572fe0f9f/go.mod h1:PFJ2b4cud2iXU+DzN8Tf+HsJsN2KKcJUfbMmckp2bhI=
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2/go.mod h1:87+lSRzC+mGLZTTwIcPY67sorIVlqPhdNrvsToaUUns=
k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63/go.mod h1:yHzFQ1WrQIYwv31ZUelQn+rrinB/GNGNM4BGaV51A70=
k8s.io/client-go v0.0.0-20200702090709-bdcd046d6cbf/go.mod h1:4yZo+2IJt6zg2fe60MrKpPJl2g/NqtBkUSZdHCEp3Tw=
k8s.io/client-go v0.0.0-20200702130712-9676485b71b9/go.mod h1:TlvCDNHtv58YP5GaIXe4USyRFvfXxi99PNTzT0JkNe0=
k8s.io/code-generator v0.0.0-20200702090103-29a41fee4a12/go.mod h1:Ge7zjRdqyykyvjtJDWarkbGvfHIfpnlcXpfI36jitis=
k8s.io/component-base v0.0.0-20200702091254-df61fd08516e/go.mod h1:A8//EOJst1cT38h2/Xp3XNcXMevkmQZmnxWRCJIfgOQ=
k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60/go.mod h1:lJJT3Us7yQo3JPMkF7G18sl3dWSHe6wrtFgrzX/7ucQ=
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 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=