Merge pull request #513 from zeeke/react-namespace-refactor

Refactor network controller namespace handlers
k8snetworkplumbingwg · Oct 16, 2023 · d5499fd · d5499fd
2 parents a3ea7b1 + 6f63125
commit d5499fd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 36 deletions.
diff --git a/controllers/sriovibnetwork_controller.go b/controllers/sriovibnetwork_controller.go
@@ -183,28 +183,30 @@ func (r *SriovIBNetworkReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 func (r *SriovIBNetworkReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// Reconcile when the target namespace is created after the SriovNetwork object.
 	namespaceHandler := handler.Funcs{
-		CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
-			ibNetworkList := sriovnetworkv1.SriovIBNetworkList{}
-			err := r.List(ctx,
-				&ibNetworkList,
-				client.MatchingFields{"spec.networkNamespace": e.Object.GetName()},
-			)
-			if err != nil {
-				log.Log.WithName("SriovIBNetworkReconciler").
-					Info("Can't list SriovIBNetworkReconciler for namespace", "resource", e.Object.GetName(), "error", err)
-			}
-
-			for _, network := range ibNetworkList.Items {
-				q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
-					Namespace: network.Namespace,
-					Name:      network.Name,
-				}})
-			}
-		},
+		CreateFunc: r.namespaceHandlerCreate,
 	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&sriovnetworkv1.SriovIBNetwork{}).
 		Watches(&netattdefv1.NetworkAttachmentDefinition{}, &handler.EnqueueRequestForObject{}).
 		Watches(&corev1.Namespace{}, &namespaceHandler).
 		Complete(r)
 }
+
+func (r *SriovIBNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
+	ibNetworkList := sriovnetworkv1.SriovIBNetworkList{}
+	err := r.List(ctx,
+		&ibNetworkList,
+		client.MatchingFields{"spec.networkNamespace": e.Object.GetName()},
+	)
+	if err != nil {
+		log.Log.WithName("SriovIBNetworkReconciler").
+			Info("Can't list SriovIBNetworkReconciler for namespace", "resource", e.Object.GetName(), "error", err)
+	}
+
+	for _, network := range ibNetworkList.Items {
+		q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+			Namespace: network.Namespace,
+			Name:      network.Name,
+		}})
+	}
+}
diff --git a/controllers/sriovnetwork_controller.go b/controllers/sriovnetwork_controller.go
@@ -184,24 +184,7 @@ func (r *SriovNetworkReconciler) Reconcile(ctx context.Context, req ctrl.Request
 func (r *SriovNetworkReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// Reconcile when the target namespace is created after the SriovNetwork object.
 	namespaceHandler := handler.Funcs{
-		CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
-			networkList := sriovnetworkv1.SriovNetworkList{}
-			err := r.List(ctx,
-				&networkList,
-				client.MatchingFields{"spec.networkNamespace": e.Object.GetName()},
-			)
-			if err != nil {
-				log.Log.WithName("SriovNetworkReconciler").
-					Info("Can't list SriovNetworks for namespace", "resource", e.Object.GetName(), "error", err)
-			}
-
-			for _, network := range networkList.Items {
-				q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
-					Namespace: network.Namespace,
-					Name:      network.Name,
-				}})
-			}
-		},
+		CreateFunc: r.namespaceHandlerCreate,
 	}
 
 	return ctrl.NewControllerManagedBy(mgr).
@@ -210,3 +193,22 @@ func (r *SriovNetworkReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&corev1.Namespace{}, &namespaceHandler).
 		Complete(r)
 }
+
+func (r *SriovNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
+	networkList := sriovnetworkv1.SriovNetworkList{}
+	err := r.List(ctx,
+		&networkList,
+		client.MatchingFields{"spec.networkNamespace": e.Object.GetName()},
+	)
+	if err != nil {
+		log.Log.WithName("SriovNetworkReconciler").
+			Info("Can't list SriovNetworks for namespace", "resource", e.Object.GetName(), "error", err)
+	}
+
+	for _, network := range networkList.Items {
+		q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+			Namespace: network.Namespace,
+			Name:      network.Name,
+		}})
+	}
+}