Skip to content

Fix OVN condition flapping during minor updates #1966

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

Open
karelyatin wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −9
Open

Fix OVN condition flapping during minor updates #1966

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
33 changes: 24 additions & 9 deletions internal/controller/core/openstackcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,16 +315,23 @@ func (r *OpenStackControlPlaneReconciler) Reconcile(ctx context.Context, req ctr
}

// OVN
Log.Info("Minor update OVN on the ControlPlane")
ctrlResult, err = r.reconcileOVNControllers(ctx, instance, version, helper)
if err != nil {
return ctrl.Result{}, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}
instance.Status.DeployedOVNVersion = &version.Spec.TargetVersion
// Once the OVN controlplane phase is complete, skip reconcileOVNControllers to prevent
// transient OVN readiness changes from flapping OVNReadyCondition during
// later phases. We still need to mark OVNReadyCondition True because
// InitConditions() resets all conditions to Unknown on each reconcile.
if !version.Status.Conditions.IsTrue(corev1beta1.OpenStackVersionMinorUpdateOVNControlplane) {
Log.Info("Minor update OVN on the ControlPlane")
ctrlResult, err = r.reconcileOVNControllers(ctx, instance, version, helper)
if err != nil {
return ctrl.Result{}, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}
instance.Status.DeployedOVNVersion = &version.Spec.TargetVersion
// Wait for the OpenStackVersion controller to acknowledge OVN controlplane update
return ctrlResult, nil
} else {
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneOVNReadyCondition, corev1beta1.OpenStackControlPlaneOVNReadyMessage)
}

// only if OVN dataplane is updated
Expand Down Expand Up @@ -402,7 +409,15 @@ func (r *OpenStackControlPlaneReconciler) Reconcile(ctx context.Context, req ctr
}

func (r *OpenStackControlPlaneReconciler) reconcileOVNControllers(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *common_helper.Helper) (ctrl.Result, error) {
OVNControllerReady, OVNControllerConditions, err := openstack.ReconcileOVNController(ctx, instance, version, helper, "")
var ovnMetricsCertName string
if instance.Spec.TLS.PodLevel.Enabled {
var err error
ovnMetricsCertName, err = openstack.EnsureOVNMetricsCert(ctx, instance, helper)
if err != nil {
return ctrl.Result{}, err
}
}
OVNControllerReady, OVNControllerConditions, err := openstack.ReconcileOVNController(ctx, instance, version, helper, ovnMetricsCertName)
if err != nil {
return ctrl.Result{}, err
} else if !OVNControllerReady {
Expand Down
Loading