From 62462a1b9609c36871963a48593113080d4665e4 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Thu, 13 Jun 2024 18:02:37 +0530 Subject: [PATCH] Use OVSNumberReady for evaluating NetworkAttachment Readiness NumberReady status field was used currently but that's for ovn-controller but we don't attach secondary nics to it. Use correct status field i.e OVSNumberReady. This should also fix random failues in functional test which check for NetworkAttachment condition. --- controllers/ovncontroller_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/ovncontroller_controller.go b/controllers/ovncontroller_controller.go index c077fbf1..b8be90fa 100644 --- a/controllers/ovncontroller_controller.go +++ b/controllers/ovncontroller_controller.go @@ -562,7 +562,7 @@ func (r *OVNControllerReconciler) reconcileNormal(ctx context.Context, instance instance.Status.OVSNumberReady = ovsdset.GetDaemonSet().Status.NumberReady // verify if network attachment matches expectations - networkReady, networkAttachmentStatus, err := nad.VerifyNetworkStatusFromAnnotation(ctx, helper, networkAttachmentsNoPhysNet, ovsServiceLabels, instance.Status.NumberReady) + networkReady, networkAttachmentStatus, err := nad.VerifyNetworkStatusFromAnnotation(ctx, helper, networkAttachmentsNoPhysNet, ovsServiceLabels, instance.Status.OVSNumberReady) if err != nil { return ctrl.Result{}, err }