@@ -18,6 +18,7 @@ import (

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	"github.com/openshift/origin/pkg/deploy/prune"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 const deploymentsLongDesc = `%s %s - Remove older completed and failed deployments`

@@ -89,11 +90,21 @@ func NewCmdPruneDeployments(f *clientcmd.Factory, parentName, name string, out i

 			case true:

 				deploymentPruneFunc = func(deployment *kapi.ReplicationController) error {

 					describingPruneDeploymentFunc(deployment)

-					err := kclient.ReplicationControllers(deployment.Namespace).Delete(deployment.Name)

-					if err != nil {

-						return err

+					// If the deployment is failed we need to remove its deployer pods, too.

+					if deployutil.DeploymentStatusFor(deployment) == deployapi.DeploymentStatusFailed {

+						dpSelector := deployutil.DeployerPodSelector(deployment.Name)

+						deployers, err := kclient.Pods(deployment.Namespace).List(dpSelector, fields.Everything())

+						if err != nil {

+							fmt.Fprintf(os.Stderr, "Cannot list deployer pods for %q: %v\n", deployment.Name, err)

+						} else {

+							for _, pod := range deployers.Items {

+								if err := kclient.Pods(pod.Namespace).Delete(pod.Name, nil); err != nil {

+									fmt.Fprintf(os.Stderr, "Cannot remove deployer pod %q: %v\n", pod.Name, err)

+								}

+							}

+						}

 					}

-					return nil

+					return kclient.ReplicationControllers(deployment.Namespace).Delete(deployment.Name)

 				}

 			default:

 				fmt.Fprintln(os.Stderr, "Dry run enabled - no modifications will be made. Add --confirm to remove deployments")

@@ -111,8 +111,8 @@ func (o *perDeploymentConfigResolver) Resolve() ([]*kapi.ReplicationController,

 				failedDeployments = append(failedDeployments, deployment)

 			}

 		}

-		sort.Sort(sortableReplicationControllers(completeDeployments))

-		sort.Sort(sortableReplicationControllers(failedDeployments))

+		sort.Sort(deployutil.ByMostRecent(completeDeployments))

+		sort.Sort(deployutil.ByMostRecent(failedDeployments))

 		if o.keepComplete >= 0 && o.keepComplete < len(completeDeployments) {

 			results = append(results, completeDeployments[o.keepComplete:]...)

@@ -11,6 +11,7 @@ import (

 	"k8s.io/kubernetes/pkg/util/sets"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 type mockResolver struct {

@@ -150,8 +151,8 @@ func TestPerDeploymentConfigResolver(t *testing.T) {

 					failedDeployments = append(failedDeployments, deployment)

 				}

 			}

-			sort.Sort(sortableReplicationControllers(completedDeployments))

-			sort.Sort(sortableReplicationControllers(failedDeployments))

+			sort.Sort(deployutil.ByMostRecent(completedDeployments))

+			sort.Sort(deployutil.ByMostRecent(failedDeployments))

 			purgeCompleted := []*kapi.ReplicationController{}

 			purgeFailed := []*kapi.ReplicationController{}

 			if keep >= 0 && keep < len(completedDeployments) {

deleted file mode 100644

@@ -1,20 +0,0 @@

-package prune

-

-import (

-	kapi "k8s.io/kubernetes/pkg/api"

-)

-

-// sortableReplicationControllers supports sorting ReplicationController items by most recently created

-type sortableReplicationControllers []*kapi.ReplicationController

-

-func (s sortableReplicationControllers) Len() int {

-	return len(s)

-}

-

-func (s sortableReplicationControllers) Less(i, j int) bool {

-	return !s[i].CreationTimestamp.Before(s[j].CreationTimestamp)

-}

-

-func (s sortableReplicationControllers) Swap(i, j int) {

-	s[i], s[j] = s[j], s[i]

-}

deleted file mode 100644

@@ -1,37 +0,0 @@

-package prune

-

-import (

-	"sort"

-	"testing"

-	"time"

-

-	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/api/unversioned"

-)

-

-// TestSort verifies that builds are sorted by most recently created

-func TestSort(t *testing.T) {

-	present := unversioned.Now()

-	past := unversioned.NewTime(present.Time.Add(-1 * time.Minute))

-	controllers := []*kapi.ReplicationController{

-		{

-			ObjectMeta: kapi.ObjectMeta{

-				Name:              "past",

-				CreationTimestamp: past,

-			},

-		},

-		{

-			ObjectMeta: kapi.ObjectMeta{

-				Name:              "present",

-				CreationTimestamp: present,

-			},

-		},

-	}

-	sort.Sort(sortableReplicationControllers(controllers))

-	if controllers[0].Name != "present" {

-		t.Errorf("Unexpected sort order")

-	}

-	if controllers[1].Name != "past" {

-		t.Errorf("Unexpected sort order")

-	}

-}

@@ -289,3 +289,12 @@ func (d ByLatestVersionDesc) Swap(i, j int) { d[i], d[j] = d[j], d[i] }

 func (d ByLatestVersionDesc) Less(i, j int) bool {

 	return DeploymentVersionFor(&d[j]) < DeploymentVersionFor(&d[i])

 }

+

+// ByMostRecent sorts deployments by most recently created.

+type ByMostRecent []*api.ReplicationController

+

+func (s ByMostRecent) Len() int      { return len(s) }

+func (s ByMostRecent) Swap(i, j int) { s[i], s[j] = s[j], s[i] }

+func (s ByMostRecent) Less(i, j int) bool {

+	return !s[i].CreationTimestamp.Before(s[j].CreationTimestamp)

+}

@@ -4,10 +4,13 @@ import (

 	"sort"

 	"strconv"

 	"testing"

+	"time"

+

+	kapi "k8s.io/kubernetes/pkg/api"

+	"k8s.io/kubernetes/pkg/api/unversioned"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

-	kapi "k8s.io/kubernetes/pkg/api"

 )

 func podTemplateA() *kapi.PodTemplateSpec {

@@ -152,3 +155,30 @@ func TestDeploymentsByLatestVersion_sorting(t *testing.T) {

 		}

 	}

 }

+

+// TestSort verifies that builds are sorted by most recently created

+func TestSort(t *testing.T) {

+	present := unversioned.Now()

+	past := unversioned.NewTime(present.Time.Add(-1 * time.Minute))

+	controllers := []*kapi.ReplicationController{

+		{

+			ObjectMeta: kapi.ObjectMeta{

+				Name:              "past",

+				CreationTimestamp: past,

+			},

+		},

+		{

+			ObjectMeta: kapi.ObjectMeta{

+				Name:              "present",

+				CreationTimestamp: present,

+			},

+		},

+	}

+	sort.Sort(ByMostRecent(controllers))

+	if controllers[0].Name != "present" {

+		t.Errorf("Unexpected sort order")

+	}

+	if controllers[1].Name != "past" {

+		t.Errorf("Unexpected sort order")

+	}

+}