github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 12:41:58 +00:00
Code Issues Projects Releases Wiki Activity

Properly reap replication controllers in e2e test

Browse Source
This commit is contained in:
Prashanth Balasubramanian
2015-03-06 22:30:56 -08:00
parent b650e481a7
commit 0e484f25b1
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubectl/stop.go
View File

@@ -26,8 +26,9 @@ import (
)
const (
interval = time.Second * 3
timeout = time.Minute * 5
shortInterval = time.Millisecond * 100
interval = time.Second * 3
timeout = time.Minute * 5
)
// A Reaper handles terminating an object as gracefully as possible.
@@ -69,10 +70,12 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string) (string,
if err != nil {
return "", err
}
controller.Spec.Replicas = 0
// TODO: do retry on 409 errors here?
if _, err := rc.Update(controller); err != nil {
resizer, err := ResizerFor("ReplicationController", *reaper)
if err != nil {
return "", err
}
cond := ResizeCondition(resizer, &ResizePrecondition{-1, ""}, namespace, name, 0)
if err = wait.Poll(shortInterval, reaper.timeout, cond); err != nil {
return "", err
}
if err := wait.Poll(reaper.pollInterval, reaper.timeout,