Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix load balancer controller by nic enqueueing #872

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Fix load balancer controller by nic enqueueing #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 56 additions & 22 deletions internal/controllers/networking/loadbalancer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -188,40 +189,73 @@ func (r *LoadBalancerReconciler) applyRouting(
}

func (r *LoadBalancerReconciler) enqueueByNetworkInterface() handler.EventHandler {
return handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []ctrl.Request {
nic := obj.(*networkingv1alpha1.NetworkInterface)
log := ctrl.LoggerFrom(ctx, "NetworkInterfaceKey", client.ObjectKeyFromObject(nic))

getEnqueueFunc := func(ctx context.Context, nic *networkingv1alpha1.NetworkInterface) func(nics []*networkingv1alpha1.NetworkInterface, queue workqueue.RateLimitingInterface) {
log := ctrl.LoggerFrom(ctx)
loadBalancerList := &networkingv1alpha1.LoadBalancerList{}
if err := r.List(ctx, loadBalancerList,
client.InNamespace(nic.Namespace),
client.MatchingFields{networking.LoadBalancerNetworkNameField: nic.Spec.NetworkRef.Name},
); err != nil {
log.Error(err, "Error listing loadbalancers for network")
log.Error(err, "Error listing network interfaces")
return nil
}

var res []ctrl.Request
for _, loadBalancer := range loadBalancerList.Items {
loadBalancerKey := client.ObjectKeyFromObject(&loadBalancer)
log := log.WithValues("LoadBalancerKey", loadBalancerKey)
nicSelector := loadBalancer.Spec.NetworkInterfaceSelector
if nicSelector == nil {
return nil
return func(nics []*networkingv1alpha1.NetworkInterface, queue workqueue.RateLimitingInterface) {
for _, loadBalancer := range loadBalancerList.Items {
loadBalancerKey := client.ObjectKeyFromObject(&loadBalancer)
log := log.WithValues("LoadBalancerKey", loadBalancerKey)
nicSelector := loadBalancer.Spec.NetworkInterfaceSelector
if nicSelector == nil {
return
}

sel, err := metav1.LabelSelectorAsSelector(nicSelector)
if err != nil {
log.Error(err, "Invalid network interface selector")
continue
}

for _, nic := range nics {
if sel.Matches(labels.Set(nic.Labels)) {
queue.Add(ctrl.Request{NamespacedName: loadBalancerKey})
break
}
}
}
}
}

sel, err := metav1.LabelSelectorAsSelector(nicSelector)
if err != nil {
log.Error(err, "Invalid network interface selector")
continue
return handler.Funcs{
CreateFunc: func(ctx context.Context, evt event.CreateEvent, queue workqueue.RateLimitingInterface) {
nic := evt.Object.(*networkingv1alpha1.NetworkInterface)
enqueueFunc := getEnqueueFunc(ctx, nic)
if enqueueFunc != nil {
enqueueFunc([]*networkingv1alpha1.NetworkInterface{nic}, queue)
}

if sel.Matches(labels.Set(nic.Labels)) {
res = append(res, ctrl.Request{NamespacedName: loadBalancerKey})
},
UpdateFunc: func(ctx context.Context, evt event.UpdateEvent, queue workqueue.RateLimitingInterface) {
newNic := evt.ObjectNew.(*networkingv1alpha1.NetworkInterface)
oldNic := evt.ObjectOld.(*networkingv1alpha1.NetworkInterface)
enqueueFunc := getEnqueueFunc(ctx, newNic)
if enqueueFunc != nil {
enqueueFunc([]*networkingv1alpha1.NetworkInterface{newNic, oldNic}, queue)
}
}
return res
})
},
DeleteFunc: func(ctx context.Context, evt event.DeleteEvent, queue workqueue.RateLimitingInterface) {
nic := evt.Object.(*networkingv1alpha1.NetworkInterface)
enqueueFunc := getEnqueueFunc(ctx, nic)
if enqueueFunc != nil {
enqueueFunc([]*networkingv1alpha1.NetworkInterface{nic}, queue)
}
},
GenericFunc: func(ctx context.Context, evt event.GenericEvent, queue workqueue.RateLimitingInterface) {
nic := evt.Object.(*networkingv1alpha1.NetworkInterface)
enqueueFunc := getEnqueueFunc(ctx, nic)
if enqueueFunc != nil {
enqueueFunc([]*networkingv1alpha1.NetworkInterface{nic}, queue)
}
},
}
}

func (r *LoadBalancerReconciler) enqueueByNetwork() handler.EventHandler {
Expand Down
14 changes: 14 additions & 0 deletions internal/controllers/networking/loadbalancer_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,19 @@ var _ = Describe("LoadBalancerReconciler", func() {
},
}),
))

By("removing the labels from the network interface")
Eventually(Update(nic, func() {
nic.Labels = nil
})).Should(Succeed())

By("waiting for the load balancer routing to be updated")
Eventually(Object(loadBalancerRouting)).Should(SatisfyAll(
HaveField("NetworkRef", commonv1alpha1.LocalUIDReference{
Name: network.Name,
UID: network.UID,
}),
HaveField("Destinations", BeEmpty()),
))
})
})