Skip to content

[release-4.20] OCPBUGS-65773: Watch MCP changes including spec and labels #1434

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

Open
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-65773: Watch MCP changes including spec and labels #1434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions pkg/performanceprofile/controller/performanceprofile_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ func (r *PerformanceProfileReconciler) SetupWithManager(mgr ctrl.Manager) error
mcpOld := e.ObjectOld.(*mcov1.MachineConfigPool)
mcpNew := e.ObjectNew.(*mcov1.MachineConfigPool)

return !reflect.DeepEqual(mcpOld.Status.Conditions, mcpNew.Status.Conditions)
// We care about labels and the spec section, because those influence matching of Nodes and KubeletConfigs
return !reflect.DeepEqual(mcpOld.Status.Conditions, mcpNew.Status.Conditions) || !reflect.DeepEqual(mcpOld.Labels, mcpNew.Labels) || !reflect.DeepEqual(mcpOld.Spec, mcpNew.Spec)
},
}

Expand Down Expand Up @@ -312,7 +313,8 @@ func mcpToPerformanceProfileReconcileRequests(profiles *performancev2.Performanc
mcpNodeSelector, err := metav1.LabelSelectorAsSelector(mcp.Spec.NodeSelector)
if err != nil {
klog.Errorf("failed to parse the selector %v: %v", mcp.Spec.NodeSelector, err)
return nil
// Skip the broken MCP, but process others
continue
}

if mcpNodeSelector.Matches(profileNodeSelector) {
Expand Down