Skip to content

Commit 28c7aaf

Browse files
Update internal/controllers/machinedeployment/machinedeployment_controller.go
Co-authored-by: Stefan Büringer <[email protected]>
1 parent e7eeec1 commit 28c7aaf

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

internal/controllers/machinedeployment/machinedeployment_controller.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,14 +434,11 @@ func (r *Reconciler) getAndAdoptMachineSetsForDeployment(ctx context.Context, s
434434

435435
selector, err := metav1.LabelSelectorAsSelector(&md.Spec.Selector)
436436
if err != nil {
437-
log.Error(err, "Skipping MachineDeployment, failed to get label selector from spec selector")
438-
return err
437+
return errors.Wrapf(err, "failed to get MachineSets: failed to compute label selector from MachineDeployment.spec.selector")
439438
}
440439

441-
// If a MachineDeployment with a nil or empty selector creeps in, it should match nothing, not everything.
442440
if selector.Empty() {
443-
log.Info("Skipping MachineDeployment as the selector is empty")
444-
return nil
441+
return errors.New("failed to get MachineSets: label selector computed from MachineDeployment.spec.selector is empty")
445442
}
446443

447444
filtered := make([]*clusterv1.MachineSet, 0, len(machineSets.Items))

0 commit comments

Comments
 (0)