Merge pull request kubernetes#91405 from iyashu/fix/kubectl-describe-empty-annotations

k8s-ci-robot · web-flow · commit d49d045a35a6 · 2020-06-09T10:31:20.000-07:00
Fix kubectl describe output format for empty annotations
diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go
@@ -4719,11 +4719,6 @@ var maxAnnotationLen = 140
 func printAnnotationsMultiline(w PrefixWriter, title string, annotations map[string]string) {
 	w.Write(LEVEL_0, "%s:\t", title)
 
-	if len(annotations) == 0 {
-		w.WriteLine("<none>")
-		return
-	}
-
 	// to print labels in the sorted order
 	keys := make([]string, 0, len(annotations))
 	for key := range annotations {
@@ -4732,7 +4727,7 @@ func printAnnotationsMultiline(w PrefixWriter, title string, annotations map[str
 		}
 		keys = append(keys, key)
 	}
-	if len(annotations) == 0 {
+	if len(keys) == 0 {
 		w.WriteLine("<none>")
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -4719,11 +4719,6 @@ var maxAnnotationLen = 140`
`4719`	`4719`	`func printAnnotationsMultiline(w PrefixWriter, title string, annotations map[string]string) {`
`4720`	`4720`	`w.Write(LEVEL_0, "%s:\t", title)`
`4721`	`4721`
`4722`		`- if len(annotations) == 0 {`
`4723`		`- w.WriteLine("<none>")`
`4724`		`- return`
`4725`		`- }`
`4726`		`-`
`4727`	`4722`	`// to print labels in the sorted order`
`4728`	`4723`	`keys := make([]string, 0, len(annotations))`
`4729`	`4724`	`for key := range annotations {`
`@@ -4732,7 +4727,7 @@ func printAnnotationsMultiline(w PrefixWriter, title string, annotations map[str`
`4732`	`4727`	`}`
`4733`	`4728`	`keys = append(keys, key)`
`4734`	`4729`	`}`
`4735`		`- if len(annotations) == 0 {`
	`4730`	`+ if len(keys) == 0 {`
`4736`	`4731`	`w.WriteLine("<none>")`
`4737`	`4732`	`return`
`4738`	`4733`	`}`