Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 24 additions & 1 deletion pkg/controllers/binding/binding_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ import (
"k8s.io/klog/v2"
"k8s.io/utils/ptr"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -185,9 +187,30 @@ func (c *ResourceBindingController) checkDirectPurgeOrphanWorks(ctx context.Cont

// SetupWithManager creates a controller and register to controller manager.
func (c *ResourceBindingController) SetupWithManager(mgr controllerruntime.Manager) error {
bindingPredicateFn := predicate.Funcs{
CreateFunc: func(_ event.CreateEvent) bool {
return true
},
UpdateFunc: func(updateEvent event.UpdateEvent) bool {
oldBinding := updateEvent.ObjectOld.(*workv1alpha2.ResourceBinding)
newBinding := updateEvent.ObjectNew.(*workv1alpha2.ResourceBinding)
if oldBinding.DeletionTimestamp != newBinding.DeletionTimestamp {
return true
}
return careBindingSpecChanged(oldBinding.Spec, newBinding.Spec)
},
DeleteFunc: func(_ event.DeleteEvent) bool {
// The binding object has a finalizer. When the deletion timestamp is not nil,
// it means the object is being deleted and the controller will handle the
// deletion process, so the delete event can be ignored.
return false
},
GenericFunc: func(_ event.GenericEvent) bool { return false },
}

return controllerruntime.NewControllerManagedBy(mgr).
Named(ControllerName).
For(&workv1alpha2.ResourceBinding{}).
For(&workv1alpha2.ResourceBinding{}, builder.WithPredicates(bindingPredicateFn)).
WithEventFilter(predicate.GenerationChangedPredicate{}).
Watches(&policyv1alpha1.OverridePolicy{}, handler.EnqueueRequestsFromMapFunc(c.newOverridePolicyFunc())).
Watches(&policyv1alpha1.ClusterOverridePolicy{}, handler.EnqueueRequestsFromMapFunc(c.newOverridePolicyFunc())).
Expand Down
24 changes: 23 additions & 1 deletion pkg/controllers/binding/cluster_resource_binding_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ import (
"k8s.io/klog/v2"
"k8s.io/utils/ptr"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -183,9 +185,29 @@ func (c *ClusterResourceBindingController) checkDirectPurgeOrphanWorks(ctx conte

// SetupWithManager creates a controller and register to controller manager.
func (c *ClusterResourceBindingController) SetupWithManager(mgr controllerruntime.Manager) error {
bindingPredicateFn := predicate.Funcs{
CreateFunc: func(_ event.CreateEvent) bool {
return true
},
UpdateFunc: func(updateEvent event.UpdateEvent) bool {
oldBinding := updateEvent.ObjectOld.(*workv1alpha2.ClusterResourceBinding)
newBinding := updateEvent.ObjectNew.(*workv1alpha2.ClusterResourceBinding)
if oldBinding.DeletionTimestamp != newBinding.DeletionTimestamp {
return true
}
return careBindingSpecChanged(oldBinding.Spec, newBinding.Spec)
},
DeleteFunc: func(_ event.DeleteEvent) bool {
// The binding object has a finalizer. When the deletion timestamp is not nil,
// it means the object is being deleted and the controller will handle the
// deletion process, so the delete event can be ignored.
return false
},
GenericFunc: func(_ event.GenericEvent) bool { return false },
}
return controllerruntime.NewControllerManagedBy(mgr).
Named(ClusterResourceBindingControllerName).
For(&workv1alpha2.ClusterResourceBinding{}).
For(&workv1alpha2.ClusterResourceBinding{}, builder.WithPredicates(bindingPredicateFn)).
Watches(&policyv1alpha1.ClusterOverridePolicy{}, handler.EnqueueRequestsFromMapFunc(c.newOverridePolicyFunc())).
WithEventFilter(predicate.GenerationChangedPredicate{}).
WithOptions(controller.Options{RateLimiter: ratelimiterflag.DefaultControllerRateLimiter[controllerruntime.Request](c.RateLimiterOptions)}).
Expand Down
36 changes: 36 additions & 0 deletions pkg/controllers/binding/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package binding

import (
"context"
"reflect"
"strconv"
"time"

Expand Down Expand Up @@ -354,3 +355,38 @@ func shouldSuspendDispatching(suspension *workv1alpha2.Suspension, targetCluster
}
return suspendDispatching
}

type bindingSpecDigest struct {
Resource workv1alpha2.ObjectReference
Clusters []workv1alpha2.TargetCluster
GracefulEvictionTasks []workv1alpha2.GracefulEvictionTask
RequiredBy []workv1alpha2.BindingSnapshot
ConflictResolution policyv1alpha1.ConflictResolution
Suspension *workv1alpha2.Suspension
PreserveResourcesOnDeletion *bool
}

// careBindingSpecChanged checks whether the fields in bindingSpec that the binding controller cares about have changed.
// This helps avoid triggering the binding controller to resync when irrelevant fields are modified.
func careBindingSpecChanged(oldBindingSpec, newBindingSpec workv1alpha2.ResourceBindingSpec) bool {
oldDigest := bindingSpecDigest{
Resource: oldBindingSpec.Resource,
Clusters: oldBindingSpec.Clusters,
GracefulEvictionTasks: oldBindingSpec.GracefulEvictionTasks,
RequiredBy: oldBindingSpec.RequiredBy,
ConflictResolution: oldBindingSpec.ConflictResolution,
Suspension: oldBindingSpec.Suspension,
PreserveResourcesOnDeletion: oldBindingSpec.PreserveResourcesOnDeletion,
}
newDigest := bindingSpecDigest{
Resource: newBindingSpec.Resource,
Clusters: newBindingSpec.Clusters,
GracefulEvictionTasks: newBindingSpec.GracefulEvictionTasks,
RequiredBy: newBindingSpec.RequiredBy,
ConflictResolution: newBindingSpec.ConflictResolution,
Suspension: newBindingSpec.Suspension,
PreserveResourcesOnDeletion: newBindingSpec.PreserveResourcesOnDeletion,
}

return !reflect.DeepEqual(oldDigest, newDigest)
}
Loading