diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go index 77c7f094d7..95bd575c9f 100644 --- a/controllers/sriovnetworknodepolicy_controller.go +++ b/controllers/sriovnetworknodepolicy_controller.go @@ -23,6 +23,7 @@ import ( "os" "sort" "strings" + "time" errs "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" @@ -35,11 +36,15 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" kscheme "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/util/workqueue" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "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/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/source" dptypes "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types" @@ -49,6 +54,8 @@ import ( "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/render" ) +const nodePolicySyncEventName = "node-policy-sync-event" + // SriovNetworkNodePolicyReconciler reconciles a SriovNetworkNodePolicy object type SriovNetworkNodePolicyReconciler struct { client.Client @@ -70,6 +77,10 @@ type SriovNetworkNodePolicyReconciler struct { // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.3/pkg/reconcile func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { reqLogger := log.FromContext(ctx).WithValues("sriovnetworknodepolicy", req.NamespacedName) + if req.Name != nodePolicySyncEventName { + reqLogger.Info("Skip reconciling") + return reconcile.Result{}, nil + } reqLogger.Info("Reconciling") @@ -152,9 +163,28 @@ func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ct // SetupWithManager sets up the controller with the Manager. func (r *SriovNetworkNodePolicyReconciler) SetupWithManager(mgr ctrl.Manager) error { + + qHandler := func(q workqueue.RateLimitingInterface) { + q.AddAfter(reconcile.Request{NamespacedName: types.NamespacedName{ + Namespace: namespace, + Name: nodePolicySyncEventName, + }}, time.Second) + } + + squashAndDebounceHandler := handler.Funcs{ + CreateFunc: func(e event.CreateEvent, q workqueue.RateLimitingInterface) { + qHandler(q) + }, + UpdateFunc: func(e event.UpdateEvent, q workqueue.RateLimitingInterface) { + qHandler(q) + }, + } + return ctrl.NewControllerManagedBy(mgr). For(&sriovnetworkv1.SriovNetworkNodePolicy{}). + Watches(&source.Kind{Type: &sriovnetworkv1.SriovNetworkNodePolicy{}}, squashAndDebounceHandler). Complete(r) + } func (r *SriovNetworkNodePolicyReconciler) syncDevicePluginConfigMap(ctx context.Context, pl *sriovnetworkv1.SriovNetworkNodePolicyList, nl *corev1.NodeList) error {