feat: added cascade option to DeleteResource - argo-cd #5368 (#220)

* feat: added cascade option to DeleteResource - argo-cd #5368 Signed-off-by: ishitasequeira <[email protected]> * added a comment re-trigger the unit test Signed-off-by: ishitasequeira <[email protected]> * feat: updated delete option logic in DeleteResource Signed-off-by: ishitasequeira <[email protected]>
argoproj · Feb 22, 2021 · aae8ded · aae8ded
1 parent 354817a
commit aae8ded
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/pkg/sync/sync_context.go b/pkg/sync/sync_context.go
@@ -820,7 +820,9 @@ func (sc *syncContext) pruneObject(liveObj *unstructured.Unstructured, prune, dr
 			// Skip deletion if object is already marked for deletion, so we don't cause a resource update hotloop
 			deletionTimestamp := liveObj.GetDeletionTimestamp()
 			if deletionTimestamp == nil || deletionTimestamp.IsZero() {
-				err := sc.kubectl.DeleteResource(context.TODO(), sc.config, liveObj.GroupVersionKind(), liveObj.GetName(), liveObj.GetNamespace(), false)
+				propagationPolicy := metav1.DeletePropagationForeground
+				deleteOption := metav1.DeleteOptions{PropagationPolicy: &propagationPolicy}
+				err := sc.kubectl.DeleteResource(context.TODO(), sc.config, liveObj.GroupVersionKind(), liveObj.GetName(), liveObj.GetNamespace(), deleteOption)
 				if err != nil {
 					return common.ResultCodeSyncFailed, err.Error()
 				}

diff --git a/pkg/utils/kube/ctl.go b/pkg/utils/kube/ctl.go
@@ -39,7 +39,7 @@ type OnKubectlRunFunc func(command string) (CleanupFunc, error)
 type Kubectl interface {
 	ApplyResource(ctx context.Context, config *rest.Config, obj *unstructured.Unstructured, namespace string, dryRunStrategy cmdutil.DryRunStrategy, force, validate bool) (string, error)
 	ConvertToVersion(obj *unstructured.Unstructured, group, version string) (*unstructured.Unstructured, error)
-	DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error
+	DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, deleteOptions metav1.DeleteOptions) error
 	GetResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string) (*unstructured.Unstructured, error)
 	PatchResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, patchType types.PatchType, patchBytes []byte, subresources ...string) (*unstructured.Unstructured, error)
 	GetAPIResources(config *rest.Config, resourceFilter ResourceFilter) ([]APIResourceInfo, error)
@@ -187,7 +187,7 @@ func (k *KubectlCmd) PatchResource(ctx context.Context, config *rest.Config, gvk
 }
 
 // DeleteResource deletes resource
-func (k *KubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error {
+func (k *KubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, deleteOptions metav1.DeleteOptions) error {
 	span := k.Tracer.StartSpan("DeleteResource")
 	span.SetBaggageItem("kind", gvk.Kind)
 	span.SetBaggageItem("name", name)
@@ -206,14 +206,11 @@ func (k *KubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gv
 	}
 	resource := gvk.GroupVersion().WithResource(apiResource.Name)
 	resourceIf := ToResourceInterface(dynamicIf, apiResource, resource, namespace)
-	propagationPolicy := metav1.DeletePropagationForeground
-	deleteOptions := metav1.DeleteOptions{PropagationPolicy: &propagationPolicy}
-	if forceDelete {
-		propagationPolicy = metav1.DeletePropagationBackground
-		zeroGracePeriod := int64(0)
-		deleteOptions.GracePeriodSeconds = &zeroGracePeriod
-	}
 
+	if deleteOptions.PropagationPolicy == nil {
+		propagationPolicy := metav1.DeletePropagationForeground
+		deleteOptions = metav1.DeleteOptions{PropagationPolicy: &propagationPolicy}
+	}
 	return resourceIf.Delete(ctx, name, deleteOptions)
 }
 

diff --git a/pkg/utils/kube/kubetest/mock.go b/pkg/utils/kube/kubetest/mock.go
@@ -61,7 +61,7 @@ func (k *MockKubectlCmd) PatchResource(ctx context.Context, config *rest.Config,
 	return nil, nil
 }
 
-func (k *MockKubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, forceDelete bool) error {
+func (k *MockKubectlCmd) DeleteResource(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string, deleteOptions metav1.DeleteOptions) error {
 	command, ok := k.Commands[name]
 	if !ok {
 		return nil