Merge pull request #15828 from smarterclayton/use_pod_logs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-19 06:02:32 -07:00
commit 58f168315e

View File

@ -1144,10 +1144,11 @@ func testContainerOutputMatcher(scenarioName string,
for time.Now().Sub(start) < (60 * time.Second) {
err = nil
logs, err = c.Get().
Prefix("proxy").
Resource("nodes").
Name(podStatus.Spec.NodeName).
Suffix("containerLogs", ns, podStatus.Name, containerName).
Resource("pods").
Namespace(ns).
Name(pod.Name).
SubResource("log").
Param("container", containerName).
Do().
Raw()
if err == nil && strings.Contains(string(logs), "Internal Error") {