add paddle job resource support when using extensiontemplate

Author: zhongzichao

pkg/job/runtime_v2/job/paddle/kube_paddle_job.go

@@ -397,12 +397,16 @@ func (pj *KubePaddleJob) patchResource(pdj *paddlejobv1.PaddleJob, job *api.PFJo
 	log.Infof("patch resource in paddlejob")
 	if len(job.Tasks) == 0 {
 		log.Debugf("no resources to be configured")
+		return nil
 	}
 
 	// fill resource
 	var minAvailable int32
 	minResources := resources.EmptyResource()
 	for _, task := range job.Tasks {
+		if pfschema.IsEmptyResource(task.Flavour.ResourceInfo) {
+			continue
+		}
 		resourceRequirements, err := kuberuntime.GenerateResourceRequirements(task.Flavour)
 		if err != nil {
 			log.Errorf("generate resource requirements failed, err: %v", err)

pkg/job/runtime_v2/job/paddle/kube_paddle_job_test.go

@@ -65,11 +65,11 @@ spec:
             image: nginx
             resources:
               limits:
-                cpu: "1"
-                memory: 1Gi
+                cpu: "2"
+                memory: 2Gi
               requests:
-                cpu: "1"
-                memory: 1Gi
+                cpu: "2"
+                memory: 2Gi
 `
 	nilWorkerContainerYaml = `
 apiVersion: batch.paddlepaddle.org/v1
@@ -511,6 +511,38 @@ func TestPaddleJob_CreateJob(t *testing.T) {
 			},
 			wantErr: errors.New("container is required in paddleJob"),
 		},
+		{
+			caseName: "extensionTemplate member has no flavour",
+			jobObj: &api.PFJob{
+				ID:        "job-normal-0c272d0c",
+				Name:      "",
+				Namespace: "default",
+				JobType:   schema.TypeDistributed,
+				Framework: schema.FrameworkPaddle,
+				JobMode:   schema.EnvJobModePS,
+				UserName:  "root",
+				QueueID:   "mockQueueID",
+				Tasks: []schema.Member{
+					{
+						ID:       "task-normal-0001",
+						Replicas: 1,
+						Role:     schema.RoleWorker,
+						Conf: schema.Conf{
+							Name:    "normal",
+							Command: "sleep 200",
+							Image:   "mockImage",
+						},
+					},
+					{
+						ID:       "task-normal-0001",
+						Replicas: 1,
+						Role:     schema.RolePServer,
+					},
+				},
+				ExtensionTemplate: []byte(extensionPaddleYaml),
+			},
+			wantErr: nil,
+		},
 		{
 			caseName: "create paddle job with Collective mode",
 			jobObj:   &mockPaddleJob,
@@ -533,10 +565,11 @@ func TestPaddleJob_CreateJob(t *testing.T) {
 			if test.wantErr == nil {
 				assert.Equal(t, test.wantErr, err)
 				t.Logf("case[%s] to CreateJob, paddleFlowJob=%+v", test.caseName, test.jobObj)
-				_, err := kubeRuntimeClient.Get(test.jobObj.Namespace, test.jobObj.ID, KubePaddleFwVersion)
+				obj, err := kubeRuntimeClient.Get(test.jobObj.Namespace, test.jobObj.ID, KubePaddleFwVersion)
 				if !assert.NoError(t, err) {
 					t.Errorf(err.Error())
 				}
+				t.Logf("result: %v", obj)
 			} else {
 				if assert.Error(t, err) {
 					assert.Equal(t, test.wantErr.Error(), err.Error())