From 2c8840053bb000f857d2e6a39b97ca3753aa833c Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 29 Aug 2018 15:18:04 +0200 Subject: [PATCH] UPSTREAM: 68007: Orphan DaemonSet when deleting with --cascade option set --- vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go index 5c921b6503bb..8a085585aaf9 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go @@ -321,8 +321,9 @@ func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav // TODO: Remove this in or after 1.12 release. // Server version >= 1.11 no longer needs this hack. mapping := info.ResourceMapping() - if mapping.Resource.GroupResource() == (schema.GroupResource{Group: "extensions", Resource: "daemonsets"}) || - mapping.Resource.GroupResource() == (schema.GroupResource{Group: "apps", Resource: "daemonsets"}) { + if (mapping.Resource.GroupResource() == (schema.GroupResource{Group: "extensions", Resource: "daemonsets"}) || + mapping.Resource.GroupResource() == (schema.GroupResource{Group: "apps", Resource: "daemonsets"})) && + (deleteOptions.PropagationPolicy != nil && *deleteOptions.PropagationPolicy != metav1.DeletePropagationOrphan) { if err := updateDaemonSet(info.Namespace, info.Name, o.DynamicClient); err != nil { return nil, err }