github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15828 from smarterclayton/use_pod_logs

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-19 06:02:32 -07:00
commit 58f168315e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/util.go
View File

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