Merge pull request volcano-sh#8 from k82cn/cli_fix

kevin-wangzefeng · Jan 21, 2019 · 2eb6c11 · 2eb6c11
2 parents 3746baa + ff4349f
commit 2eb6c11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cmd/cli/vnctl.go → cmd/cli/vkctl.go b/cmd/cli/vnctl.go → cmd/cli/vkctl.go
@@ -65,7 +65,9 @@ func main() {
 
 	rootCmd.AddCommand(jobCmd)
 
-	rootCmd.Execute()
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Printf("Failed to execute command: %v", err)
+	}
 }
 
 func checkError(cmd *cobra.Command, err error) {

diff --git a/pkg/cli/job/list.go b/pkg/cli/job/list.go
@@ -46,7 +46,7 @@ func ListJobs() error {
 	}
 
 	jobClient := versioned.NewForConfigOrDie(config)
-	jobs, err := jobClient.Batch().Jobs(listJobFlags.Namespace).List(metav1.ListOptions{})
+	jobs, err := jobClient.BatchV1alpha1().Jobs(listJobFlags.Namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return err
 	}

diff --git a/pkg/cli/job/run.go b/pkg/cli/job/run.go
@@ -50,7 +50,7 @@ func InitRunFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&launchJobFlags.Requests, "requests", "", "cpu=1000m,memory=100Mi", "the resource request of the task")
 }
 
-var jobName = "job.volcanproj.org"
+var jobName = "job.volcano.hpw.cloud"
 
 func RunJob() error {
 	config, err := buildConfig(launchJobFlags.Master, launchJobFlags.Kubeconfig)
@@ -100,7 +100,7 @@ func RunJob() error {
 	}
 
 	jobClient := versioned.NewForConfigOrDie(config)
-	if _, err := jobClient.Batch().Jobs(launchJobFlags.Namespace).Create(job); err != nil {
+	if _, err := jobClient.BatchV1alpha1().Jobs(launchJobFlags.Namespace).Create(job); err != nil {
 		return err
 	}
 

diff --git a/pkg/cli/job/util.go b/pkg/cli/job/util.go
@@ -50,7 +50,7 @@ func populateResourceListV1(spec string) (v1.ResourceList, error) {
 	for _, resourceStatement := range resourceStatements {
 		parts := strings.Split(resourceStatement, "=")
 		if len(parts) != 2 {
-			return nil, fmt.Errorf("Invalid argument syntax %v, expected <resource>=<value>", resourceStatement)
+			return nil, fmt.Errorf("invalid argument syntax %v, expected <resource>=<value>", resourceStatement)
 		}
 		resourceName := v1.ResourceName(parts[0])
 		resourceQuantity, err := resource.ParseQuantity(parts[1])