Merge pull request #3879 from kerthcet/cleanup/remove-dupliated-code

Remove duplicated codes
volcano-sh · Dec 18, 2024 · 1484471 · 1484471
2 parents 96af1d3 + 63278a0
commit 1484471
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 211 deletions.
diff --git a/pkg/cli/job/resume.go b/pkg/cli/job/resume.go
@@ -54,7 +54,7 @@ func ResumeJob(ctx context.Context) error {
 		return err
 	}
 
-	return createJobCommand(ctx, config,
+	return util.CreateJobCommand(ctx, config,
 		resumeJobFlags.Namespace, resumeJobFlags.JobName,
 		v1alpha1.ResumeJobAction)
 }
diff --git a/pkg/cli/job/run.go b/pkg/cli/job/run.go
@@ -79,12 +79,12 @@ func RunJob(ctx context.Context) error {
 		return err
 	}
 
-	req, err := populateResourceListV1(launchJobFlags.Requests)
+	req, err := util.PopulateResourceListV1(launchJobFlags.Requests)
 	if err != nil {
 		return err
 	}
 
-	limit, err := populateResourceListV1(launchJobFlags.Limits)
+	limit, err := util.PopulateResourceListV1(launchJobFlags.Limits)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/cli/job/suspend.go b/pkg/cli/job/suspend.go
@@ -55,7 +55,7 @@ func SuspendJob(ctx context.Context) error {
 		return err
 	}
 
-	return createJobCommand(ctx, config,
+	return util.CreateJobCommand(ctx, config,
 		suspendJobFlags.Namespace, suspendJobFlags.JobName,
 		v1alpha1.AbortJobAction)
 }
diff --git a/pkg/cli/job/util.go b/pkg/cli/job/util.go
diff --git a/pkg/cli/job/util_test.go b/pkg/cli/job/util_test.go
diff --git a/pkg/cli/job/view.go b/pkg/cli/job/view.go
@@ -214,9 +214,9 @@ func PrintEvents(events []coreV1.Event, writer io.Writer) {
 		for _, e := range events {
 			var interval string
 			if e.Count > 1 {
-				interval = fmt.Sprintf("%s (x%d over %s)", translateTimestampSince(e.LastTimestamp), e.Count, translateTimestampSince(e.FirstTimestamp))
+				interval = fmt.Sprintf("%s (x%d over %s)", util.TranslateTimestampSince(e.LastTimestamp), e.Count, util.TranslateTimestampSince(e.FirstTimestamp))
 			} else {
-				interval = translateTimestampSince(e.FirstTimestamp)
+				interval = util.TranslateTimestampSince(e.FirstTimestamp)
 			}
 			EventSourceString := []string{e.Source.Component}
 			if len(e.Source.Host) > 0 {