Merge pull request #501 from stuggi/fix_ceilo_reconcile_delete

openshift-merge-bot[bot] · web-flow · commit ae8ae900119d · 2024-10-09T16:12:30.000Z
Fix running reconcileDelete on new instance
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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,12 @@ func (r *CeilometerReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// If we're not deleting this and the service object doesn't have our finalizer, add it.`
`206`		`- if !instance.DeletionTimestamp.IsZero() && controllerutil.AddFinalizer(instance, helper.GetFinalizer()) \|\| isNewInstance {`
	`206`	`+ if instance.DeletionTimestamp.IsZero() && controllerutil.AddFinalizer(instance, helper.GetFinalizer()) \|\| isNewInstance {`
	`207`	`+ return ctrl.Result{}, nil`
	`208`	`+ }`
	`209`	`+`
	`210`	`+ // Handle service delete`
	`211`	`+ if !instance.DeletionTimestamp.IsZero() {`
`207`	`212`	`return r.reconcileDelete(ctx, instance, helper)`
`208`	`213`	`}`
`209`	`214`