github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21351 from smarterclayton/optional_pod_status

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-21 04:10:19 -08:00
parent 7462f8cb47 778fb1798b
commit e34a23b289
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/kubectl.go
View File

@@ -567,14 +567,15 @@ var _ = Describe("Kubectl client", func() {
requiredStrings := [][]string{
{"Name:", "redis-master-"},
{"Namespace:", ns},
{"Image(s):", "redis"},
{"Node:"},
{"Labels:", "app=redis", "role=master"},
{"Status:", "Running"},
{"Reason:"},
{"Message:"},
{"IP:"},
{"Controllers:", "ReplicationController/redis-master"}}
{"Controllers:", "ReplicationController/redis-master"},
{"Image:", "redis"},
{"cpu:", "BestEffort"},
{"State:", "Running"},
}
checkOutput(output, requiredStrings)
})