Finalizer calling logging

Signed-off-by: Jakob Naucke <jnaucke@redhat.com>

Author: Jakob-Naucke

.github/workflows/lint.yml

@@ -22,7 +22,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   # Pinned toolchain for linting
-  ACTIONS_LINTS_TOOLCHAIN: 1.88.0
+  ACTIONS_LINTS_TOOLCHAIN: 1.89.0
 
 jobs:
   linting:

Cargo.lock

@@ -9,7 +9,7 @@ resolver = "3"
 
 [workspace.package]
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.89"
 
 [workspace.dependencies]
 anyhow = "1.0.102"
@@ -23,7 +23,7 @@ env_logger = { version = "0.11.10", default-features = false, features = ["human
 http = "1.4.2"
 ignition-config = "0.6.1"
 k8s-openapi = { version = "0.28.0", features = ["v1_35", "schemars"] }
-kube = { version = "4.0.0", default-features = false, features = ["derive", "runtime", "openssl-tls"] }
+kube = { git = "https://github.com/Jakob-Naucke/kube-rs", branch = "finalizer-dbg", default-features = false, features = ["derive", "runtime", "openssl-tls"] }
 log = "0.4.32"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.150"

Cargo.toml

@@ -230,6 +230,7 @@ async fn image_reconcile(
     let cluster = get_opt_trusted_execution_cluster(kube_client.clone())
         .await
         .map_err(|e| -> ControllerError { e.into() })?;
+    info!("image {image:?}");
 
     let uid_owns = |uid: &String| {
         let refs = image.metadata.owner_references.as_ref();
@@ -249,7 +250,7 @@ async fn image_reconcile(
     }
 
     let images: Api<ApprovedImage> = Api::default_namespaced(kube_client.clone());
-    finalizer(&images, APPROVED_IMAGE_FINALIZER, image, |ev| async {
+    let result = finalizer(&images, APPROVED_IMAGE_FINALIZER, image, |ev| async {
         match ev {
             Event::Apply(image) => image_add_reconcile(kube_client, &image, cluster)
                 .await
@@ -259,8 +260,9 @@ async fn image_reconcile(
                 .map_err(|e| finalizer::Error::<ControllerError>::CleanupFailed(e.into())),
         }
     })
-    .await
-    .map_err(|e| anyhow!("failed to reconcile on image {name}: {e}").into())
+    .await;
+    info!("finalizer() for image {name} returned {result:?}");
+    result.map_err(|e| anyhow!("failed to reconcile on image {name}: {e}").into())
 }
 
 async fn image_add_reconcile(
@@ -306,6 +308,7 @@ async fn image_remove_reconcile(
 ) -> Result<Action> {
     let default = "<no name>".to_string();
     let name = image.metadata.name.as_ref().unwrap_or(&default);
+    info!("Cleanup for image {image:?}");
     if cluster.is_none() {
         info!("No TrustedExecutionCluster found, skipping disallow_image for {name}");
         return Ok(Action::await_change());

operator/src/reference_values.rs

@@ -131,7 +131,8 @@ async fn keygen_reconcile(
 ) -> Result<Action, ControllerError> {
     let kube_client_clone = Arc::unwrap_or_clone(client.clone());
     let machines: Api<Machine> = Api::default_namespaced(kube_client_clone.clone());
-    finalizer(&machines, MACHINE_FINALIZER, machine, |ev| async move {
+    info!("machine {machine:?}");
+    let result = finalizer(&machines, MACHINE_FINALIZER, machine, |ev| async move {
         match ev {
             Event::Apply(machine) => {
                 let kube_client = Arc::unwrap_or_clone(client);
@@ -148,6 +149,7 @@ async fn keygen_reconcile(
             Event::Cleanup(machine) => {
                 let kube_client = Arc::unwrap_or_clone(client);
                 let id = &machine.spec.id;
+                info!("Cleanup for machine {machine:?}");
 
                 // Check if the TrustedExecutionCluster is being deleted
                 // If so, skip unmounting the secret as everything will be cleaned up
@@ -194,8 +196,9 @@ async fn keygen_reconcile(
             }
         }
     })
-    .await
-    .map_err(|e| anyhow!("failed to reconcile on machine: {e}").into())
+    .await;
+    info!("finalizer() for machine returned {result:?}");
+    result.map_err(|e| anyhow!("failed to reconcile on machine: {e}").into())
 }
 
 pub async fn launch_keygen_controller(client: Client) {