Merge pull request volcano-sh#3692 from googs1025/bug_fix/jobtemplate…

…_vcctl vcctl(jobtemplate): fix describe miss APIVersion and Kind bug, and remove ManagedFields
TaiPark · Sep 4, 2024 · 009748e · 009748e
2 parents 0d5830c + 24d508c
commit 009748e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/pkg/cli/jobflow/describe.go b/pkg/cli/jobflow/describe.go
@@ -71,9 +71,9 @@ func DescribeJobFlow(ctx context.Context) error {
 			// Remove managedFields
 			jobFlow.ManagedFields = nil
 			PrintJobFlowDetail(&jobFlow, describeJobFlowFlags.Format)
-			// Print a separator if it's not the last element
+			// Print space if it's not the last element
 			if len(jobFlows.Items) != 1 && i < len(jobFlows.Items)-1 {
-				fmt.Println("---------------------------------")
+				fmt.Printf("\n\n")
 			}
 		}
 		// Get jobflow detail

diff --git a/pkg/cli/jobtemplate/describe.go b/pkg/cli/jobtemplate/describe.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
 
@@ -66,15 +67,28 @@ func DescribeJobTemplate(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		for _, jobTemplate := range jobTemplates.Items {
+		for i, jobTemplate := range jobTemplates.Items {
+			// Remove managedFields
+			jobTemplate.ManagedFields = nil
 			PrintJobTemplateDetail(&jobTemplate, describeJobTemplateFlags.Format)
+			// Print space if it's not the last element
+			if len(jobTemplates.Items) != 1 && i < len(jobTemplates.Items)-1 {
+				fmt.Printf("\n\n")
+			}
 		}
 		// Get job template detail
 	} else {
 		jobTemplate, err := jobTemplateClient.FlowV1alpha1().JobTemplates(describeJobTemplateFlags.Namespace).Get(ctx, describeJobTemplateFlags.Name, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
+		// Remove managedFields
+		jobTemplate.ManagedFields = nil
+		// Set APIVersion and Kind if not set
+		if jobTemplate.APIVersion == "" || jobTemplate.Kind == "" {
+			jobTemplate.APIVersion = v1alpha1.SchemeGroupVersion.String()
+			jobTemplate.Kind = "JobTemplate"
+		}
 		PrintJobTemplateDetail(jobTemplate, describeJobTemplateFlags.Format)
 	}
 
@@ -98,15 +112,14 @@ func printJSON(jobTemplate *v1alpha1.JobTemplate) {
 	if err != nil {
 		fmt.Printf("Error marshaling JSON: %v\n", err)
 	}
-	fmt.Println(string(b))
-	fmt.Println("---------------------------------")
+	os.Stdout.Write(b)
+	fmt.Println("")
 }
 
 func printYAML(jobTemplate *v1alpha1.JobTemplate) {
 	b, err := yaml.Marshal(jobTemplate)
 	if err != nil {
 		fmt.Printf("Error marshaling YAML: %v\n", err)
 	}
-	fmt.Println(string(b))
-	fmt.Println("---------------------------------")
+	os.Stdout.Write(b)
 }
diff --git a/pkg/cli/jobtemplate/jobtemplate_test.go b/pkg/cli/jobtemplate/jobtemplate_test.go
@@ -284,14 +284,14 @@ func TestDescribeJobTemplate(t *testing.T) {
 			Name:        "test-jobtemplate",
 			Format:      "yaml",
 			ExpectedErr: nil,
-			ExpectedOutput: `metadata:
+			ExpectedOutput: `apiVersion: flow.volcano.sh/v1alpha1
+kind: JobTemplate
+metadata:
   creationTimestamp: null
   name: test-jobtemplate
   namespace: default
 spec: {}
-status: {}
-
----------------------------------`,
+status: {}`,
 		},
 		{
 			name: "Normal Case, use json format",
@@ -306,15 +306,16 @@ status: {}
 			Format:      "json",
 			ExpectedErr: nil,
 			ExpectedOutput: `{
+  "kind": "JobTemplate",
+  "apiVersion": "flow.volcano.sh/v1alpha1",
   "metadata": {
     "name": "test-jobtemplate",
     "namespace": "default",
     "creationTimestamp": null
   },
   "spec": {},
   "status": {}
-}
----------------------------------`,
+}`,
 		},
 	}
 	for _, testCase := range testCases {