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

orphan when kubectl delete --cascade=false

Browse Source
This commit is contained in:
deads2k 2017-05-11 08:07:25 -04:00
parent 640373da10
commit e91716a2db
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,10 @@ func DeleteResult(r *resource.Result, out io.Writer, ignoreNotFound bool, shortO
return err
}
found++
return deleteResource(info, out, shortOutput, mapper, nil)
// if we're here, it means that cascade=false (not the default), so we should orphan as requested
orphan := true
return deleteResource(info, out, shortOutput, mapper, &metav1.DeleteOptions{OrphanDependents: &orphan})
})
if err != nil {
return err

5
pkg/kubectl/cmd/delete_test.go
View File

@ -140,8 +140,9 @@ func TestOrphanDependentsInDeleteObject(t *testing.T) {
t.Errorf("unexpected output: %s", buf.String())
}
// Test that delete options should be nil when cascade is false.
expectedOrphanDependents = nil
// Test that delete options should be set to orphan when cascade is false.
trueVar := true
expectedOrphanDependents = &trueVar
buf, errBuf = bytes.NewBuffer([]byte{}), bytes.NewBuffer([]byte{})
cmd = NewCmdDelete(f, buf, errBuf)
cmd.Flags().Set("namespace", "test")