github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating reapers to set OrphanDependents=false

Browse Source
This commit is contained in:
nikhiljindal
2017-02-08 16:45:34 -08:00
parent 78ae193de6
commit 9dc31c7f82
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/stop.go
View File

@@ -322,7 +322,9 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
return err return err
} }
return reaper.client.DaemonSets(namespace).Delete(name, nil) falseVar := false
deleteOptions := &metav1.DeleteOptions{OrphanDependents: &falseVar}
return reaper.client.DaemonSets(namespace).Delete(name, deleteOptions)
} }
func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error { func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error {
@@ -366,7 +368,9 @@ func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Durat
// TODO: Cleanup volumes? We don't want to accidentally delete volumes from // TODO: Cleanup volumes? We don't want to accidentally delete volumes from
// stop, so just leave this up to the statefulset. // stop, so just leave this up to the statefulset.
return statefulsets.Delete(name, nil) falseVar := false
deleteOptions := &metav1.DeleteOptions{OrphanDependents: &falseVar}
return statefulsets.Delete(name, deleteOptions)
} }
func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error { func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error {
@@ -408,8 +412,10 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra
if len(errList) > 0 { if len(errList) > 0 {
return utilerrors.NewAggregate(errList) return utilerrors.NewAggregate(errList)
} }
// once we have all the pods removed we can safely remove the job itself // once we have all the pods removed we can safely remove the job itself.
return jobs.Delete(name, nil) falseVar := false
deleteOptions := &metav1.DeleteOptions{OrphanDependents: &falseVar}
return jobs.Delete(name, deleteOptions)
} }
func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error { func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error {
@@ -509,5 +515,7 @@ func (reaper *ServiceReaper) Stop(namespace, name string, timeout time.Duration,
if err != nil { if err != nil {
return err return err
} }
return services.Delete(name, nil) falseVar := false
deleteOptions := &metav1.DeleteOptions{OrphanDependents: &falseVar}
return services.Delete(name, deleteOptions)
} }