@@ -1931,6 +1931,7 @@ _oadm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -5881,6 +5881,7 @@ _oc_adm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -2749,6 +2749,7 @@ _openshift_admin_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -10029,6 +10030,7 @@ _openshift_cli_adm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -2092,6 +2092,7 @@ _oadm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -6042,6 +6042,7 @@ _oc_adm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -2910,6 +2910,7 @@ _openshift_admin_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -10190,6 +10191,7 @@ _openshift_cli_adm_prune_images()

     flags+=("--confirm")

     flags+=("--keep-tag-revisions=")

     flags+=("--keep-younger-than=")

+    flags+=("--prune-over-size-limit")

     flags+=("--registry-url=")

     flags+=("--api-version=")

     flags+=("--as=")

@@ -523,6 +523,13 @@ Remove unreferenced images

   # To actually perform the prune operation, the confirm flag must be appended

   oadm prune images --keep-tag-revisions=3 --keep-younger-than=60m --confirm

+

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  oadm prune images --prune-over-size-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  oadm prune images --prune-over-size-limit --confirm

 ----

 ====

@@ -523,6 +523,13 @@ Remove unreferenced images

   # To actually perform the prune operation, the confirm flag must be appended

   oc adm prune images --keep-tag-revisions=3 --keep-younger-than=60m --confirm

+

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  oc adm prune images --prune-over-size-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  oc adm prune images --prune-over-size-limit --confirm

 ----

 ====

@@ -42,6 +42,10 @@ images.

     Specify the minimum age of an image for it to be considered a candidate for pruning.

 .PP

+\fB\-\-prune\-over\-size\-limit\fP=false

+    Specify if images which are exceeding LimitRanges (see 'openshift.io/Image'), specified in the same namespace, should be considered for pruning. This flag cannot be combined with \-\-keep\-younger\-than nor \-\-keep\-tag\-revisions.

+

+.PP

 \fB\-\-registry\-url\fP=""

     The address to use when contacting the registry, instead of using the default value. This is useful if you can't resolve or reach the registry (e.g.; the default is a cluster\-internal URL) but you do have an alternative route that works.

@@ -120,6 +124,13 @@ images.

   # To actually perform the prune operation, the confirm flag must be appended

   oadm prune images \-\-keep\-tag\-revisions=3 \-\-keep\-younger\-than=60m \-\-confirm

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  oadm prune images \-\-prune\-over\-size\-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  oadm prune images \-\-prune\-over\-size\-limit \-\-confirm

+

 .fi

 .RE

@@ -42,6 +42,10 @@ images.

     Specify the minimum age of an image for it to be considered a candidate for pruning.

 .PP

+\fB\-\-prune\-over\-size\-limit\fP=false

+    Specify if images which are exceeding LimitRanges (see 'openshift.io/Image'), specified in the same namespace, should be considered for pruning. This flag cannot be combined with \-\-keep\-younger\-than nor \-\-keep\-tag\-revisions.

+

+.PP

 \fB\-\-registry\-url\fP=""

     The address to use when contacting the registry, instead of using the default value. This is useful if you can't resolve or reach the registry (e.g.; the default is a cluster\-internal URL) but you do have an alternative route that works.

@@ -120,6 +124,13 @@ images.

   # To actually perform the prune operation, the confirm flag must be appended

   oc adm prune images \-\-keep\-tag\-revisions=3 \-\-keep\-younger\-than=60m \-\-confirm

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  oc adm prune images \-\-prune\-over\-size\-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  oc adm prune images \-\-prune\-over\-size\-limit \-\-confirm

+

 .fi

 .RE

@@ -42,6 +42,10 @@ images.

     Specify the minimum age of an image for it to be considered a candidate for pruning.

 .PP

+\fB\-\-prune\-over\-size\-limit\fP=false

+    Specify if images which are exceeding LimitRanges (see 'openshift.io/Image'), specified in the same namespace, should be considered for pruning. This flag cannot be combined with \-\-keep\-younger\-than nor \-\-keep\-tag\-revisions.

+

+.PP

 \fB\-\-registry\-url\fP=""

     The address to use when contacting the registry, instead of using the default value. This is useful if you can't resolve or reach the registry (e.g.; the default is a cluster\-internal URL) but you do have an alternative route that works.

@@ -120,6 +124,13 @@ images.

   # To actually perform the prune operation, the confirm flag must be appended

   openshift admin prune images \-\-keep\-tag\-revisions=3 \-\-keep\-younger\-than=60m \-\-confirm

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  openshift admin prune images \-\-prune\-over\-size\-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  openshift admin prune images \-\-prune\-over\-size\-limit \-\-confirm

+

 .fi

 .RE

@@ -42,6 +42,10 @@ images.

     Specify the minimum age of an image for it to be considered a candidate for pruning.

 .PP

+\fB\-\-prune\-over\-size\-limit\fP=false

+    Specify if images which are exceeding LimitRanges (see 'openshift.io/Image'), specified in the same namespace, should be considered for pruning. This flag cannot be combined with \-\-keep\-younger\-than nor \-\-keep\-tag\-revisions.

+

+.PP

 \fB\-\-registry\-url\fP=""

     The address to use when contacting the registry, instead of using the default value. This is useful if you can't resolve or reach the registry (e.g.; the default is a cluster\-internal URL) but you do have an alternative route that works.

@@ -120,6 +124,13 @@ images.

   # To actually perform the prune operation, the confirm flag must be appended

   openshift cli adm prune images \-\-keep\-tag\-revisions=3 \-\-keep\-younger\-than=60m \-\-confirm

+  # See, what the prune command would delete if we're interested in removing images

+  # exceeding currently set LimitRanges ('openshift.io/Image')

+  openshift cli adm prune images \-\-prune\-over\-size\-limit

+

+  # To actually perform the prune operation, the confirm flag must be appended

+  openshift cli adm prune images \-\-prune\-over\-size\-limit \-\-confirm

+

 .fi

 .RE

@@ -3,37 +3,58 @@ package prune

 import (

 	"time"

+	"github.com/golang/glog"

+

 	buildapi "github.com/openshift/origin/pkg/build/api"

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

 )

-// PruneFunc is a function that is invoked for each item during Prune

-type PruneFunc func(build *buildapi.Build) error

+type Pruner interface {

+	// Prune is responsible for actual removal of builds identified as candidates

+	// for pruning based on pruning algorithm.

+	Prune(deleter BuildDeleter) error

+}

-type PruneTasker interface {

-	// PruneTask is an object that knows how to execute a single iteration of a Prune

-	PruneTask() error

+// BuildDeleter knows how to delete builds from OpenShift.

+type BuildDeleter interface {

+	// DeleteBuild removes the build from OpenShift's storage.

+	DeleteBuild(build *buildapi.Build) error

 }

-// pruneTask is an object that knows how to prune a data set

-type pruneTask struct {

+// pruner is an object that knows how to prune a data set

+type pruner struct {

 	resolver Resolver

-	handler  PruneFunc

 }

-// NewPruneTasker returns a PruneTasker over specified data using specified flags

-// keepYoungerThan will filter out all objects from prune data set that are younger than the specified time duration

-// orphans if true will include inactive orphan builds in candidate prune set

-// keepComplete is per BuildConfig how many of the most recent builds should be preserved

-// keepFailed is per BuildConfig how many of the most recent failed builds should be preserved

-func NewPruneTasker(buildConfigs []*buildapi.BuildConfig, builds []*buildapi.Build, keepYoungerThan time.Duration, orphans bool, keepComplete int, keepFailed int, handler PruneFunc) PruneTasker {

+var _ Pruner = &pruner{}

+

+// PrunerOptions contains the fields used to initialize a new Pruner.

+type PrunerOptions struct {

+	// KeepYoungerThan indicates the minimum age a BuildConfig must be to be a

+	// candidate for pruning.

+	KeepYoungerThan time.Duration

+	// Orphans if true will include inactive orphan builds in candidate prune set

+	Orphans bool

+	// KeepComplete is per BuildConfig how many of the most recent builds should be preserved

+	KeepComplete int

+	// KeepFailed is per BuildConfig how many of the most recent failed builds should be preserved

+	KeepFailed int

+	// BuildConfigs is the entire list of buildconfigs across all namespaces in the cluster.

+	BuildConfigs []*buildapi.BuildConfig

+	// Builds is the entire list of builds across all namespaces in the cluster.

+	Builds []*buildapi.Build

+}

+

+// NewPruner returns a Pruner over specified data using specified options.

+func NewPruner(options PrunerOptions) Pruner {

 	filter := &andFilter{

-		filterPredicates: []FilterPredicate{NewFilterBeforePredicate(keepYoungerThan)},

+		filterPredicates: []FilterPredicate{NewFilterBeforePredicate(options.KeepYoungerThan)},

 	}

-	builds = filter.Filter(builds)

-	dataSet := NewDataSet(buildConfigs, builds)

+	builds := filter.Filter(options.Builds)

+	dataSet := NewDataSet(options.BuildConfigs, builds)

 	resolvers := []Resolver{}

-	if orphans {

+	if options.Orphans {

 		inactiveBuildStatus := []buildapi.BuildPhase{

 			buildapi.BuildPhaseCancelled,

 			buildapi.BuildPhaseComplete,

@@ -42,24 +63,42 @@ func NewPruneTasker(buildConfigs []*buildapi.BuildConfig, builds []*buildapi.Bui

 		}

 		resolvers = append(resolvers, NewOrphanBuildResolver(dataSet, inactiveBuildStatus))

 	}

-	resolvers = append(resolvers, NewPerBuildConfigResolver(dataSet, keepComplete, keepFailed))

-	return &pruneTask{

+	resolvers = append(resolvers, NewPerBuildConfigResolver(dataSet, options.KeepComplete, options.KeepFailed))

+

+	return &pruner{

 		resolver: &mergeResolver{resolvers: resolvers},

-		handler:  handler,

 	}

 }

-// PruneTask will visit each item in the prunable set and invoke the associated handler

-func (t *pruneTask) PruneTask() error {

-	builds, err := t.resolver.Resolve()

+// Prune will visit each item in the prunable set and invoke the associated BuildDeleter.

+func (p *pruner) Prune(deleter BuildDeleter) error {

+	builds, err := p.resolver.Resolve()

 	if err != nil {

 		return err

 	}

 	for _, build := range builds {

-		err = t.handler(build)

-		if err != nil {

+		if err := deleter.DeleteBuild(build); err != nil {

 			return err

 		}

 	}

 	return nil

 }

+

+// buildDeleter removes a build from OpenShift.

+type buildDeleter struct {

+	builds client.BuildsNamespacer

+}

+

+var _ BuildDeleter = &buildDeleter{}

+

+// NewBuildDeleter creates a new buildDeleter.

+func NewBuildDeleter(builds client.BuildsNamespacer) BuildDeleter {

+	return &buildDeleter{

+		builds: builds,

+	}

+}

+

+func (p *buildDeleter) DeleteBuild(build *buildapi.Build) error {

+	glog.V(4).Infof("Deleting build %q", build.Name)

+	return p.builds.Builds(build.Namespace).Delete(build.Name)

+}

@@ -11,17 +11,19 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 )

-type mockPruneRecorder struct {

+type mockDeleteRecorder struct {

 	set sets.String

 	err error

 }

-func (m *mockPruneRecorder) Handler(build *buildapi.Build) error {

+var _ BuildDeleter = &mockDeleteRecorder{}

+

+func (m *mockDeleteRecorder) DeleteBuild(build *buildapi.Build) error {

 	m.set.Insert(build.Name)

 	return m.err

 }

-func (m *mockPruneRecorder) Verify(t *testing.T, expected sets.String) {

+func (m *mockDeleteRecorder) Verify(t *testing.T, expected sets.String) {

 	if len(m.set) != len(expected) || !m.set.HasAll(expected.List()...) {

 		expectedValues := expected.List()

 		actualValues := m.set.List()

@@ -84,14 +86,25 @@ func TestPruneTask(t *testing.T) {

 				}

 			}

 			expectedBuilds, err := resolver.Resolve()

+			if err != nil {

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

+			}

 			for _, build := range expectedBuilds {

 				expectedValues.Insert(build.Name)

 			}

-			recorder := &mockPruneRecorder{set: sets.String{}}

-			task := NewPruneTasker(buildConfigs, builds, keepYoungerThan, orphans, keepComplete, keepFailed, recorder.Handler)

-			err = task.PruneTask()

-			if err != nil {

+			recorder := &mockDeleteRecorder{set: sets.String{}}

+

+			options := PrunerOptions{

+				KeepYoungerThan: keepYoungerThan,

+				Orphans:         orphans,

+				KeepComplete:    keepComplete,

+				KeepFailed:      keepFailed,

+				BuildConfigs:    buildConfigs,

+				Builds:          builds,

+			}

+			pruner := NewPruner(options)

+			if err := pruner.Prune(recorder); err != nil {

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

 			}

 			recorder.Verify(t, expectedValues)

@@ -7,14 +7,14 @@ import (

 	"text/tabwriter"

 	"time"

-	"github.com/golang/glog"

 	"github.com/spf13/cobra"

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

-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

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

 	buildapi "github.com/openshift/origin/pkg/build/api"

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

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

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

 )

@@ -34,98 +34,151 @@ By default, the prune operation performs a dry run making no changes to internal

   %[1]s %[2]s --orphans --confirm`

 )

-type pruneBuildsConfig struct {

+// PruneBuildsOptions holds all the required options for pruning builds.

+type PruneBuildsOptions struct {

 	Confirm         bool

-	KeepYoungerThan time.Duration

 	Orphans         bool

+	KeepYoungerThan time.Duration

 	KeepComplete    int

 	KeepFailed      int

+

+	Pruner prune.Pruner

+	Client client.Interface

+	Out    io.Writer

 }

+// NewCmdPruneBuilds implements the OpenShift cli prune builds command.

 func NewCmdPruneBuilds(f *clientcmd.Factory, parentName, name string, out io.Writer) *cobra.Command {

-	cfg := &pruneBuildsConfig{

+	opts := &PruneBuildsOptions{

 		Confirm:         false,

-		KeepYoungerThan: 60 * time.Minute,

 		Orphans:         false,

+		KeepYoungerThan: 60 * time.Minute,

 		KeepComplete:    5,

 		KeepFailed:      1,

 	}

-

 	cmd := &cobra.Command{

 		Use:     name,

 		Short:   "Remove old completed and failed builds",

 		Long:    buildsLongDesc,

 		Example: fmt.Sprintf(buildsExample, parentName, name),

-

 		Run: func(cmd *cobra.Command, args []string) {

-			if len(args) > 0 {

-				glog.Fatalf("No arguments are allowed to this command")

-			}

-

-			osClient, _, err := f.Clients()

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

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

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

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

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

-			buildConfigs := []*buildapi.BuildConfig{}

-			for i := range buildConfigList.Items {

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

-			}

-

-			builds := []*buildapi.Build{}

-			for i := range buildList.Items {

-				builds = append(builds, &buildList.Items[i])

-			}

-

-			var buildPruneFunc prune.PruneFunc

-

-			w := tabwriter.NewWriter(out, 10, 4, 3, ' ', 0)

-			defer w.Flush()

-

-			describingPruneBuildFunc := func(build *buildapi.Build) error {

-				fmt.Fprintf(w, "%s\t%s\n", build.Namespace, build.Name)

-				return nil

-			}

-

-			switch cfg.Confirm {

-			case true:

-				buildPruneFunc = func(build *buildapi.Build) error {

-					describingPruneBuildFunc(build)

-					err := osClient.Builds(build.Namespace).Delete(build.Name)

-					if err != nil {

-						return err

-					}

-					return nil

-				}

-			default:

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

-				buildPruneFunc = describingPruneBuildFunc

-			}

-

-			fmt.Fprintln(w, "NAMESPACE\tNAME")

-			pruneTask := prune.NewPruneTasker(buildConfigs, builds, cfg.KeepYoungerThan, cfg.Orphans, cfg.KeepComplete, cfg.KeepFailed, buildPruneFunc)

-			err = pruneTask.PruneTask()

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

+			kcmdutil.CheckErr(opts.Complete(f, cmd, args, out))

+			kcmdutil.CheckErr(opts.Validate())

+			kcmdutil.CheckErr(opts.Run())

 		},

 	}

-	cmd.Flags().BoolVar(&cfg.Confirm, "confirm", cfg.Confirm, "Specify that build pruning should proceed. Defaults to false, displaying what would be deleted but not actually deleting anything.")

-	cmd.Flags().BoolVar(&cfg.Orphans, "orphans", cfg.Orphans, "Prune all builds whose associated BuildConfig no longer exists and whose status is complete, failed, error, or cancelled.")

-	cmd.Flags().DurationVar(&cfg.KeepYoungerThan, "keep-younger-than", cfg.KeepYoungerThan, "Specify the minimum age of a Build for it to be considered a candidate for pruning.")

-	cmd.Flags().IntVar(&cfg.KeepComplete, "keep-complete", cfg.KeepComplete, "Per BuildConfig, specify the number of builds whose status is complete that will be preserved.")

-	cmd.Flags().IntVar(&cfg.KeepFailed, "keep-failed", cfg.KeepFailed, "Per BuildConfig, specify the number of builds whose status is failed, error, or cancelled that will be preserved.")

+	cmd.Flags().BoolVar(&opts.Confirm, "confirm", opts.Confirm, "Specify that build pruning should proceed. Defaults to false, displaying what would be deleted but not actually deleting anything.")

+	cmd.Flags().BoolVar(&opts.Orphans, "orphans", opts.Orphans, "Prune all builds whose associated BuildConfig no longer exists and whose status is complete, failed, error, or cancelled.")

+	cmd.Flags().DurationVar(&opts.KeepYoungerThan, "keep-younger-than", opts.KeepYoungerThan, "Specify the minimum age of a Build for it to be considered a candidate for pruning.")

+	cmd.Flags().IntVar(&opts.KeepComplete, "keep-complete", opts.KeepComplete, "Per BuildConfig, specify the number of builds whose status is complete that will be preserved.")

+	cmd.Flags().IntVar(&opts.KeepFailed, "keep-failed", opts.KeepFailed, "Per BuildConfig, specify the number of builds whose status is failed, error, or cancelled that will be preserved.")

 	return cmd

 }

+

+// Complete turns a partially defined PruneBuildsOptions into a solvent structure

+// which can be validated and used for pruning builds.

+func (o *PruneBuildsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []string, out io.Writer) error {

+	if len(args) > 0 {

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

+	}

+

+	o.Out = out

+

+	osClient, _, err := f.Clients()

+	if err != nil {

+		return err

+	}

+	o.Client = osClient

+

+	buildConfigList, err := osClient.BuildConfigs(kapi.NamespaceAll).List(kapi.ListOptions{})

+	if err != nil {

+		return err

+	}

+	buildConfigs := []*buildapi.BuildConfig{}

+	for i := range buildConfigList.Items {

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

+	}

+

+	buildList, err := osClient.Builds(kapi.NamespaceAll).List(kapi.ListOptions{})

+	if err != nil {

+		return err

+	}

+	builds := []*buildapi.Build{}

+	for i := range buildList.Items {

+		builds = append(builds, &buildList.Items[i])

+	}

+

+	options := prune.PrunerOptions{

+		KeepYoungerThan: o.KeepYoungerThan,

+		Orphans:         o.Orphans,

+		KeepComplete:    o.KeepComplete,

+		KeepFailed:      o.KeepFailed,

+		BuildConfigs:    buildConfigs,

+		Builds:          builds,

+	}

+

+	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)

+	} else {

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

+	}

+

+	return o.Pruner.Prune(buildDeleter)

+}

+

+// describingBuildDeleter prints information about each build it removes.

+// If a delegate exists, its DeleteBuild function is invoked prior to returning.

+type describingBuildDeleter struct {

+	w             io.Writer

+	delegate      prune.BuildDeleter

+	headerPrinted bool

+}

+

+var _ prune.BuildDeleter = &describingBuildDeleter{}

+

+func (p *describingBuildDeleter) DeleteBuild(build *buildapi.Build) error {

+	if !p.headerPrinted {

+		p.headerPrinted = true

+		fmt.Fprintln(p.w, "NAMESPACE\tNAME")

+	}

+

+	fmt.Fprintf(p.w, "%s\t%s\n", build.Namespace, build.Name)

+

+	if p.delegate == nil {

+		return nil

+	}

+

+	if err := p.delegate.DeleteBuild(build); err != nil {

+		return err

+	}

+

+	return nil

+}

@@ -7,16 +7,15 @@ import (

 	"text/tabwriter"

 	"time"

-	"github.com/golang/glog"

 	"github.com/spf13/cobra"

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

-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

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

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

 	"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 PruneDeploymentsRecommendedName = "deployments"

@@ -35,16 +34,22 @@ A --confirm flag is needed for changes to be effective.

   %[1]s %[2]s --keep-complete=1 --confirm`

 )

-type pruneDeploymentConfig struct {

+// PruneDeploymentsOptions holds all the required options for pruning deployments.

+type PruneDeploymentsOptions struct {

 	Confirm         bool

-	KeepYoungerThan time.Duration

 	Orphans         bool

+	KeepYoungerThan time.Duration

 	KeepComplete    int

 	KeepFailed      int

+

+	Pruner prune.Pruner

+	Client kclient.Interface

+	Out    io.Writer

 }

+// NewCmdPruneDeployments implements the OpenShift cli prune deployments command.

 func NewCmdPruneDeployments(f *clientcmd.Factory, parentName, name string, out io.Writer) *cobra.Command {

-	cfg := &pruneDeploymentConfig{

+	opts := &PruneDeploymentsOptions{

 		Confirm:         false,

 		KeepYoungerThan: 60 * time.Minute,

 		KeepComplete:    5,

@@ -58,84 +63,123 @@ func NewCmdPruneDeployments(f *clientcmd.Factory, parentName, name string, out i

 		Example:    fmt.Sprintf(deploymentsExample, parentName, name),

 		SuggestFor: []string{"deployment", "deployments"},

 		Run: func(cmd *cobra.Command, args []string) {

-			if len(args) > 0 {

-				glog.Fatalf("No arguments are allowed to this command")

-			}

-

-			osClient, kclient, err := f.Clients()

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

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

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

-			deploymentList, err := kclient.ReplicationControllers(kapi.NamespaceAll).List(kapi.ListOptions{})

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

-

-			deploymentConfigs := []*deployapi.DeploymentConfig{}

-			for i := range deploymentConfigList.Items {

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

-			}

-

-			deployments := []*kapi.ReplicationController{}

-			for i := range deploymentList.Items {

-				deployments = append(deployments, &deploymentList.Items[i])

-			}

-

-			var deploymentPruneFunc prune.PruneFunc

-

-			w := tabwriter.NewWriter(out, 10, 4, 3, ' ', 0)

-			defer w.Flush()

-

-			describingPruneDeploymentFunc := func(deployment *kapi.ReplicationController) error {

-				fmt.Fprintf(w, "%s\t%s\n", deployment.Namespace, deployment.Name)

-				return nil

-			}

-

-			switch cfg.Confirm {

-			case true:

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

-					describingPruneDeploymentFunc(deployment)

-					// 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(kapi.ListOptions{LabelSelector: dpSelector})

-						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 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")

-				deploymentPruneFunc = describingPruneDeploymentFunc

-			}

-

-			fmt.Fprintln(w, "NAMESPACE\tNAME")

-			pruneTask := prune.NewPruneTasker(deploymentConfigs, deployments, cfg.KeepYoungerThan, cfg.Orphans, cfg.KeepComplete, cfg.KeepFailed, deploymentPruneFunc)

-			err = pruneTask.PruneTask()

-			if err != nil {

-				cmdutil.CheckErr(err)

-			}

+			kcmdutil.CheckErr(opts.Complete(f, cmd, args, out))

+			kcmdutil.CheckErr(opts.Validate())

+			kcmdutil.CheckErr(opts.Run())

 		},

 	}

-	cmd.Flags().BoolVar(&cfg.Confirm, "confirm", cfg.Confirm, "Specify that deployment pruning should proceed. Defaults to false, displaying what would be deleted but not actually deleting anything.")

-	cmd.Flags().BoolVar(&cfg.Orphans, "orphans", cfg.Orphans, "Prune all deployments where the associated DeploymentConfig no longer exists, the status is complete or failed, and the replica size is 0.")

-	cmd.Flags().DurationVar(&cfg.KeepYoungerThan, "keep-younger-than", cfg.KeepYoungerThan, "Specify the minimum age of a deployment for it to be considered a candidate for pruning.")

-	cmd.Flags().IntVar(&cfg.KeepComplete, "keep-complete", cfg.KeepComplete, "Per DeploymentConfig, specify the number of deployments whose status is complete that will be preserved whose replica size is 0.")

-	cmd.Flags().IntVar(&cfg.KeepFailed, "keep-failed", cfg.KeepFailed, "Per DeploymentConfig, specify the number of deployments whose status is failed that will be preserved whose replica size is 0.")

+	cmd.Flags().BoolVar(&opts.Confirm, "confirm", opts.Confirm, "Specify that deployment pruning should proceed. Defaults to false, displaying what would be deleted but not actually deleting anything.")

+	cmd.Flags().BoolVar(&opts.Orphans, "orphans", opts.Orphans, "Prune all deployments where the associated DeploymentConfig no longer exists, the status is complete or failed, and the replica size is 0.")

+	cmd.Flags().DurationVar(&opts.KeepYoungerThan, "keep-younger-than", opts.KeepYoungerThan, "Specify the minimum age of a deployment for it to be considered a candidate for pruning.")

+	cmd.Flags().IntVar(&opts.KeepComplete, "keep-complete", opts.KeepComplete, "Per DeploymentConfig, specify the number of deployments whose status is complete that will be preserved whose replica size is 0.")

+	cmd.Flags().IntVar(&opts.KeepFailed, "keep-failed", opts.KeepFailed, "Per DeploymentConfig, specify the number of deployments whose status is failed that will be preserved whose replica size is 0.")

 	return cmd

 }

+

+// Complete turns a partially defined PruneDeploymentsOptions into a solvent structure

+// which can be validated and used for pruning deployments.

+func (o *PruneDeploymentsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []string, out io.Writer) error {

+	if len(args) > 0 {

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

+	}

+

+	o.Out = out

+

+	osClient, kClient, err := f.Clients()

+	if err != nil {

+		return err

+	}

+	o.Client = kClient

+

+	deploymentConfigList, err := osClient.DeploymentConfigs(kapi.NamespaceAll).List(kapi.ListOptions{})

+	if err != nil {

+		return err

+	}

+	deploymentConfigs := []*deployapi.DeploymentConfig{}

+	for i := range deploymentConfigList.Items {

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

+	}

+

+	deploymentList, err := kClient.ReplicationControllers(kapi.NamespaceAll).List(kapi.ListOptions{})

+	if err != nil {

+		return err

+	}

+	deployments := []*kapi.ReplicationController{}

+	for i := range deploymentList.Items {

+		deployments = append(deployments, &deploymentList.Items[i])

+	}

+

+	options := prune.PrunerOptions{

+		KeepYoungerThan:   o.KeepYoungerThan,

+		Orphans:           o.Orphans,

+		KeepComplete:      o.KeepComplete,

+		KeepFailed:        o.KeepFailed,

+		DeploymentConfigs: deploymentConfigs,

+		Deployments:       deployments,

+	}

+

+	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)

+	} else {

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

+	}

+

+	return o.Pruner.Prune(deploymentDeleter)

+}

+

+// describingDeploymentDeleter prints information about each deployment it removes.

+// If a delegate exists, its DeleteDeployment function is invoked prior to returning.

+type describingDeploymentDeleter struct {

+	w             io.Writer

+	delegate      prune.DeploymentDeleter

+	headerPrinted bool

+}

+

+var _ prune.DeploymentDeleter = &describingDeploymentDeleter{}

+

+func (p *describingDeploymentDeleter) DeleteDeployment(deployment *kapi.ReplicationController) error {

+	if !p.headerPrinted {

+		p.headerPrinted = true

+		fmt.Fprintln(p.w, "NAMESPACE\tNAME")

+	}

+

+	fmt.Fprintf(p.w, "%s\t%s\n", deployment.Namespace, deployment.Name)

+

+	if p.delegate == nil {

+		return nil

+	}

+

+	if err := p.delegate.DeleteDeployment(deployment); err != nil {

+		return err

+	}

+

+	return nil

+}

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

 	"io"

 	"io/ioutil"