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

Merge pull request #65376 from mindprince/to-done 

Automatic merge from submit-queue (batch tested with PRs 65377, 63837, 65370, 65294, 65376). 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>.

Remove unneeded sleep from test.

The race condition that required this sleep was fixed in google/cadvisor#1969.
That was vendored in #65334.

```release-note
NONE
```

/assign @jiayingz @vishh
pull/8/head
Kubernetes Submit Queue 2018-06-22 16:16:18 -07:00 committed by GitHub
parent 4fa74745d3 9a9c2aedd3
commit 5e9a5659b7
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/monitoring/accelerator.go
View File

@ -74,9 +74,6 @@ func testStackdriverAcceleratorMonitoring(f *framework.Framework) {
scheduling.SetupNVIDIAGPUNode(f, false) scheduling.SetupNVIDIAGPUNode(f, false)
// TODO: remove this after cAdvisor race is fixed.
time.Sleep(time.Minute)
f.PodClient().Create(&v1.Pod{ f.PodClient().Create(&v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: rcName, Name: rcName,