Skip to content

Improve watch setup in BIOSSettingsReconciler #568

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
Nuckal777 merged 2 commits into from
Jan 8, 2026
Merged

Improve watch setup in BIOSSettingsReconciler #568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e3bb65
Improve watch setup in `BIOSSettingsReconciler`
afritzler Dec 15, 2025
f8a5003
PR review comments
afritzler Dec 15, 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
74 changes: 37 additions & 37 deletions internal/controller/biossettings_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,43 +1305,42 @@ func (r *BIOSSettingsReconciler) getFlowItemFromSettingsStatus(settings *metalv1
}

func (r *BIOSSettingsReconciler) enqueueBiosSettingsByServerRefs(ctx context.Context, obj client.Object) []ctrl.Request {
host := obj.(*metalv1alpha1.Server)
server := obj.(*metalv1alpha1.Server)
log := ctrl.LoggerFrom(ctx).WithValues("Server", server.Name)

if host.Status.State == metalv1alpha1.ServerStateDiscovery ||
host.Status.State == metalv1alpha1.ServerStateError ||
host.Status.State == metalv1alpha1.ServerStateInitial ||
host.Spec.ServerMaintenanceRef == nil {
if server.Status.State == metalv1alpha1.ServerStateDiscovery ||
server.Status.State == metalv1alpha1.ServerStateError ||
server.Status.State == metalv1alpha1.ServerStateInitial {
return nil
}

biosSettingsList := &metalv1alpha1.BIOSSettingsList{}
if err := r.List(ctx, biosSettingsList, client.MatchingFields{serverRefField: host.Name}); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to list BIOSSettings by server ref")
settingsList := &metalv1alpha1.BIOSSettingsList{}
if err := r.List(ctx, settingsList, client.MatchingFields{serverRefField: server.Name}); err != nil {
log.Error(err, "failed to list BIOSSettings by server ref")
return nil
}

reqs := make([]ctrl.Request, 0, 1)
for _, biosSettings := range biosSettingsList.Items {
if biosSettings.Spec.ServerMaintenanceRef == nil ||
biosSettings.Status.State == metalv1alpha1.BIOSSettingsStateApplied ||
biosSettings.Status.State == metalv1alpha1.BIOSSettingsStateFailed {
continue
}
if biosSettings.Spec.ServerMaintenanceRef.Name != host.Spec.ServerMaintenanceRef.Name {
reqs := make([]ctrl.Request, 0, len(settingsList.Items))
for _, settings := range settingsList.Items {
if settings.Spec.ServerMaintenanceRef == nil ||
(server.Spec.ServerMaintenanceRef != nil &&
server.Spec.ServerMaintenanceRef.UID != settings.Spec.ServerMaintenanceRef.UID) ||
settings.Status.State == metalv1alpha1.BIOSSettingsStateApplied ||
settings.Status.State == metalv1alpha1.BIOSSettingsStateFailed {
continue
}
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: biosSettings.Name}})
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: settings.Name}})
}
return reqs
}

func (r *BIOSSettingsReconciler) enqueueBiosSettingsByBMC(ctx context.Context, obj client.Object) []ctrl.Request {
bmcObj := obj.(*metalv1alpha1.BMC)
log := ctrl.LoggerFrom(ctx)
log := ctrl.LoggerFrom(ctx).WithValues("BMC", bmcObj.Name)

serverList := &metalv1alpha1.ServerList{}
if err := r.List(ctx, serverList, client.MatchingFields{bmcRefField: bmcObj.Name}); err != nil {
log.V(1).Error(err, "failed to list Server by BMC ref", "BMC", bmcObj.Name)
log.Error(err, "failed to list Servers by BMC ref")
return nil
}

Expand All @@ -1351,43 +1350,44 @@ func (r *BIOSSettingsReconciler) enqueueBiosSettingsByBMC(ctx context.Context, o
continue
}

biosSettings := &metalv1alpha1.BIOSSettings{}
if err := r.Get(ctx, types.NamespacedName{Name: server.Spec.BIOSSettingsRef.Name}, biosSettings); err != nil {
settings := &metalv1alpha1.BIOSSettings{}
if err := r.Get(ctx, types.NamespacedName{Name: server.Spec.BIOSSettingsRef.Name}, settings); err != nil {
log.Error(err, "failed to get BIOSSettings, skipping", "name", server.Spec.BIOSSettingsRef.Name)
continue
}

if biosSettings.Status.State == metalv1alpha1.BIOSSettingsStateInProgress {
resetBMC, err := GetCondition(r.Conditions, biosSettings.Status.Conditions, BMCConditionReset)
if err != nil || resetBMC.Status == metav1.ConditionTrue {
continue
}
if resetBMC.Reason == BMCReasonReset {
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: biosSettings.Name}})
// Only enqueue if BMC reset was issued but not yet completed
if settings.Status.State == metalv1alpha1.BIOSSettingsStateInProgress {
resetCond, err := GetCondition(r.Conditions, settings.Status.Conditions, BMCConditionReset)
if err == nil && resetCond.Status != metav1.ConditionTrue && resetCond.Reason == BMCReasonReset {
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: settings.Name}})
}
}
}
return reqs
}

func (r *BIOSSettingsReconciler) enqueueBiosSettingsByBiosVersionResource(ctx context.Context, obj client.Object) []ctrl.Request {
biosVersion := obj.(*metalv1alpha1.BIOSVersion)
if biosVersion.Status.State != metalv1alpha1.BIOSVersionStateCompleted {
version := obj.(*metalv1alpha1.BIOSVersion)
log := ctrl.LoggerFrom(ctx).WithValues("BIOSVersion", version.Name)

if version.Status.State != metalv1alpha1.BIOSVersionStateCompleted || version.Spec.ServerRef == nil {
return nil
}

biosSettingsList := &metalv1alpha1.BIOSSettingsList{}
if err := r.List(ctx, biosSettingsList, client.MatchingFields{serverRefField: biosVersion.Spec.ServerRef.Name}); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to list BIOSSettings by server ref")
settingsList := &metalv1alpha1.BIOSSettingsList{}
if err := r.List(ctx, settingsList, client.MatchingFields{serverRefField: version.Spec.ServerRef.Name}); err != nil {
log.Error(err, "failed to list BIOSSettings by server ref")
return nil
}

reqs := make([]ctrl.Request, 0, 1)
for _, biosSettings := range biosSettingsList.Items {
if biosSettings.Status.State == metalv1alpha1.BIOSSettingsStateApplied ||
biosSettings.Status.State == metalv1alpha1.BIOSSettingsStateFailed {
for _, settings := range settingsList.Items {
if settings.Status.State == metalv1alpha1.BIOSSettingsStateApplied ||
settings.Status.State == metalv1alpha1.BIOSSettingsStateFailed {
continue
}
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: biosSettings.Name}})
reqs = append(reqs, ctrl.Request{NamespacedName: types.NamespacedName{Name: settings.Name}})
}
return reqs
}
Expand Down
Loading