normalize the deployment ready check

Replace spec replica count with readycount check
openstack-k8s-operators · Jun 20, 2024 · 7a69b24 · 7a69b24
1 parent e9f5a93
commit 7a69b24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/controllers/novaconductor_controller.go b/controllers/novaconductor_controller.go
@@ -282,8 +282,9 @@ func (r *NovaConductorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, err
 	}
 
-	if *instance.Spec.Replicas != instance.Status.ReadyCount {
-		Log.Info("Waiting for the ReadyCount to become equal to Replicas before doing service cleanup in nova database.")
+	if !instance.Status.Conditions.IsTrue(condition.DeploymentReadyCondition) {
+		Log.Info("Waiting for the deployment to be ready before doing service cleanup in the nova database.")
+
 		return ctrl.Result{}, nil
 	}
 	// clean up nova services from nova db should be always a last step in reconcile

diff --git a/controllers/novascheduler_controller.go b/controllers/novascheduler_controller.go
@@ -279,8 +279,9 @@ func (r *NovaSchedulerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return result, err
 	}
 
-	if *instance.Spec.Replicas != instance.Status.ReadyCount {
-		Log.Info("Waiting for the ReadyCount to become equal to Replicas before doing service cleanup in nova database.")
+	if !instance.Status.Conditions.IsTrue(condition.DeploymentReadyCondition) {
+		Log.Info("Waiting for the deployment to be ready before doing service cleanup in the nova database.")
+
 		return ctrl.Result{}, nil
 	}