Merge pull request #19616 from deads2k/cli-34-reap

remove old reapers
openshift · May 7, 2018 · fc6ab10 · fc6ab10
2 parents e9dfc23 + 3ddc5c7
commit fc6ab10
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 849 deletions.
diff --git a/pkg/oc/admin/diagnostics/diagnostics/cluster/app_create/setup_cleanup.go b/pkg/oc/admin/diagnostics/diagnostics/cluster/app_create/setup_cleanup.go
@@ -8,10 +8,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	appsutil "github.com/openshift/origin/pkg/apps/util"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	newproject "github.com/openshift/origin/pkg/oc/admin/project"
-	appscmd "github.com/openshift/origin/pkg/oc/cli/deploymentconfigs"
 )
 
 const podGoneTimeout = 30 // seconds to wait for previous app pods to disappear
@@ -82,11 +80,6 @@ func (d *AppCreate) cleanupApp() {
 	errs := []error{}
 	d.out.Debug("DCluAC043", fmt.Sprintf("%s: Deleting components of app '%s' if present.", now(), d.appName))
 
-	// reap the DC's deployments first
-	if err := appscmd.NewDeploymentConfigReaper(d.AppsClient, d.KubeClient, appsutil.NewReplicationControllerV1ScaleClient(d.KubeClient)).Stop(d.project, d.appName, time.Duration(1)*time.Second, nil); err != nil {
-		errs = append(errs, err)
-	}
-
 	// then delete the DC, service, and route
 	if err := d.AppsClient.Apps().DeploymentConfigs(d.project).Delete(d.appName, nil); err != nil {
 		errs = append(errs, err)

diff --git a/pkg/oc/cli/builds/doc.go b/pkg/oc/cli/builds/doc.go
diff --git a/pkg/oc/cli/builds/reaper.go b/pkg/oc/cli/builds/reaper.go