Skip to content

🌱 MachineDeployment: fix misleading log statements and optimize logic #12871

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

Merged
sbueringer merged 2 commits into from
Oct 23, 2025
Merged

🌱 MachineDeployment: fix misleading log statements and optimize logic #12871

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7eeec1
fix(machinedeployment): misleading log statements and optimized logic
steffen-karlsson Oct 17, 2025
28c7aaf
Update internal/controllers/machinedeployment/machinedeployment_contr…
steffen-karlsson Oct 21, 2025
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
23 changes: 12 additions & 11 deletions internal/controllers/machinedeployment/machinedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,22 +432,23 @@ func (r *Reconciler) getAndAdoptMachineSetsForDeployment(ctx context.Context, s
return err
}

selector, err := metav1.LabelSelectorAsSelector(&md.Spec.Selector)
if err != nil {
log.Error(err, "Skipping MachineDeployment, failed to get label selector from spec selector")
return err
}

// If a MachineDeployment with a nil or empty selector creeps in, it should match nothing, not everything.
if selector.Empty() {
log.Info("Skipping MachineDeployment as the selector is empty")
return nil
}

filtered := make([]*clusterv1.MachineSet, 0, len(machineSets.Items))
for idx := range machineSets.Items {
ms := &machineSets.Items[idx]
log := log.WithValues("MachineSet", klog.KObj(ms))
ctx := ctrl.LoggerInto(ctx, log)
selector, err := metav1.LabelSelectorAsSelector(&md.Spec.Selector)
if err != nil {
log.Error(err, "Skipping MachineSet, failed to get label selector from spec selector")
continue
}

// If a MachineDeployment with a nil or empty selector creeps in, it should match nothing, not everything.
if selector.Empty() {
log.Info("Skipping MachineSet as the selector is empty")
continue
}

// Skip this MachineSet unless either selector matches or it has a controller ref pointing to this MachineDeployment
if !selector.Matches(labels.Set(ms.Labels)) && !metav1.IsControlledBy(ms, md) {
Expand Down