Merge pull request #3569 from jamsman94/feature/customResourceRequest

add custom resource request for workflow job
koderover · Jun 20, 2024 · 385a0de · 385a0de
2 parents 4516270 + 18cb006
commit 385a0de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/kubernetes.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/kubernetes.go
@@ -762,42 +762,20 @@ func getResourceRequirements(resReq setting.Request, resReqSpec setting.RequestS
 // cpu Request:Limit=1:4
 // memory default Request:Limit=1:4 ; if memoryLimit>= 8Gi,Request:Limit=1:8
 func generateResourceRequirements(req setting.Request, reqSpec setting.RequestSpec) corev1.ResourceRequirements {
-
-	if req != setting.DefineRequest {
-		return corev1.ResourceRequirements{
-			Limits: corev1.ResourceList{
-				corev1.ResourceCPU:    resource.MustParse(strconv.Itoa(reqSpec.CpuLimit) + setting.CpuUintM),
-				corev1.ResourceMemory: resource.MustParse(strconv.Itoa(reqSpec.MemoryLimit) + setting.MemoryUintMi),
-			},
-			Requests: corev1.ResourceList{
-				corev1.ResourceCPU:    resource.MustParse(strconv.Itoa(reqSpec.CpuReq) + setting.CpuUintM),
-				corev1.ResourceMemory: resource.MustParse(strconv.Itoa(reqSpec.MemoryReq) + setting.MemoryUintMi),
-			},
-		}
-	}
-
 	limits := corev1.ResourceList{}
 	requests := corev1.ResourceList{}
 
-	if reqSpec.CpuLimit > 0 {
-		cpuReqInt := reqSpec.CpuLimit / 4
-		if cpuReqInt < 1 {
-			cpuReqInt = 1
-		}
+	if reqSpec.CpuLimit != 0 {
 		limits[corev1.ResourceCPU] = resource.MustParse(strconv.Itoa(reqSpec.CpuLimit) + setting.CpuUintM)
-		requests[corev1.ResourceCPU] = resource.MustParse(strconv.Itoa(cpuReqInt) + setting.CpuUintM)
 	}
-
-	if reqSpec.MemoryLimit > 0 {
-		memoryReqInt := reqSpec.MemoryLimit / 4
-		if memoryReqInt >= 2*1024 {
-			memoryReqInt = memoryReqInt / 2
-		}
-		if memoryReqInt < 1 {
-			memoryReqInt = 1
-		}
+	if reqSpec.CpuReq != 0 {
+		requests[corev1.ResourceCPU] = resource.MustParse(strconv.Itoa(reqSpec.CpuReq) + setting.CpuUintM)
+	}
+	if reqSpec.MemoryReq != 0 {
+		requests[corev1.ResourceMemory] = resource.MustParse(strconv.Itoa(reqSpec.MemoryReq) + setting.MemoryUintMi)
+	}
+	if reqSpec.MemoryLimit != 0 {
 		limits[corev1.ResourceMemory] = resource.MustParse(strconv.Itoa(reqSpec.MemoryLimit) + setting.MemoryUintMi)
-		requests[corev1.ResourceMemory] = resource.MustParse(strconv.Itoa(memoryReqInt) + setting.MemoryUintMi)
 	}
 
 	// add gpu limit

diff --git a/pkg/setting/types.go b/pkg/setting/types.go
@@ -38,8 +38,8 @@ const (
 type RequestSpec struct {
 	CpuLimit    int `bson:"cpu_limit"                     json:"cpu_limit"               yaml:"cpu_limit"`
 	MemoryLimit int `bson:"memory_limit"                  json:"memory_limit"            yaml:"memory_limit"`
-	CpuReq      int `bson:"cpu_req,omitempty"             json:"cpu_req,omitempty"       yaml:"cpu_req,omitempty"`
-	MemoryReq   int `bson:"memory_req,omitempty"          json:"memory_req,omitempty"    yaml:"memory_req,omitempty"`
+	CpuReq      int `bson:"cpu_req"                       json:"cpu_req"                 yaml:"cpu_req"`
+	MemoryReq   int `bson:"memory_req"                    json:"memory_req"              yaml:"memory_req"`
 	// gpu request, eg: "nvidia.com/gpu: 1"
 	GpuLimit string `bson:"gpu_limit"                     json:"gpu_limit"               yaml:"gpu_limit"`
 }