Merge pull request #6546 from lavalamp/fix

Add to controller framework; use in scheduler
This commit is contained in:
Daniel Smith
2015-04-10 16:20:17 -07:00
9 changed files with 533 additions and 63 deletions

View File

@@ -924,6 +924,7 @@ func runSchedulerNoPhantomPodsTest(client *client.Client) {
}
// Delete a pod to free up room.
glog.Infof("Deleting pod %v", bar.Name)
err = client.Pods(api.NamespaceDefault).Delete(bar.Name)
if err != nil {
glog.Fatalf("FAILED: couldn't delete pod %q: %v", bar.Name, err)