kubectl describe: show multiple labels/annotations on multiple lines.

When there is more than one label/annotation, it's more readable to see
them on the different lines.
This commit is contained in:
Slava Semushin
2016-04-07 20:21:58 +02:00
parent 7a725418af
commit 72b4b54f28
2 changed files with 52 additions and 25 deletions

View File

@@ -635,7 +635,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
{"Name:", "redis-master-"},
{"Namespace:", ns},
{"Node:"},
{"Labels:", "app=redis", "role=master"},
{"Labels:", "app=redis"},
{"role=master"},
{"Status:", "Running"},
{"IP:"},
{"Controllers:", "ReplicationController/redis-master"},
@@ -653,7 +654,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
{"Namespace:", ns},
{"Image(s):", "redis"},
{"Selector:", "app=redis,role=master"},
{"Labels:", "app=redis,role=master"},
{"Labels:", "app=redis"},
{"role=master"},
{"Replicas:", "1 current", "1 desired"},
{"Pods Status:", "1 Running", "0 Waiting", "0 Succeeded", "0 Failed"},
// {"Events:"} would ordinarily go in the list
@@ -669,7 +671,8 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
requiredStrings = [][]string{
{"Name:", "redis-master"},
{"Namespace:", ns},
{"Labels:", "app=redis", "role=master"},
{"Labels:", "app=redis"},
{"role=master"},
{"Selector:", "app=redis", "role=master"},
{"Type:", "ClusterIP"},
{"IP:"},