Skip to content

Commit 4b83d0b

Browse files
authored
Merge pull request kubernetes#88394 from zhouya0/fix_kubectl_describe_ingress_annotations_not_sorted
Fix kubectl describe ingress annotations not sorted
2 parents add2e8b + 0acaf5c commit 4b83d0b

File tree

1 file changed

+1
-9
lines changed
  • staging/src/k8s.io/kubectl/pkg/describe/versioned

1 file changed

+1
-9
lines changed

staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2410,7 +2410,7 @@ func (i *IngressDescriber) describeIngress(ing *networkingv1beta1.Ingress, descr
24102410
if count == 0 {
24112411
w.Write(LEVEL_1, "%s\t%s \t%s (%s)\n", "*", "*", backendStringer(def), i.describeBackend(ns, def))
24122412
}
2413-
describeIngressAnnotations(w, ing.Annotations)
2413+
printAnnotationsMultiline(w, "Annotations", ing.Annotations)
24142414

24152415
if describerSettings.ShowEvents {
24162416
events, _ := i.CoreV1().Events(ing.Namespace).Search(scheme.Scheme, ing)
@@ -2433,14 +2433,6 @@ func describeIngressTLS(w PrefixWriter, ingTLS []networkingv1beta1.IngressTLS) {
24332433
}
24342434
}
24352435

2436-
// TODO: Move from annotations into Ingress status.
2437-
func describeIngressAnnotations(w PrefixWriter, annotations map[string]string) {
2438-
w.Write(LEVEL_0, "Annotations:\n")
2439-
for k, v := range annotations {
2440-
w.Write(LEVEL_1, "%v:\t%s\n", k, v)
2441-
}
2442-
}
2443-
24442436
// ServiceDescriber generates information about a service.
24452437
type ServiceDescriber struct {
24462438
clientset.Interface

0 commit comments

Comments
 (0)