Skip to content

Commit d412e9c

Browse files
committed
fix: update event map for enqueue
Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>
1 parent 8fed65e commit d412e9c

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

fleetconfig-controller/internal/controller/v1beta1/hub_controller.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -520,13 +520,13 @@ func (r *HubReconciler) SetupWithManager(mgr ctrl.Manager) error {
520520
return true
521521
},
522522
CreateFunc: func(_ event.CreateEvent) bool {
523-
return true
523+
return false
524524
},
525525
UpdateFunc: func(_ event.UpdateEvent) bool {
526-
return true
526+
return false
527527
},
528528
GenericFunc: func(_ event.GenericEvent) bool {
529-
return true
529+
return false
530530
},
531531
},
532532
),
@@ -535,11 +535,15 @@ func (r *HubReconciler) SetupWithManager(mgr ctrl.Manager) error {
535535
Complete(r)
536536
}
537537

538-
func mapSpokeEventToHub(_ context.Context, _ client.Object) []reconcile.Request {
538+
func mapSpokeEventToHub(_ context.Context, obj client.Object) []reconcile.Request {
539+
spoke, ok := obj.(*v1beta1.Spoke)
540+
if !ok {
541+
return nil
542+
}
539543
return []reconcile.Request{
540544
{
541545
NamespacedName: types.NamespacedName{
542-
Name: v1beta1.HubResourceName,
546+
Name: spoke.Spec.HubRef.Name,
543547
},
544548
},
545549
}

fleetconfig-controller/internal/controller/v1beta1/spoke_controller.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,12 @@ func sharedFieldsChanged(oldSpec, newSpec *v1beta1.HubSpec) bool {
928928
oldSpec.Timeout != newSpec.Timeout || oldSpec.LogVerbosity != newSpec.LogVerbosity
929929
}
930930

931-
func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, _ client.Object) []reconcile.Request {
931+
func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, obj client.Object) []reconcile.Request {
932+
hub, ok := obj.(*v1beta1.Hub)
933+
if !ok {
934+
r.Log.V(1).Info("failed to enqueue spoke requests")
935+
return nil
936+
}
932937
spokeList := &v1beta1.SpokeList{}
933938
err := r.List(ctx, spokeList)
934939
if err != nil {
@@ -937,6 +942,9 @@ func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, _ client.Objec
937942
}
938943
req := make([]reconcile.Request, 0)
939944
for _, s := range spokeList.Items {
945+
if s.Spec.HubRef.Name != hub.Name {
946+
continue
947+
}
940948
req = append(req, reconcile.Request{
941949
NamespacedName: types.NamespacedName{
942950
Name: s.Name,

0 commit comments

Comments
 (0)