Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

account for all covered resources when a node is cordoned #239

Merged
merged 3 commits into from
Aug 28, 2024
Merged

account for all covered resources when a node is cordoned #239

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
844c521
account for all covered resources when a node is cordoned
dgrove-oss Aug 27, 2024
ceb0ea8
quietly handling conflict errors by requeuing
dgrove-oss Aug 27, 2024
0f3bf73
fix typo
dgrove-oss Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions internal/controller/appwrapper/node_health_monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ func (r *NodeHealthMonitor) Reconcile(ctx context.Context, req ctrl.Request) (ct
// update unschedulable resource quantities for this node
flaggedQuantities := make(map[string]*resource.Quantity)
if node.Spec.Unschedulable {
// flag all configured resources if the node is cordoned
for resourceName := range r.Config.Autopilot.ResourceTaints {
flaggedQuantities[resourceName] = node.Status.Capacity.Name(v1.ResourceName(resourceName), resource.DecimalSI)
// flag all non-pod resources covered by cq if the node is cordoned
for _, resourceName := range cq.Spec.ResourceGroups[0].Flavors[0].Resources {
if string(resourceName.Name) != "pods" {
flaggedQuantities[string(resourceName.Name)] = node.Status.Capacity.Name(resourceName.Name, resource.DecimalSI)
}
}
} else {
for key, value := range node.GetLabels() {
Expand Down Expand Up @@ -173,15 +175,19 @@ func (r *NodeHealthMonitor) Reconcile(ctx context.Context, req ctrl.Request) (ct
}

// update lending limits
var err error
if limitsChanged {
err = r.Update(ctx, cq)
err := r.Update(ctx, cq)
if err == nil {
log.FromContext(ctx).Info("Updated lending limits", "Resources", resources)
return ctrl.Result{}, nil
} else if errors.IsConflict(err) {
return ctrl.Result{Requeue: true}, nil
} else {
return ctrl.Result{}, err
}
}

return ctrl.Result{}, err
return ctrl.Result{}, nil
}

// SetupWithManager sets up the controller with the Manager.
Expand Down