Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove old reapers #19616

Merged
merged 2 commits into from
May 7, 2018
Merged

remove old reapers #19616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
247dd30
remove old reapers
deads2k May 3, 2018
3ddc5c7
UPSTREAM: 63490: default the ignorenotfound for delete when selecting…
deads2k May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions pkg/oc/admin/diagnostics/diagnostics/cluster/app_create/setup_cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions pkg/oc/cli/builds/doc.go
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions pkg/oc/cli/builds/reaper.go
View file
Open in desktop

This file was deleted.

Loading