andy/operator
Archived
1
1
Fork 0
Code Pull Requests Actions Activity

resources #2

Merged
andy merged 2 commits from resources into main 2025-05-01 18:02:17 +03:00
Conversation 0 Commits 2 Files Changed 7 +17 -9
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f05069e01 - Show all commits

22
internal/controller/deploymentdefaults_controller.go
View File

@@ -80,15 +80,23 @@ func (r *DeploymentDefaultsReconciler) Reconcile(ctx context.Context, req ctrl.R
defaultMemLim, errMemLim := parseQuantity(defaults.MemoryLimit) defaultMemLim, errMemLim := parseQuantity(defaults.MemoryLimit)
var parseErrors []string var parseErrors []string
if errCPUReq != nil { parseErrors = append(parseErrors, fmt.Sprintf("CPURequest: %v", errCPUReq)) } if errCPUReq != nil {
if errMemReq != nil { parseErrors = append(parseErrors, fmt.Sprintf("MemoryRequest: %v", errMemReq)) } parseErrors = append(parseErrors, fmt.Sprintf("CPURequest: %v", errCPUReq))
if errCPULim != nil { parseErrors = append(parseErrors, fmt.Sprintf("CPULimit: %v", errCPULim)) } }
if errMemLim != nil { parseErrors = append(parseErrors, fmt.Sprintf("MemoryLimit: %v", errMemLim)) } if errMemReq != nil {
parseErrors = append(parseErrors, fmt.Sprintf("MemoryRequest: %v", errMemReq))
}
if errCPULim != nil {
parseErrors = append(parseErrors, fmt.Sprintf("CPULimit: %v", errCPULim))
}
if errMemLim != nil {
parseErrors = append(parseErrors, fmt.Sprintf("MemoryLimit: %v", errMemLim))
}
if len(parseErrors) > 0 { if len(parseErrors) > 0 {
errMsg := fmt.Sprintf("Invalid resource quantity format in NodeTainterConfig %s: %s", config.Name, strings.Join(parseErrors, "; ")) parsingError := fmt.Errorf("invalid resource quantity format in NodeTainterConfig %s: %s", config.Name, strings.Join(parseErrors, "; "))
log.Error(fmt.Errorf(errMsg), "Default resource parsing failed") log.Error(parsingError, "Default resource parsing failed", "configName", config.Name, "parsingErrors", parseErrors)
r.Recorder.Eventf(&deployment, corev1.EventTypeWarning, "ConfigError", "Invalid defaults in config %s: %s", config.Name, strings.Join(parseErrors, "; ")) r.Recorder.Eventf(&deployment, corev1.EventTypeWarning, "ConfigError", parsingError.Error())
return ctrl.Result{}, nil return ctrl.Result{}, nil
} }