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

Merge pull request #88394 from zhouya0/fix_kubectl_describe_ingress_annotations_not_sorted 

Fix kubectl describe ingress annotations not sorted

Kubernetes-commit: 4b83d0b2fd69c10c7c0455de824cd37cda3ab85e
This commit is contained in:
Kubernetes Publisher 2020-02-26 09:46:26 -08:00
parent 1f2c133d51 de11036690
commit 19ed29c90e
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -568,7 +568,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2db522d7d8a2"
"Rev": "d155b85a4fda"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -580,7 +580,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "5e1786105b6f"
"Rev": "f772958f8a29"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View File

@ -36,10 +36,10 @@ require (
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20200221201225-2db522d7d8a2
k8s.io/api v0.0.0-20200226122402-d155b85a4fda
k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9
k8s.io/client-go v0.0.0-20200221163115-5e1786105b6f
k8s.io/client-go v0.0.0-20200222082411-f772958f8a29
k8s.io/component-base v0.0.0-20200221165142-d6212a66f6f6
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
@ -53,10 +53,10 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200221201225-2db522d7d8a2
k8s.io/api => k8s.io/api v0.0.0-20200226122402-d155b85a4fda
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200221163115-5e1786105b6f
k8s.io/client-go => k8s.io/client-go v0.0.0-20200222082411-f772958f8a29
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c
k8s.io/component-base => k8s.io/component-base v0.0.0-20200221165142-d6212a66f6f6
k8s.io/metrics => k8s.io/metrics v0.0.0-20200221172033-647dd8d4af75

4
go.sum
View File

@ -306,10 +306,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200221201225-2db522d7d8a2/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys=
k8s.io/api v0.0.0-20200226122402-d155b85a4fda/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys=
k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9/go.mod h1:jFVnu9CV5hIeRRksJ7Tt7Uo+k7nXrLmHlLDSZT+lSsw=
k8s.io/client-go v0.0.0-20200221163115-5e1786105b6f/go.mod h1:UmUmKsm/QPFM6PX++FkaGSN2sbquEn4rxsBMAvnX+58=
k8s.io/client-go v0.0.0-20200222082411-f772958f8a29/go.mod h1:oCEmeN2HgOxtxgMbWWGHNOsipC+qARZIFENn44PJ5k4=
k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200221165142-d6212a66f6f6/go.mod h1:B8q2AK86xxE1I0R1+CrykxCmsXybANtr7pvlzNE9vjo=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

10
pkg/describe/versioned/describe.go
View File

@ -2410,7 +2410,7 @@ func (i *IngressDescriber) describeIngress(ing *networkingv1beta1.Ingress, descr
if count == 0 {
w.Write(LEVEL_1, "%s\t%s \t%s (%s)\n", "*", "*", backendStringer(def), i.describeBackend(ns, def))
}
describeIngressAnnotations(w, ing.Annotations)
printAnnotationsMultiline(w, "Annotations", ing.Annotations)
if describerSettings.ShowEvents {
events, _ := i.CoreV1().Events(ing.Namespace).Search(scheme.Scheme, ing)
@ -2433,14 +2433,6 @@ func describeIngressTLS(w PrefixWriter, ingTLS []networkingv1beta1.IngressTLS) {
}
}
// TODO: Move from annotations into Ingress status.
func describeIngressAnnotations(w PrefixWriter, annotations map[string]string) {
w.Write(LEVEL_0, "Annotations:\n")
for k, v := range annotations {
w.Write(LEVEL_1, "%v:\t%s\n", k, v)
}
}
// ServiceDescriber generates information about a service.
type ServiceDescriber struct {
clientset.Interface