@@ -41,10 +41,10 @@ type PruneBuildsOptions struct {

 	KeepYoungerThan time.Duration

 	KeepComplete    int

 	KeepFailed      int

+	Namespace       string

-	Pruner prune.Pruner

-	Client client.Interface

-	Out    io.Writer

+	OSClient client.Interface

+	Out      io.Writer

 }

 // NewCmdPruneBuilds implements the OpenShift cli prune builds command.

@@ -84,10 +84,10 @@ func (o *PruneBuildsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 		return kcmdutil.UsageError(cmd, "no arguments are allowed to this command")

 	}

-	namespace := kapi.NamespaceAll

+	o.Namespace = kapi.NamespaceAll

 	if cmd.Flags().Lookup("namespace").Changed {

 		var err error

-		namespace, _, err = f.DefaultNamespace()

+		o.Namespace, _, err = f.DefaultNamespace()

 		if err != nil {

 			return err

 		}

@@ -98,9 +98,28 @@ func (o *PruneBuildsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 	if err != nil {

 		return err

 	}

-	o.Client = osClient

+	o.OSClient = osClient

-	buildConfigList, err := osClient.BuildConfigs(namespace).List(kapi.ListOptions{})

+	return nil

+}

+

+// Validate ensures that a PruneBuildsOptions is valid and can be used to execute pruning.

+func (o PruneBuildsOptions) Validate() error {

+	if o.KeepYoungerThan < 0 {

+		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

+	}

+	if o.KeepComplete < 0 {

+		return fmt.Errorf("--keep-complete must be greater than or equal to 0")

+	}

+	if o.KeepFailed < 0 {

+		return fmt.Errorf("--keep-failed must be greater than or equal to 0")

+	}

+	return nil

+}

+

+// Run contains all the necessary functionality for the OpenShift cli prune builds command.

+func (o PruneBuildsOptions) Run() error {

+	buildConfigList, err := o.OSClient.BuildConfigs(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

@@ -109,7 +128,7 @@ func (o *PruneBuildsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 		buildConfigs = append(buildConfigs, &buildConfigList.Items[i])

 	}

-	buildList, err := osClient.Builds(namespace).List(kapi.ListOptions{})

+	buildList, err := o.OSClient.Builds(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

@@ -126,40 +145,20 @@ func (o *PruneBuildsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 		BuildConfigs:    buildConfigs,

 		Builds:          builds,

 	}

+	pruner := prune.NewPruner(options)

-	o.Pruner = prune.NewPruner(options)

-

-	return nil

-}

-

-// Validate ensures that a PruneBuildsOptions is valid and can be used to execute pruning.

-func (o PruneBuildsOptions) Validate() error {

-	if o.KeepYoungerThan < 0 {

-		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

-	}

-	if o.KeepComplete < 0 {

-		return fmt.Errorf("--keep-complete must be greater than or equal to 0")

-	}

-	if o.KeepFailed < 0 {

-		return fmt.Errorf("--keep-failed must be greater than or equal to 0")

-	}

-	return nil

-}

-

-// Run contains all the necessary functionality for the OpenShift cli prune builds command.

-func (o PruneBuildsOptions) Run() error {

 	w := tabwriter.NewWriter(o.Out, 10, 4, 3, ' ', 0)

 	defer w.Flush()

 	buildDeleter := &describingBuildDeleter{w: w}

 	if o.Confirm {

-		buildDeleter.delegate = prune.NewBuildDeleter(o.Client)

+		buildDeleter.delegate = prune.NewBuildDeleter(o.OSClient)

 	} else {

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

 	}

-	return o.Pruner.Prune(buildDeleter)

+	return pruner.Prune(buildDeleter)

 }

 // describingBuildDeleter prints information about each build it removes.

new file mode 100644

@@ -0,0 +1,31 @@

+package prune

+

+import (

+	"io/ioutil"

+	"testing"

+

+	"github.com/openshift/origin/pkg/client/testclient"

+)

+

+func TestBuildPruneNamespaced(t *testing.T) {

+	osFake := testclient.NewSimpleFake()

+	opts := &PruneBuildsOptions{

+		Namespace: "foo",

+

+		OSClient: osFake,

+		Out:      ioutil.Discard,

+	}

+

+	if err := opts.Run(); err != nil {

+		t.Errorf("Unexpected error: %v", err)

+	}

+

+	if len(osFake.Actions()) == 0 {

+		t.Errorf("Missing get build actions")

+	}

+	for _, a := range osFake.Actions() {

+		if a.GetNamespace() != "foo" {

+			t.Errorf("Unexpected namespace while pruning %s: %s", a.GetResource(), a.GetNamespace())

+		}

+	}

+}

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

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

+	"github.com/openshift/origin/pkg/client"

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

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

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

@@ -41,10 +42,11 @@ type PruneDeploymentsOptions struct {

 	KeepYoungerThan time.Duration

 	KeepComplete    int

 	KeepFailed      int

+	Namespace       string

-	Pruner prune.Pruner

-	Client kclient.Interface

-	Out    io.Writer

+	OSClient client.Interface

+	KClient  kclient.Interface

+	Out      io.Writer

 }

 // NewCmdPruneDeployments implements the OpenShift cli prune deployments command.

@@ -85,10 +87,10 @@ func (o *PruneDeploymentsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comm

 		return kcmdutil.UsageError(cmd, "no arguments are allowed to this command")

 	}

-	namespace := kapi.NamespaceAll

+	o.Namespace = kapi.NamespaceAll

 	if cmd.Flags().Lookup("namespace").Changed {

 		var err error

-		namespace, _, err = f.DefaultNamespace()

+		o.Namespace, _, err = f.DefaultNamespace()

 		if err != nil {

 			return err

 		}

@@ -99,9 +101,29 @@ func (o *PruneDeploymentsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comm

 	if err != nil {

 		return err

 	}

-	o.Client = kClient

+	o.OSClient = osClient

+	o.KClient = kClient

-	deploymentConfigList, err := osClient.DeploymentConfigs(namespace).List(kapi.ListOptions{})

+	return nil

+}

+

+// Validate ensures that a PruneDeploymentsOptions is valid and can be used to execute pruning.

+func (o PruneDeploymentsOptions) Validate() error {

+	if o.KeepYoungerThan < 0 {

+		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

+	}

+	if o.KeepComplete < 0 {

+		return fmt.Errorf("--keep-complete must be greater than or equal to 0")

+	}

+	if o.KeepFailed < 0 {

+		return fmt.Errorf("--keep-failed must be greater than or equal to 0")

+	}

+	return nil

+}

+

+// Run contains all the necessary functionality for the OpenShift cli prune deployments command.

+func (o PruneDeploymentsOptions) Run() error {

+	deploymentConfigList, err := o.OSClient.DeploymentConfigs(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

@@ -110,7 +132,7 @@ func (o *PruneDeploymentsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comm

 		deploymentConfigs = append(deploymentConfigs, &deploymentConfigList.Items[i])

 	}

-	deploymentList, err := kClient.ReplicationControllers(namespace).List(kapi.ListOptions{})

+	deploymentList, err := o.KClient.ReplicationControllers(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

@@ -127,40 +149,20 @@ func (o *PruneDeploymentsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comm

 		DeploymentConfigs: deploymentConfigs,

 		Deployments:       deployments,

 	}

+	pruner := prune.NewPruner(options)

-	o.Pruner = prune.NewPruner(options)

-

-	return nil

-}

-

-// Validate ensures that a PruneDeploymentsOptions is valid and can be used to execute pruning.

-func (o PruneDeploymentsOptions) Validate() error {

-	if o.KeepYoungerThan < 0 {

-		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

-	}

-	if o.KeepComplete < 0 {

-		return fmt.Errorf("--keep-complete must be greater than or equal to 0")

-	}

-	if o.KeepFailed < 0 {

-		return fmt.Errorf("--keep-failed must be greater than or equal to 0")

-	}

-	return nil

-}

-

-// Run contains all the necessary functionality for the OpenShift cli prune deployments command.

-func (o PruneDeploymentsOptions) Run() error {

 	w := tabwriter.NewWriter(o.Out, 10, 4, 3, ' ', 0)

 	defer w.Flush()

 	deploymentDeleter := &describingDeploymentDeleter{w: w}

 	if o.Confirm {

-		deploymentDeleter.delegate = prune.NewDeploymentDeleter(o.Client, o.Client)

+		deploymentDeleter.delegate = prune.NewDeploymentDeleter(o.KClient, o.KClient)

 	} else {

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

 	}

-	return o.Pruner.Prune(deploymentDeleter)

+	return pruner.Prune(deploymentDeleter)

 }

 // describingDeploymentDeleter prints information about each deployment it removes.

new file mode 100644

@@ -0,0 +1,40 @@

+package prune

+

+import (

+	"io/ioutil"

+	"testing"

+

+	ktestclient "k8s.io/kubernetes/pkg/client/unversioned/testclient"

+

+	"github.com/openshift/origin/pkg/client/testclient"

+)

+

+func TestDeploymentPruneNamespaced(t *testing.T) {

+	kFake := ktestclient.NewSimpleFake()

+	osFake := testclient.NewSimpleFake()

+	opts := &PruneDeploymentsOptions{

+		Namespace: "foo",

+

+		OSClient: osFake,

+		KClient:  kFake,

+		Out:      ioutil.Discard,

+	}

+

+	if err := opts.Run(); err != nil {

+		t.Errorf("Unexpected error: %v", err)

+	}

+

+	if len(osFake.Actions()) == 0 || len(kFake.Actions()) == 0 {

+		t.Errorf("Missing get deployments actions")

+	}

+	for _, a := range osFake.Actions() {

+		if a.GetNamespace() != "foo" {

+			t.Errorf("Unexpected namespace while pruning %s: %s", a.GetResource(), a.GetNamespace())

+		}

+	}

+	for _, a := range kFake.Actions() {

+		if a.GetNamespace() != "foo" {

+			t.Errorf("Unexpected namespace while pruning %s: %s", a.GetResource(), a.GetNamespace())

+		}

+	}

+}

@@ -69,10 +69,12 @@ type PruneImagesOptions struct {

 	PruneOverSizeLimit  *bool

 	CABundle            string

 	RegistryUrlOverride string

+	Namespace           string

-	Pruner prune.Pruner

-	Client client.Interface

-	Out    io.Writer

+	OSClient       client.Interface

+	KClient        kclient.Interface

+	RegistryClient *http.Client

+	Out            io.Writer

 }

 // NewCmdPruneImages implements the OpenShift cli prune images command.

@@ -124,10 +126,10 @@ func (o *PruneImagesOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 	if !cmd.Flags().Lookup("prune-over-size-limit").Changed {

 		o.PruneOverSizeLimit = nil

 	}

-	namespace := kapi.NamespaceAll

+	o.Namespace = kapi.NamespaceAll

 	if cmd.Flags().Lookup("namespace").Changed {

 		var err error

-		namespace, _, err = f.DefaultNamespace()

+		o.Namespace, _, err = f.DefaultNamespace()

 		if err != nil {

 			return err

 		}

@@ -138,48 +140,72 @@ func (o *PruneImagesOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 	if err != nil {

 		return err

 	}

-	o.Client = osClient

+	o.OSClient = osClient

+	o.KClient = kClient

+	o.RegistryClient = registryClient

-	allImages, err := osClient.Images().List(kapi.ListOptions{})

+	return nil

+}

+

+// Validate ensures that a PruneImagesOptions is valid and can be used to execute pruning.

+func (o PruneImagesOptions) Validate() error {

+	if o.PruneOverSizeLimit != nil && (o.KeepYoungerThan != nil || o.KeepTagRevisions != nil) {

+		return fmt.Errorf("--prune-over-size-limit cannot be specified with --keep-tag-revisions nor --keep-younger-than")

+	}

+	if o.KeepYoungerThan != nil && *o.KeepYoungerThan < 0 {

+		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

+	}

+	if o.KeepTagRevisions != nil && *o.KeepTagRevisions < 0 {

+		return fmt.Errorf("--keep-tag-revisions must be greater than or equal to 0")

+	}

+	if _, err := url.Parse(o.RegistryUrlOverride); err != nil {

+		return fmt.Errorf("invalid --registry-url flag: %v", err)

+	}

+	return nil

+}

+

+// Run contains all the necessary functionality for the OpenShift cli prune images command.

+func (o PruneImagesOptions) Run() error {

+	allImages, err := o.OSClient.Images().List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

-	allStreams, err := osClient.ImageStreams(namespace).List(kapi.ListOptions{})

+	allStreams, err := o.OSClient.ImageStreams(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

-	allPods, err := kClient.Pods(namespace).List(kapi.ListOptions{})

+	allPods, err := o.KClient.Pods(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

-	allRCs, err := kClient.ReplicationControllers(namespace).List(kapi.ListOptions{})

+	allRCs, err := o.KClient.ReplicationControllers(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

-	allBCs, err := osClient.BuildConfigs(namespace).List(kapi.ListOptions{})

+	allBCs, err := o.OSClient.BuildConfigs(o.Namespace).List(kapi.ListOptions{})

 	// We need to tolerate 'not found' errors for buildConfigs since they may be disabled in Atomic

 	err = oserrors.TolerateNotFoundError(err)

 	if err != nil {

 		return err

 	}

-	allBuilds, err := osClient.Builds(namespace).List(kapi.ListOptions{})

+	allBuilds, err := o.OSClient.Builds(o.Namespace).List(kapi.ListOptions{})

 	// We need to tolerate 'not found' errors for builds since they may be disabled in Atomic

 	err = oserrors.TolerateNotFoundError(err)

 	if err != nil {

 		return err

 	}

-	allDCs, err := osClient.DeploymentConfigs(namespace).List(kapi.ListOptions{})

+	allDCs, err := o.OSClient.DeploymentConfigs(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

-	limitRangesList, err := kClient.LimitRanges(namespace).List(kapi.ListOptions{})

+	limitRangesList, err := o.KClient.LimitRanges(o.Namespace).List(kapi.ListOptions{})

 	if err != nil {

 		return err

 	}

@@ -207,37 +233,14 @@ func (o *PruneImagesOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 		DCs:                allDCs,

 		LimitRanges:        limitRangesMap,

 		DryRun:             o.Confirm == false,

-		RegistryClient:     registryClient,

+		RegistryClient:     o.RegistryClient,

 		RegistryURL:        o.RegistryUrlOverride,

 	}

-	if namespace != kapi.NamespaceAll {

-		options.Namespace = namespace

+	if o.Namespace != kapi.NamespaceAll {

+		options.Namespace = o.Namespace

 	}

+	pruner := prune.NewPruner(options)

-	o.Pruner = prune.NewPruner(options)

-

-	return nil

-}

-

-// Validate ensures that a PruneImagesOptions is valid and can be used to execute pruning.

-func (o PruneImagesOptions) Validate() error {

-	if o.PruneOverSizeLimit != nil && (o.KeepYoungerThan != nil || o.KeepTagRevisions != nil) {

-		return fmt.Errorf("--prune-over-size-limit cannot be specified with --keep-tag-revisions nor --keep-younger-than")

-	}

-	if o.KeepYoungerThan != nil && *o.KeepYoungerThan < 0 {

-		return fmt.Errorf("--keep-younger-than must be greater than or equal to 0")

-	}

-	if o.KeepTagRevisions != nil && *o.KeepTagRevisions < 0 {

-		return fmt.Errorf("--keep-tag-revisions must be greater than or equal to 0")

-	}

-	if _, err := url.Parse(o.RegistryUrlOverride); err != nil {

-		return fmt.Errorf("invalid --registry-url flag: %v", err)

-	}

-	return nil

-}

-

-// Run contains all the necessary functionality for the OpenShift cli prune images command.

-func (o PruneImagesOptions) Run() error {

 	w := tabwriter.NewWriter(o.Out, 10, 4, 3, ' ', 0)

 	defer w.Flush()

@@ -248,8 +251,8 @@ func (o PruneImagesOptions) Run() error {

 	manifestDeleter := &describingManifestDeleter{w: w}

 	if o.Confirm {

-		imageDeleter.delegate = prune.NewImageDeleter(o.Client.Images())

-		imageStreamDeleter.delegate = prune.NewImageStreamDeleter(o.Client)

+		imageDeleter.delegate = prune.NewImageDeleter(o.OSClient.Images())

+		imageStreamDeleter.delegate = prune.NewImageStreamDeleter(o.OSClient)

 		layerLinkDeleter.delegate = prune.NewLayerLinkDeleter()

 		blobDeleter.delegate = prune.NewBlobDeleter()

 		manifestDeleter.delegate = prune.NewManifestDeleter()

@@ -257,7 +260,7 @@ func (o PruneImagesOptions) Run() error {

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

 	}

-	return o.Pruner.Prune(imageDeleter, imageStreamDeleter, layerLinkDeleter, blobDeleter, manifestDeleter)

+	return pruner.Prune(imageDeleter, imageStreamDeleter, layerLinkDeleter, blobDeleter, manifestDeleter)

 }

 // describingImageStreamDeleter prints information about each image stream update.

new file mode 100644

@@ -0,0 +1,44 @@

+package prune

+

+import (

+	"io/ioutil"

+	"testing"

+

+	ktestclient "k8s.io/kubernetes/pkg/client/unversioned/testclient"

+

+	"github.com/openshift/origin/pkg/client/testclient"

+)

+

+func TestImagePruneNamespaced(t *testing.T) {

+	kFake := ktestclient.NewSimpleFake()

+	osFake := testclient.NewSimpleFake()

+	opts := &PruneImagesOptions{

+		Namespace: "foo",

+

+		OSClient: osFake,

+		KClient:  kFake,

+		Out:      ioutil.Discard,

+	}

+

+	if err := opts.Run(); err != nil {

+		t.Errorf("Unexpected error: %v", err)

+	}

+

+	if len(osFake.Actions()) == 0 || len(kFake.Actions()) == 0 {

+		t.Errorf("Missing get images actions")

+	}

+	for _, a := range osFake.Actions() {

+		// images are non-namespaced

+		if a.GetResource() == "images" {

+			continue

+		}

+		if a.GetNamespace() != "foo" {

+			t.Errorf("Unexpected namespace while pruning %s: %s", a.GetResource(), a.GetNamespace())

+		}

+	}

+	for _, a := range kFake.Actions() {

+		if a.GetNamespace() != "foo" {

+			t.Errorf("Unexpected namespace while pruning %s: %s", a.GetResource(), a.GetNamespace())

+		}

+	}

+}