github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8249 from kargakis/stop-fix

Browse Source 
stop: Check for error when resizing rcs
This commit is contained in:
Victor Marmol 2015-05-14 12:56:14 -07:00
commit 75c9228ea2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/stop.go
View File

@ -85,7 +85,9 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string, gracePer
} }
retry := &RetryParams{shortInterval, reaper.timeout} retry := &RetryParams{shortInterval, reaper.timeout}
waitForReplicas := &RetryParams{reaper.pollInterval, reaper.timeout} waitForReplicas := &RetryParams{reaper.pollInterval, reaper.timeout}
err = resizer.Resize(namespace, name, 0, nil, retry, waitForReplicas) if err = resizer.Resize(namespace, name, 0, nil, retry, waitForReplicas); err != nil {
return "", err
}
if err := rc.Delete(name); err != nil { if err := rc.Delete(name); err != nil {
return "", err return "", err
} }