Merge pull request #419 from e0ne/nic-cluster-policy-node-reconcile

Watch for node label change event in NicClusterPolicy reconcile loop

Author: e0ne

controllers/nicclusterpolicy_controller.go

@@ -28,8 +28,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/util/workqueue"
 	ctrl "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/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -249,20 +252,33 @@ func (r *NicClusterPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 	r.stateManager = stateManager
 
-	builder := ctrl.NewControllerManagedBy(mgr).
+	ctl := ctrl.NewControllerManagedBy(mgr).
 		For(&mellanoxv1alpha1.NicClusterPolicy{}).
 		// Watch for changes to primary resource NicClusterPolicy
 		Watches(&source.Kind{Type: &mellanoxv1alpha1.NicClusterPolicy{}}, &handler.EnqueueRequestForObject{})
 
-	// Watch for changes to secondary resource DaemonSet and requeue the owner NicClusterPolicy
+	// we always add object with a same(static) key to the queue to reduce
+	// reconciliation count
+	updateEnqueue := handler.Funcs{
+		UpdateFunc: func(e event.UpdateEvent, q workqueue.RateLimitingInterface) {
+			q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+				Name: consts.NicClusterPolicyResourceName,
+			}})
+		},
+	}
+
+	// Watch for "feature.node.kubernetes.io/pci-15b3.present" label applying
+	nodePredicates := builder.WithPredicates(MlnxLabelChangedPredicate{})
+	ctl = ctl.Watches(&source.Kind{Type: &corev1.Node{}}, updateEnqueue, nodePredicates)
+
 	ws := stateManager.GetWatchSources()
 	r.Log.V(consts.LogLevelInfo).Info("Watch Sources", "Kind:", ws)
 	for i := range ws {
-		builder = builder.Watches(ws[i], &handler.EnqueueRequestForOwner{
+		ctl = ctl.Watches(ws[i], &handler.EnqueueRequestForOwner{
 			IsController: true,
 			OwnerType:    &mellanoxv1alpha1.NicClusterPolicy{},
 		})
 	}
 
-	return builder.Complete(r)
+	return ctl.Complete(r)
 }

controllers/predicate.go

@@ -0,0 +1,38 @@
+/*
+Copyright 2022 NVIDIA CORPORATION & AFFILIATES
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controllers
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+
+	"github.com/Mellanox/network-operator/pkg/nodeinfo"
+)
+
+type MlnxLabelChangedPredicate struct {
+	predicate.Funcs
+}
+
+func (p MlnxLabelChangedPredicate) hasMlnxLabel(labels map[string]string) bool {
+	// We don't need to check label value because NFD doesn't set it to "false"
+	_, exist := labels[nodeinfo.NodeLabelMlnxNIC]
+	return exist
+}
+
+func (p MlnxLabelChangedPredicate) Update(e event.UpdateEvent) bool {
+	return p.hasMlnxLabel(e.ObjectOld.GetLabels()) != p.hasMlnxLabel(e.ObjectNew.GetLabels())
+}

controllers/upgrade_controller.go

@@ -293,7 +293,7 @@ func (r *UpgradeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return ok
 	}))
 
-	// ignore all update events for nodes except when annotations where changed
+	// Watch for spec and annotation changes
 	nodePredicates := builder.WithPredicates(predicate.AnnotationChangedPredicate{})
 
 	return ctrl.NewControllerManagedBy(mgr).