Merge pull request #501 from stuggi/fix_ceilo_reconcile_delete

Fix running reconcileDelete on new instance
openstack-k8s-operators · Oct 9, 2024 · ae8ae90 · ae8ae90
2 parents 0fd60c8 + fa9c222
commit ae8ae90
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
@@ -203,7 +203,12 @@ func (r *CeilometerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	// If we're not deleting this and the service object doesn't have our finalizer, add it.
-	if !instance.DeletionTimestamp.IsZero() && controllerutil.AddFinalizer(instance, helper.GetFinalizer()) || isNewInstance {
+	if instance.DeletionTimestamp.IsZero() && controllerutil.AddFinalizer(instance, helper.GetFinalizer()) || isNewInstance {
+		return ctrl.Result{}, nil
+	}
+
+	// Handle service delete
+	if !instance.DeletionTimestamp.IsZero() {
 		return r.reconcileDelete(ctx, instance, helper)
 	}