fix: correct issue where resource values were ignored
This commit is contained in:
@@ -833,46 +833,66 @@ func getProcessResources(appName string, processType string) (ProcessResourcesMa
|
|||||||
Memory: "512Mi",
|
Memory: "512Mi",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
cpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "limit", "cpu"}...)
|
|
||||||
if err != nil && cpuLimit != "" && cpuLimit != "0" {
|
emptyValues := map[string]bool{
|
||||||
_, err := resource.ParseQuantity(cpuLimit)
|
"": true,
|
||||||
|
"0": true,
|
||||||
|
"0m": true,
|
||||||
|
"0Mi": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
|
Trigger: "resource-get-property",
|
||||||
|
Args: []string{appName, processType, "limit", "cpu"},
|
||||||
|
})
|
||||||
|
if err == nil && !emptyValues[result.StdoutContents()] {
|
||||||
|
quantity, err := resource.ParseQuantity(result.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu limit: %w", err)
|
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu limit: %w", err)
|
||||||
}
|
}
|
||||||
processResources.Limits.CPU = cpuLimit
|
processResources.Limits.CPU = quantity.String()
|
||||||
}
|
}
|
||||||
nvidiaGpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "limit", "nvidia-gpu"}...)
|
nvidiaGpuLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "limit", "nvidia-gpu"}...)
|
||||||
if err != nil && nvidiaGpuLimit != "" && nvidiaGpuLimit != "0" {
|
if err == nil && nvidiaGpuLimit != "" && nvidiaGpuLimit != "0" {
|
||||||
_, err := resource.ParseQuantity(nvidiaGpuLimit)
|
_, err := resource.ParseQuantity(nvidiaGpuLimit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ProcessResourcesMap{}, fmt.Errorf("Error parsing nvidia-gpu limit: %w", err)
|
return ProcessResourcesMap{}, fmt.Errorf("Error parsing nvidia-gpu limit: %w", err)
|
||||||
}
|
}
|
||||||
processResources.Limits.NvidiaGPU = nvidiaGpuLimit
|
processResources.Limits.NvidiaGPU = nvidiaGpuLimit
|
||||||
}
|
}
|
||||||
memoryLimit, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "limit", "memory"}...)
|
result, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
if err != nil && memoryLimit != "" && memoryLimit != "0" {
|
Trigger: "resource-get-property",
|
||||||
_, err := resource.ParseQuantity(memoryLimit)
|
Args: []string{appName, processType, "limit", "memory"},
|
||||||
|
})
|
||||||
|
if err == nil && !emptyValues[result.StdoutContents()] {
|
||||||
|
quantity, err := parseMemoryQuantity(result.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory limit: %w", err)
|
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory limit: %w", err)
|
||||||
}
|
}
|
||||||
processResources.Limits.Memory = memoryLimit
|
processResources.Limits.Memory = quantity
|
||||||
}
|
}
|
||||||
|
|
||||||
cpuRequest, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "reserve", "cpu"}...)
|
result, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
if err != nil && cpuRequest != "" && cpuRequest != "0" {
|
Trigger: "resource-get-property",
|
||||||
_, err := resource.ParseQuantity(cpuRequest)
|
Args: []string{appName, processType, "reserve", "cpu"},
|
||||||
|
})
|
||||||
|
if err == nil && !emptyValues[result.StdoutContents()] {
|
||||||
|
quantity, err := resource.ParseQuantity(result.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu request: %w", err)
|
return ProcessResourcesMap{}, fmt.Errorf("Error parsing cpu request: %w", err)
|
||||||
}
|
}
|
||||||
processResources.Requests.CPU = cpuRequest
|
processResources.Requests.CPU = quantity.String()
|
||||||
}
|
}
|
||||||
memoryRequest, err := common.PlugnTriggerOutputAsString("resource-get-property", []string{appName, processType, "reserve", "memory"}...)
|
result, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
|
||||||
if err != nil && memoryRequest != "" && memoryRequest != "0" {
|
Trigger: "resource-get-property",
|
||||||
_, err := resource.ParseQuantity(memoryRequest)
|
Args: []string{appName, processType, "reserve", "memory"},
|
||||||
|
})
|
||||||
|
if err == nil && !emptyValues[result.StdoutContents()] {
|
||||||
|
quantity, err := parseMemoryQuantity(result.StdoutContents())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory request: %w", err)
|
return ProcessResourcesMap{}, fmt.Errorf("Error parsing memory request: %w", err)
|
||||||
}
|
}
|
||||||
processResources.Requests.Memory = memoryRequest
|
processResources.Requests.Memory = quantity
|
||||||
}
|
}
|
||||||
|
|
||||||
return processResources, nil
|
return processResources, nil
|
||||||
@@ -1182,6 +1202,19 @@ func kubernetesNodeToNode(node v1.Node) Node {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parseMemoryQuantity parses a string into a valid memory quantity
|
||||||
|
func parseMemoryQuantity(input string) (string, error) {
|
||||||
|
if _, err := strconv.ParseInt(input, 10, 64); err == nil {
|
||||||
|
input = fmt.Sprintf("%sMi", input)
|
||||||
|
}
|
||||||
|
quantity, err := resource.ParseQuantity(input)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return quantity.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
func uninstallHelperCommands(ctx context.Context) error {
|
func uninstallHelperCommands(ctx context.Context) error {
|
||||||
errs, _ := errgroup.WithContext(ctx)
|
errs, _ := errgroup.WithContext(ctx)
|
||||||
errs.Go(func() error {
|
errs.Go(func() error {
|
||||||
|
|||||||
Reference in New Issue
Block a user