Merge pull request vmware-tanzu#718 from zhengxiexie/zhengxie/node_filter_new

Add predicate func for pod controller and node controller +1

Author: zhengxiexie

pkg/controllers/node/node_controller.go

@@ -97,7 +97,6 @@ func (r *NodeReconciler) Start(mgr ctrl.Manager) error {
 	return nil
 }
 
-// PredicateFuncsNode filters out events where only resourceVersion, lastHeartbeatTime, or lastTransitionTime have changed
 var PredicateFuncsNode = predicate.Funcs{
 	UpdateFunc: func(e event.UpdateEvent) bool {
 		oldNode, okOld := e.ObjectOld.(*v1.Node)
@@ -106,13 +105,12 @@ var PredicateFuncsNode = predicate.Funcs{
 			return true
 		}
 
-		// If only the heartbeat time, transition time and resource version has changed, and other properties unchanged, ignore the update
+		// If only the condition, resource version, allocatable, capacity have changed, and other properties unchanged, ignore the update
 		if len(newNode.Status.Conditions) > 0 && len(oldNode.Status.Conditions) > 0 {
-			if newNode.ResourceVersion != oldNode.ResourceVersion &&
-				newNode.Status.Conditions[0].LastHeartbeatTime != oldNode.Status.Conditions[0].LastHeartbeatTime &&
-				newNode.Status.Conditions[0].LastTransitionTime != oldNode.Status.Conditions[0].LastTransitionTime {
-				oldNode.Status.Conditions[0].LastHeartbeatTime = newNode.Status.Conditions[0].LastHeartbeatTime
-				oldNode.Status.Conditions[0].LastTransitionTime = newNode.Status.Conditions[0].LastTransitionTime
+			if newNode.ResourceVersion != oldNode.ResourceVersion {
+				oldNode.Status.Allocatable = newNode.Status.Allocatable
+				oldNode.Status.Capacity = newNode.Status.Capacity
+				oldNode.Status.Conditions = newNode.Status.Conditions
 				return !reflect.DeepEqual(oldNode.Status, newNode.Status)
 			}
 		}

pkg/controllers/pod/pod_controller.go

@@ -18,6 +18,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/controllers/common"
 	"github.com/vmware-tanzu/nsx-operator/pkg/logger"
@@ -64,10 +66,6 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 		log.Error(err, "unable to fetch Pod", "Pod", req.NamespacedName)
 		return common.ResultRequeue, err
 	}
-	if pod.Spec.HostNetwork {
-		log.Info("skipping handling hostnetwork pod", "pod", req.NamespacedName)
-		return common.ResultNormal, nil
-	}
 	if len(pod.Spec.NodeName) == 0 {
 		log.Info("pod is not scheduled on node yet, skipping", "pod", req.NamespacedName)
 		return common.ResultNormal, nil
@@ -135,6 +133,7 @@ func (r *PodReconciler) GetNodeByName(nodeName string) (*model.HostTransportNode
 func (r *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v1.Pod{}).
+		WithEventFilter(PredicateFuncsPod).
 		WithOptions(
 			controller.Options{
 				MaxConcurrentReconciles: common.NumReconcile(),
@@ -267,3 +266,34 @@ func (r *PodReconciler) deleteSubnetPortByPodName(ctx context.Context, ns string
 	log.Info("successfully deleted nsxSubnetPort for Pod", "namespace", ns, "name", name)
 	return nil
 }
+
+// PredicateFuncsPod filters out events where pod.Spec.HostNetwork is true
+var PredicateFuncsPod = predicate.Funcs{
+	UpdateFunc: func(e event.UpdateEvent) bool {
+		oldPod, okOld := e.ObjectOld.(*v1.Pod)
+		newPod, okNew := e.ObjectNew.(*v1.Pod)
+		if !okOld || !okNew {
+			return true
+		}
+
+		if oldPod.Spec.HostNetwork && newPod.Spec.HostNetwork {
+			return false
+		}
+		return true
+	},
+	CreateFunc: func(e event.CreateEvent) bool {
+		pod, ok := e.Object.(*v1.Pod)
+		if !ok {
+			return true
+		}
+
+		if pod.Spec.HostNetwork {
+			return false
+		}
+		return true
+	},
+	DeleteFunc: func(e event.DeleteEvent) bool { return true },
+	GenericFunc: func(e event.GenericEvent) bool {
+		return true
+	},
+}