From 34e9478cd3bdc5d5b5c57090058a8c68c95d2972 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 18 Oct 2015 23:06:36 -0400 Subject: [PATCH] Use pod logs subresource from e2e Means that e2e code doesn't need to access the proxy --- test/e2e/util.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/e2e/util.go b/test/e2e/util.go index 4bc8e78e794..e6326540a84 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -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") {