github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

let kubectl delete rc and rs using explicit non-orphan delete options

Browse Source
This commit is contained in:
Chao Xu 2016-08-11 11:13:30 -07:00
parent 072798b253
commit bcc1b68d47
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubectl/stop.go
View File

@ -202,7 +202,9 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string, timeout
return err return err
} }
} }
return rc.Delete(name, nil) falseVar := false
deleteOptions := &api.DeleteOptions{OrphanDependents: &falseVar}
return rc.Delete(name, deleteOptions)
} }
// TODO(madhusudancs): Implement it when controllerRef is implemented - https://github.com/kubernetes/kubernetes/issues/2210 // TODO(madhusudancs): Implement it when controllerRef is implemented - https://github.com/kubernetes/kubernetes/issues/2210
@ -274,10 +276,9 @@ func (reaper *ReplicaSetReaper) Stop(namespace, name string, timeout time.Durati
} }
} }
if err := rsc.Delete(name, nil); err != nil { falseVar := false
return err deleteOptions := &api.DeleteOptions{OrphanDependents: &falseVar}
} return rsc.Delete(name, deleteOptions)
return nil
} }
func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) error { func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) error {