Skip to content

Update node-labeling-controller to watch for singleton CR create/update events #2704

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
cdesiniotis merged 1 commit into from
Aug 1, 2026
Merged

Update node-labeling-controller to watch for singleton CR create/update events #2704

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
25 changes: 23 additions & 2 deletions controllers/nodelabeling_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,27 @@ func isDriverUpgradeRequestAllowed(upgradeState string) bool {
return upgradeState == upgrade.UpgradeStateUnknown || upgradeState == upgrade.UpgradeStateDone
}

// singletonCRPredicate returns a predicate that triggers reconciliation on create, delete,
// and spec-changing update events for singleton CRs (ClusterPolicy, GPUCluster).
// Create events are passed explicitly so that a CR created after the operator starts
// immediately causes GPU nodes to be labeled without waiting for a subsequent update.
func singletonCRPredicate[T interface {
client.Object
GetGeneration() int64
}]() predicate.TypedFuncs[T] {
return predicate.TypedFuncs[T]{
CreateFunc: func(e event.TypedCreateEvent[T]) bool {
return true
},
UpdateFunc: func(e event.TypedUpdateEvent[T]) bool {
return e.ObjectNew.GetGeneration() != e.ObjectOld.GetGeneration()
},
DeleteFunc: func(e event.TypedDeleteEvent[T]) bool {
return true
},
}
}

// SetupWithManager registers the NodeLabelingReconciler with the controller-runtime manager.
func (r *NodeLabelingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
mapToSingleton := func(_ context.Context, _ client.Object) []reconcile.Request {
Expand Down Expand Up @@ -624,7 +645,7 @@ func (r *NodeLabelingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
mgr.GetCache(),
&gpuv1.ClusterPolicy{},
handler.TypedEnqueueRequestsFromMapFunc(clusterPolicyMapFn),
predicate.TypedGenerationChangedPredicate[*gpuv1.ClusterPolicy]{},
singletonCRPredicate[*gpuv1.ClusterPolicy](),
)); err != nil {
return fmt.Errorf("error watching ClusterPolicy: %w", err)
}
Expand All @@ -638,7 +659,7 @@ func (r *NodeLabelingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
mgr.GetCache(),
&nvidiav1alpha1.GPUCluster{},
handler.TypedEnqueueRequestsFromMapFunc(gpuClusterMapFn),
predicate.TypedGenerationChangedPredicate[*nvidiav1alpha1.GPUCluster]{},
singletonCRPredicate[*nvidiav1alpha1.GPUCluster](),
)); err != nil {
return fmt.Errorf("error watching GPUCluster: %w", err)
}
Expand Down
Loading