Stop connecting condition type and reason in JobSet plugin

Signed-off-by: Yuki Iwai <[email protected]>
kubeflow · Nov 9, 2024 · c36fe90 · c36fe90
1 parent 58b1a00
commit c36fe90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/pkg/runtime.v2/framework/core/framework_test.go b/pkg/runtime.v2/framework/core/framework_test.go
@@ -18,7 +18,6 @@ package core
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -612,7 +611,7 @@ func TestTerminalConditionPlugins(t *testing.T) {
 				Obj(),
 			wantCondition: &metav1.Condition{
 				Type:    kubeflowv2.TrainJobComplete,
-				Reason:  fmt.Sprintf("%sDueTo%s", jobsetv1alpha2.JobSetCompleted, jobsetconsts.AllJobsCompletedReason),
+				Reason:  jobsetconsts.AllJobsCompletedReason,
 				Message: jobsetconsts.AllJobsCompletedMessage,
 				Status:  metav1.ConditionTrue,
 			},
@@ -631,7 +630,7 @@ func TestTerminalConditionPlugins(t *testing.T) {
 				Obj(),
 			wantCondition: &metav1.Condition{
 				Type:    kubeflowv2.TrainJobFailed,
-				Reason:  fmt.Sprintf("%sDueTo%s", jobsetv1alpha2.JobSetFailed, jobsetconsts.FailedJobsReason),
+				Reason:  jobsetconsts.FailedJobsReason,
 				Message: jobsetconsts.FailedJobsMessage,
 				Status:  metav1.ConditionTrue,
 			},

diff --git a/pkg/runtime.v2/framework/plugins/jobset/jobset.go b/pkg/runtime.v2/framework/plugins/jobset/jobset.go
@@ -133,12 +133,10 @@ func (j *JobSet) TerminalCondition(ctx context.Context, trainJob *kubeflowv2.Tra
 		return nil, err
 	}
 	if completed := meta.FindStatusCondition(jobSet.Status.Conditions, string(jobsetv1alpha2.JobSetCompleted)); completed != nil && completed.Status == metav1.ConditionTrue {
-		completed.Reason = fmt.Sprintf("%sDueTo%s", completed.Type, completed.Reason)
 		completed.Type = kubeflowv2.TrainJobComplete
 		return completed, nil
 	}
 	if failed := meta.FindStatusCondition(jobSet.Status.Conditions, string(jobsetv1alpha2.JobSetFailed)); failed != nil && failed.Status == metav1.ConditionTrue {
-		failed.Reason = fmt.Sprintf("%sDueTo%s", failed.Type, failed.Reason)
 		failed.Type = kubeflowv2.TrainJobFailed
 		return failed, nil
 	}

diff --git a/test/integration/controller.v2/trainjob_controller_test.go b/test/integration/controller.v2/trainjob_controller_test.go
@@ -422,7 +422,7 @@ var _ = ginkgo.Describe("TrainJob controller", ginkgo.Ordered, func() {
 					{
 						Type:    kubeflowv2.TrainJobComplete,
 						Status:  metav1.ConditionTrue,
-						Reason:  fmt.Sprintf("%sDueTo%s", jobsetv1alpha2.JobSetCompleted, jobsetconsts.AllJobsCompletedReason),
+						Reason:  jobsetconsts.AllJobsCompletedReason,
 						Message: jobsetconsts.AllJobsCompletedMessage,
 					},
 				}, util.IgnoreConditions))
@@ -481,7 +481,7 @@ var _ = ginkgo.Describe("TrainJob controller", ginkgo.Ordered, func() {
 					{
 						Type:    kubeflowv2.TrainJobFailed,
 						Status:  metav1.ConditionTrue,
-						Reason:  fmt.Sprintf("%sDueTo%s", jobsetv1alpha2.JobSetFailed, jobsetconsts.FailedJobsReason),
+						Reason:  jobsetconsts.FailedJobsReason,
 						Message: jobsetconsts.FailedJobsMessage,
 					},
 				}, util.IgnoreConditions))