Merge pull request #22 from IBM/fix_status_finalizer

Fix bug when removing finalizer

Author: gabe-l-hart

oper8/deploy_manager/dry_run_deploy_manager.py

@@ -89,12 +89,19 @@ def disable(self, resource_definitions):
                     log.debug2(
                         "Calling registered finalizer [%s] for [%s]", callback, key
                     )
-                    callback(content)
-
-                # If finalizers have been cleared than delete object
-                if not self._cluster_content[namespace][kind][api_version][name][
-                    "metadata"
-                ].get("finalizers"):
+                    callback(self._cluster_content[namespace][kind][api_version][name])
+
+                # If finalizers have been cleared and object hasn't already been deleted then
+                # remove the key
+                current_obj = (
+                    self._cluster_content.get(namespace, {})
+                    .get(kind, {})
+                    .get(api_version, {})
+                    .get(name, {})
+                )
+                if current_obj and not current_obj.get("metadata", {}).get(
+                    "finalizers", []
+                ):
                     with DRY_RUN_CLUSTER_LOCK:
                         self._delete_key(namespace, kind, api_version, name)
 

oper8/utils.py

@@ -216,7 +216,11 @@ def add_finalizer(session: SESSION_TYPE, finalizer: str):
 
     log.debug("Adding finalizer: %s", finalizer)
 
-    manifest = copy.deepcopy(session.cr_manifest)
+    manifest = {
+        "kind": session.kind,
+        "apiVersion": session.api_version,
+        "metadata": copy.deepcopy(session.metadata),
+    }
     manifest["metadata"].setdefault("finalizers", []).append(finalizer)
     success, _ = session.deploy_manager.deploy([manifest])
 
@@ -243,7 +247,14 @@ def remove_finalizer(session: SESSION_TYPE, finalizer: str):
 
     log.debug("Removing finalizer: %s", finalizer)
 
-    manifest = copy.deepcopy(session.cr_manifest)
+    # Create manifest with only required fields
+    manifest = {
+        "kind": session.kind,
+        "apiVersion": session.api_version,
+        "metadata": copy.deepcopy(session.metadata),
+    }
+
+    # Remove the finalizer
     manifest["metadata"]["finalizers"].remove(finalizer)
     success, _ = session.deploy_manager.deploy([manifest])
 

oper8/watch_manager/dry_run_watch_manager.py

@@ -105,8 +105,10 @@ def run_reconcile(self, is_finalizer: bool, resource: dict):
         if (
             self._resource.get("kind") == resource.get("kind")
             and self._resource.get("apiVersion") == resource.get("apiVersion")
-            and resource_metadata.get("name") == resource_metadata.get("name")
-            and resource_metadata.get("namespace") == resource_metadata.get("namespace")
+            and resource_metadata.get("name")
+            == resource.get("metadata", {}).get("name")
+            and resource_metadata.get("namespace")
+            == resource.get("metadata", {}).get("namespace")
         ):
             return
 

tests/test_reconcile.py

@@ -63,16 +63,16 @@ def check_status(
         api_version=cr.apiVersion,
     )
     assert obj is not None
-    assert obj.status
+    assert obj.get("status")
 
-    ready_cond = status.get_condition(status.READY_CONDITION, obj.status)
+    ready_cond = status.get_condition(status.READY_CONDITION, obj["status"])
     if ready_reason:
         assert ready_cond
         assert ready_cond["reason"] == ready_reason.value
     else:
         assert not ready_cond
 
-    update_cond = status.get_condition(status.UPDATING_CONDITION, obj.status)
+    update_cond = status.get_condition(status.UPDATING_CONDITION, obj["status"])
     if updating_reason:
         assert update_cond
         assert update_cond["reason"] == updating_reason.value