Avoid premature CRD Deletion

Signed-off-by: Rafael Raposo <rafaelraposo@spotify.com>
flyteorg · Sep 30, 2024 · bc82a62 · bc82a62
1 parent 66ff152
commit bc82a62
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/flyteadmin/pkg/workflowengine/impl/k8s_executor.go b/flyteadmin/pkg/workflowengine/impl/k8s_executor.go
@@ -94,6 +94,17 @@ func (e K8sWorkflowExecutor) Abort(ctx context.Context, data interfaces.AbortDat
 	if err != nil {
 		return errors.NewFlyteAdminErrorf(codes.Internal, err.Error())
 	}
+	// Check if the execution has been handled by FlytePropeller
+	crd, err := target.FlyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(data.Namespace).Get(ctx, data.ExecutionID.GetName(), v1.GetOptions{})
+	if err != nil {
+		return errors.NewFlyteAdminErrorf(codes.Internal, err.Error())
+	}
+
+	if crd.Generation < 2 {
+		logger.Infof(ctx, "Execution [%v] hasn't been handled by FlytePropeller", data.ExecutionID)
+		return nil
+	}
+
 	err = target.FlyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(data.Namespace).Delete(ctx, data.ExecutionID.GetName(), v1.DeleteOptions{
 		PropagationPolicy: &deletePropagationBackground,
 	})