Change default should_requeue logic for deleted resources

oper8/controller.py

@@ -221,9 +221,10 @@ def should_requeue(self, session: Session) -> Tuple[bool, Optional[RequeueParams
                 "Failed to fetch current state for %s/%s/%s", namespace, kind, name
             )
             return True, requeue_params
+        # Do not requeue if resource was deleted
         if not current_state:
             log.warning("Resource not found: %s/%s/%s", namespace, kind, name)
-            return True, requeue_params
+            return False, requeue_params
 
         log.debug3("Current CR manifest for requeue check: %s", current_state)
 

oper8/test_helpers/helpers.py

@@ -89,14 +89,20 @@ def setup_session(
     full_cr=None,
     deploy_manager=None,
     namespace=TEST_NAMESPACE,
+    deploy_initial_cr=True,
     **kwargs,
 ):
     app_config = app_config or aconfig.Config({}, override_env_vars=False)
     deploy_config = deploy_config or aconfig.Config({}, override_env_vars=False)
     full_cr = full_cr or setup_cr(
         deploy_config=deploy_config, version=version, namespace=namespace
     )
-    deploy_manager = deploy_manager or MockDeployManager(resources=[full_cr])
+    if not deploy_manager:
+        deploy_manager = (
+            MockDeployManager(resources=[full_cr])
+            if deploy_initial_cr
+            else MockDeployManager()
+        )
 
     return Session(
         reconciliation_id=str(uuid.uuid4()),

tests/test_controller.py

@@ -461,9 +461,9 @@ def __init__(self, *args, **kwargs):
 
 
 def test_should_requeue_no_obj():
-    session = setup_session()
+    session = setup_session(deploy_initial_cr=False)
     ctrlr = DummyController()
-    assert ctrlr.should_requeue(session) == (True, RequeueParams())
+    assert ctrlr.should_requeue(session) == (False, RequeueParams())
 
 
 def test_should_requeue_failed_status():