Skip to content

Commit

Permalink
Use OVSNumberReady for evaluating NetworkAttachment Readiness
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
karelyatin committed Jun 13, 2024
1 parent 62d4b4e commit 62462a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion controllers/ovncontroller_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 62462a1

Please sign in to comment.