Merge pull request #9030 from brendandburns/kubectl

Add a custom timeout flag for stop/delete.
This commit is contained in:
Brian Grant
2015-06-03 21:14:50 -07:00
12 changed files with 44 additions and 20 deletions

View File

@@ -980,7 +980,7 @@ func DeleteRC(c *client.Client, ns, name string) error {
return err
}
startTime := time.Now()
_, err = reaper.Stop(ns, name, api.NewDeleteOptions(0))
_, err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0))
deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC took: %v", deleteRCTime)
return err