Fix error on CR deletion

This closes #39, by returning nil instead of err
openstack-k8s-operators · Nov 6, 2023 · 9924389 · 9924389
1 parent 991a805
commit 9924389
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/controllers/barbicanapi_controller.go b/controllers/barbicanapi_controller.go
@@ -90,7 +90,7 @@ func (r *BarbicanAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			// Object not found
-			return ctrl.Result{}, err
+			return ctrl.Result{}, nil
 		}
 		// Error reading the object - requeue the request.
 		return ctrl.Result{}, err

diff --git a/controllers/barbicankeystonelistener_controller.go b/controllers/barbicankeystonelistener_controller.go
@@ -70,7 +70,7 @@ func (r *BarbicanKeystoneListenerReconciler) Reconcile(ctx context.Context, req
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			// Object not found
-			return ctrl.Result{}, err
+			return ctrl.Result{}, nil
 		}
 		// Error reading the object - requeue the request.
 		return ctrl.Result{}, err

diff --git a/controllers/barbicanworker_controller.go b/controllers/barbicanworker_controller.go
@@ -68,7 +68,8 @@ func (r *BarbicanWorkerReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	err := r.Client.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
-			return ctrl.Result{}, err
+			// Object not found
+			return ctrl.Result{}, nil
 		}
 		// Error reading the object - requeue the request.
 		return ctrl.Result{}, err