github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #60566 from serathius/fix-stackdriver-logging-test 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix stackdriver logging test

Fixes https://k8s-testgrid.appspot.com/google-gce#gci-gce-sd-logging

Removes location verification that was used for event-exporter tests.

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2018-03-05 03:11:23 -08:00 committed by GitHub
parent f9898c3145 53f7b3e5c6
commit a81787052c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/instrumentation/logging/utils/wait.go
View File

@ -48,9 +48,6 @@ func UntilFirstEntryFromLog(log string) IngestionPred {
return func(_ string, entries []LogEntry) (bool, error) {
for _, e := range entries {
if e.LogName == log {
if e.Location != framework.TestContext.CloudConfig.Zone {
return false, fmt.Errorf("Bad location in logs '%s' != '%d'", e.Location, framework.TestContext.CloudConfig.Zone)
}
return true, nil
}
}