refactor: use helper function to get process resources
This commit is contained in:
@@ -351,45 +351,28 @@ func templateKubernetesJob(input Job) (batchv1.Job, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{input.AppName, input.ProcessType, "limit", "cpu"}...)
|
processResources, err := getProcessResources(input.AppName, input.ProcessType)
|
||||||
if err != nil && cpuLimit != "" && cpuLimit != "0" {
|
if err != nil {
|
||||||
cpuQuantity, err := resource.ParseQuantity(cpuLimit)
|
return job, fmt.Errorf("Error getting process resources: %w", err)
|
||||||
if err != nil {
|
}
|
||||||
return job, fmt.Errorf("Error parsing cpu limit: %w", err)
|
if processResources.Limits.CPU != "" {
|
||||||
}
|
cpuQuantity, _ := resource.ParseQuantity(processResources.Limits.CPU)
|
||||||
job.Spec.Template.Spec.Containers[0].Resources.Limits["cpu"] = cpuQuantity
|
job.Spec.Template.Spec.Containers[0].Resources.Limits["cpu"] = cpuQuantity
|
||||||
}
|
}
|
||||||
nvidiaGpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{input.AppName, input.ProcessType, "limit", "nvidia-gpu"}...)
|
if processResources.Limits.Memory != "" {
|
||||||
if err != nil && nvidiaGpuLimit != "" && nvidiaGpuLimit != "0" {
|
memoryQuantity, _ := resource.ParseQuantity(processResources.Limits.Memory)
|
||||||
nvidiaGpuQuantity, err := resource.ParseQuantity(nvidiaGpuLimit)
|
|
||||||
if err != nil {
|
|
||||||
return job, fmt.Errorf("Error parsing nvidia-gpu limit: %w", err)
|
|
||||||
}
|
|
||||||
job.Spec.Template.Spec.Containers[0].Resources.Limits["nvidia.com/gpu"] = nvidiaGpuQuantity
|
|
||||||
}
|
|
||||||
memoryLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{input.AppName, input.ProcessType, "limit", "memory"}...)
|
|
||||||
if err != nil && memoryLimit != "" && memoryLimit != "0" {
|
|
||||||
memoryQuantity, err := resource.ParseQuantity(memoryLimit)
|
|
||||||
if err != nil {
|
|
||||||
return job, fmt.Errorf("Error parsing memory limit: %w", err)
|
|
||||||
}
|
|
||||||
job.Spec.Template.Spec.Containers[0].Resources.Limits["memory"] = memoryQuantity
|
job.Spec.Template.Spec.Containers[0].Resources.Limits["memory"] = memoryQuantity
|
||||||
}
|
}
|
||||||
|
if processResources.Limits.NvidiaGPU != "" {
|
||||||
cpuRequest, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{input.AppName, input.ProcessType, "reserve", "cpu"}...)
|
nvidiaGpuQuantity, _ := resource.ParseQuantity(processResources.Limits.NvidiaGPU)
|
||||||
if err != nil && cpuRequest != "" && cpuRequest != "0" {
|
job.Spec.Template.Spec.Containers[0].Resources.Limits["nvidia.com/gpu"] = nvidiaGpuQuantity
|
||||||
cpuQuantity, err := resource.ParseQuantity(cpuRequest)
|
}
|
||||||
if err != nil {
|
if processResources.Requests.CPU != "" {
|
||||||
return job, fmt.Errorf("Error parsing cpu request: %w", err)
|
cpuQuantity, _ := resource.ParseQuantity(processResources.Requests.CPU)
|
||||||
}
|
|
||||||
job.Spec.Template.Spec.Containers[0].Resources.Requests["cpu"] = cpuQuantity
|
job.Spec.Template.Spec.Containers[0].Resources.Requests["cpu"] = cpuQuantity
|
||||||
}
|
}
|
||||||
memoryRequest, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{input.AppName, input.ProcessType, "reserve", "memory"}...)
|
if processResources.Requests.Memory != "" {
|
||||||
if err != nil && memoryRequest != "" && memoryRequest != "0" {
|
memoryQuantity, _ := resource.ParseQuantity(processResources.Requests.Memory)
|
||||||
memoryQuantity, err := resource.ParseQuantity(memoryRequest)
|
|
||||||
if err != nil {
|
|
||||||
return job, fmt.Errorf("Error parsing memory request: %w", err)
|
|
||||||
}
|
|
||||||
job.Spec.Template.Spec.Containers[0].Resources.Requests["memory"] = memoryQuantity
|
job.Spec.Template.Spec.Containers[0].Resources.Requests["memory"] = memoryQuantity
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user