github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Moving deployment deletion at the end

Browse Source
This commit is contained in:
nikhiljindal
2016-02-24 13:00:45 -08:00
parent 9d7259950b
commit 2a538e317f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/stop.go
View File

@@ -382,11 +382,6 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
return err
}
// Delete deployment.
if err := deployments.Delete(name, gracePeriod); err != nil {
return err
}
// Stop all replica sets.
selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector)
if err != nil {
@@ -409,7 +404,10 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
if len(errList) > 0 {
return utilerrors.NewAggregate(errList)
}
return nil
// Delete deployment at the end.
// Note: We delete deployment at the end so that if removing RSs fails, we atleast have the deployment to retry.
return deployments.Delete(name, gracePeriod)
}
type updateDeploymentFunc func(d *extensions.Deployment)