Merge pull request #58529 from aledbf/describe-ingress

Automatic merge from submit-queue (batch tested with PRs 58221, 58529, 57800). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Show all the annotations in ingress rules **What this PR does / why we need it**: This change prints all the annotation in Ingress when `kubectl describe ingress` is executed. Right now kubectl assumes all the ingress annotations start with `ingress`. **Release note**: ```release-note NONE ```

Merge pull request #58529 from aledbf/describe-ingress
570f2638 · Kubernetes Submit Queue · GitHub · 9e728532 · a39ae8ee · 570f2638
Unverified Commit 570f2638 authored Jan 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

describe.go pkg/printers/internalversion/describe.go +1 -6

No files found.
--- a/pkg/printers/internalversion/describe.go
+++ b/pkg/printers/internalversion/describe.go
@@ -2074,12 +2074,7 @@ func describeIngressTLS(w PrefixWriter, ingTLS []extensions.IngressTLS) {
 func describeIngressAnnotations(w PrefixWriter, annotations map[string]string) {
 	w.Write(LEVEL_0, "Annotations:\n")
 	for k, v := range annotations {
-		if !strings.HasPrefix(k, "ingress") {
-			continue
-		}
-		parts := strings.Split(k, "/")
-		name := parts[len(parts)-1]
-		w.Write(LEVEL_1, "%v:\t%s\n", name, v)
+		w.Write(LEVEL_1, "%v:\t%s\n", k, v)
 	}
 	return
 }