github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: avoid setting empty cpu/memory requests

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-02-21 18:30:48 -05:00
parent 0bd785e04e
commit 14eb60160c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/scheduler-k3s/functions.go
View File

@@ -850,7 +850,9 @@ func getProcessResources(appName string, processType string) (ProcessResourcesMa
if err != nil {
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu limit: %w", err)
}
processResources.Limits.CPU = quantity.String()
if quantity.MilliValue() != 0 {
processResources.Limits.CPU = quantity.String()
}
}
nvidiaGpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "limit", "nvidia-gpu"}...)
if err == nil && nvidiaGpuLimit != "" && nvidiaGpuLimit != "0" {
@@ -869,7 +871,9 @@ func getProcessResources(appName string, processType string) (ProcessResourcesMa
if err != nil {
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory limit: %w", err)
}
processResources.Limits.Memory = quantity
if quantity != "0Mi" {
processResources.Limits.Memory = quantity
}
}
result, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
@@ -881,7 +885,9 @@ func getProcessResources(appName string, processType string) (ProcessResourcesMa
if err != nil {
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu request: %w", err)
}
processResources.Requests.CPU = quantity.String()
if quantity.MilliValue() != 0 {
processResources.Requests.CPU = quantity.String()
}
}
result, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
Trigger: "resource-get-property",
@@ -892,7 +898,9 @@ func getProcessResources(appName string, processType string) (ProcessResourcesMa
if err != nil {
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory request: %w", err)
}
processResources.Requests.Memory = quantity
if quantity != "0Mi" {
processResources.Requests.Memory = quantity
}
}
return processResources, nil