diff --git a/controllers/workflow_test.go b/controllers/workflow_test.go index 446767b..3864362 100644 --- a/controllers/workflow_test.go +++ b/controllers/workflow_test.go @@ -310,11 +310,7 @@ var _ = Describe("Test Workflow", func() { Expect(wrObj.Status.Phase).Should(BeEquivalentTo(v1alpha1.WorkflowStateSuspending)) // terminate the workflow - wrObj.Status.Terminated = true - wrObj.Status.Suspend = false - wrObj.Status.Steps[0].Phase = v1alpha1.WorkflowStepPhaseFailed - wrObj.Status.Steps[0].Reason = wfTypes.StatusReasonTerminate - Expect(k8sClient.Status().Patch(ctx, wrObj, client.Merge)).Should(BeNil()) + Expect(utils.TerminateWorkflow(ctx, k8sClient, wrObj)).Should(BeNil()) tryReconcile(reconciler, wr.Name, wr.Namespace) @@ -1743,7 +1739,7 @@ var _ = Describe("Test Workflow", func() { // terminate manually checkRun := &v1alpha1.WorkflowRun{} Expect(k8sClient.Get(ctx, wrKey, checkRun)).Should(BeNil()) - terminateWorkflowRun(ctx, checkRun, 0) + Expect(utils.TerminateWorkflow(ctx, k8sClient, checkRun)).Should(BeNil()) tryReconcile(reconciler, wr.Name, wr.Namespace) @@ -1955,11 +1951,3 @@ func setupTestDefinitions(ctx context.Context, defs []string, namespace string) })).Should(SatisfyAny(BeNil(), &utils.AlreadyExistMatcher{})) } } - -func terminateWorkflowRun(ctx context.Context, run *v1alpha1.WorkflowRun, index int) { - run.Status.Suspend = false - run.Status.Terminated = true - run.Status.Steps[index].Phase = v1alpha1.WorkflowStepPhaseFailed - run.Status.Steps[index].Reason = wfTypes.StatusReasonTerminate - Expect(k8sClient.Status().Update(ctx, run)).Should(BeNil()) -} diff --git a/pkg/utils/operation.go b/pkg/utils/operation.go index ca5f4fe..09dc472 100644 --- a/pkg/utils/operation.go +++ b/pkg/utils/operation.go @@ -313,7 +313,7 @@ func TerminateWorkflow(ctx context.Context, cli client.Client, run *v1alpha1.Wor if step.Reason != wfTypes.StatusReasonFailedAfterRetries && step.Reason != wfTypes.StatusReasonTimeout { steps[i].Reason = wfTypes.StatusReasonTerminate } - case v1alpha1.WorkflowStepPhaseRunning: + case v1alpha1.WorkflowStepPhaseRunning, v1alpha1.WorkflowStepPhaseSuspending: steps[i].Phase = v1alpha1.WorkflowStepPhaseFailed steps[i].Reason = wfTypes.StatusReasonTerminate default: @@ -324,7 +324,7 @@ func TerminateWorkflow(ctx context.Context, cli client.Client, run *v1alpha1.Wor if sub.Reason != wfTypes.StatusReasonFailedAfterRetries && sub.Reason != wfTypes.StatusReasonTimeout { steps[i].SubStepsStatus[j].Reason = wfTypes.StatusReasonTerminate } - case v1alpha1.WorkflowStepPhaseRunning: + case v1alpha1.WorkflowStepPhaseRunning, v1alpha1.WorkflowStepPhaseSuspending: steps[i].SubStepsStatus[j].Phase = v1alpha1.WorkflowStepPhaseFailed steps[i].SubStepsStatus[j].Reason = wfTypes.StatusReasonTerminate default: