Merge pull request #659 from gibizer/allow-disabling-ovn

Do not block Ready when OVN is disabled
openstack-k8s-operators · Feb 9, 2024 · 04deeb6 · 04deeb6
2 parents 00c81bc + b6a776f
commit 04deeb6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go
@@ -45,6 +45,8 @@ func ReconcileOVN(ctx context.Context, instance *corev1beta1.OpenStackControlPla
 	// Expect all services (dbclusters, northd, ovn-controller) ready
 	if OVNDBClustersReady && OVNNorthdReady && OVNControllerReady {
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneOVNReadyCondition, corev1beta1.OpenStackControlPlaneOVNReadyMessage)
+	} else if !instance.Spec.Ovn.Enabled {
+		instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition)
 	} else {
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			corev1beta1.OpenStackControlPlaneOVNReadyCondition,