From 0acaf5c3e93cc3422aca47eeea96e9ef553ac35c Mon Sep 17 00:00:00 2001 From: zhouya0 Date: Fri, 21 Feb 2020 11:02:40 +0800 Subject: [PATCH] Fix kubectl describe ingress annotations not sorted --- .../k8s.io/kubectl/pkg/describe/versioned/describe.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go index dc3f838f008..ef5a0c527c0 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go @@ -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