From ab04a3d4a08444a59bca6f80446a2ecd7d0e66c9 Mon Sep 17 00:00:00 2001
From: jiangkaihua <54176503+jiangkaihua@users.noreply.github.com>
Date: Sat, 21 Sep 2019 17:54:16 +0800
Subject: [PATCH] Add vcctl error.

Signed-off-by: jiangkaihua <54176503+jiangkaihua@users.noreply.github.com>
---
 cmd/cli/vkctl.go    |  3 +++
 pkg/cli/job/run.go  | 13 ++-----------
 pkg/cli/job/view.go |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/cmd/cli/vkctl.go b/cmd/cli/vkctl.go
index b18aeca595..7d32886659 100644
--- a/cmd/cli/vkctl.go
+++ b/cmd/cli/vkctl.go
@@ -17,6 +17,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/golang/glog"
@@ -47,6 +48,7 @@ func main() {
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Printf("Failed to execute command: %v\n", err)
+		os.Exit(2)
 	}
 }
 
@@ -60,6 +62,7 @@ func checkError(cmd *cobra.Command, err error) {
 		}
 
 		fmt.Printf("%s: %v\n", msg, err)
+		os.Exit(2)
 	}
 }
 
diff --git a/pkg/cli/job/run.go b/pkg/cli/job/run.go
index 80f1fe33c3..c2c55599ad 100644
--- a/pkg/cli/job/run.go
+++ b/pkg/cli/job/run.go
@@ -72,23 +72,14 @@ func RunJob() error {
 		return err
 	}
 
-	req, err := populateResourceListV1(launchJobFlags.Requests)
-	if err != nil {
-		return err
-	}
-
-	limit, err := populateResourceListV1(launchJobFlags.Limits)
-	if err != nil {
-		return err
-	}
-
 	job, err := readFile(launchJobFlags.FileName)
 	if err != nil {
 		return err
 	}
 
 	if job == nil {
-		job = constructLaunchJobFlagsJob(launchJobFlags, req, limit)
+		fmt.Printf("Error: job script (specified by --filename or -f) is mandatory to run a particular job")
+		return nil
 	}
 
 	jobClient := versioned.NewForConfigOrDie(config)
diff --git a/pkg/cli/job/view.go b/pkg/cli/job/view.go
index 8dbbe7bb7e..baeaf1e44a 100644
--- a/pkg/cli/job/view.go
+++ b/pkg/cli/job/view.go
@@ -65,7 +65,7 @@ func ViewJob() error {
 		return err
 	}
 	if viewJobFlags.JobName == "" {
-		err := fmt.Errorf("job name (specified by --name or -N) is mandaorty to view a particular job")
+		err := fmt.Errorf("job name (specified by --name or -N) is mandatory to view a particular job")
 		return err
 	}