github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-15 19:49:36 +00:00
Code Issues Projects Releases Wiki Activity

Use DeleteOptions.PropagationPolicy instead of OrphanDependents (deprecated) in kubectl

Browse Source
This commit is contained in:
Nail Islamov
2018-02-14 15:32:57 +11:00
parent 23d9a48e6a
commit 3b5afd8809
5 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/cmd/delete.go
View File

@@ -302,12 +302,12 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error {
found++
// if we're here, it means that cascade=false (not the default), so we should orphan as requested
orphan := true
options := &metav1.DeleteOptions{}
if o.GracePeriod >= 0 {
options = metav1.NewDeleteOptions(int64(o.GracePeriod))
}
options.OrphanDependents = &orphan
policy := metav1.DeletePropagationOrphan
options.PropagationPolicy = &policy
return o.deleteResource(info, options)
})
if err != nil {
@@ -350,8 +350,8 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error {
}
func (o *DeleteOptions) cascadingDeleteResource(info *resource.Info) error {
falseVar := false
return o.deleteResource(info, &metav1.DeleteOptions{OrphanDependents: &falseVar})
policy := metav1.DeletePropagationForeground
return o.deleteResource(info, &metav1.DeleteOptions{PropagationPolicy: &policy})
}
func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav1.DeleteOptions) error {