fix: init task not match return None error

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.8.21"
+version = "0.8.22"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/amphitheatre-app/amphitheatre"

resources/src/kpack/syncer.rs

@@ -123,8 +123,13 @@ pub async fn ready(client: &Client, actor: &Actor) -> Result<bool> {
     let pod = result.unwrap();
     let status = pod.status.as_ref().ok_or_else(|| Error::MissingObjectKey(".status"))?;
 
+    // Check if the Pod phase is Succeeded
+    if let Some(phase) = &status.phase {
+        return Ok(phase == "Succeeded");
+    }
+
     if let Some(conditions) = &status.conditions {
-        return Ok(conditions.iter().any(|c| c.type_ == "Ready" && c.status == "True"));
+        return Ok(conditions.iter().any(|c| c.type_ == "Running" && c.status == "True"));
     }
 
     Ok(false)

workflow/src/actor/init.rs

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::time::Duration;
+
+use crate::actor::{BuildingState, DeployingState};
 use crate::errors::{Error, Result};
 use crate::{Context, Intent, State, Task};
 
@@ -20,11 +23,10 @@ use amp_common::resource::{Actor, ActorState};
 
 use amp_resources::actor;
 use async_trait::async_trait;
+use kube::runtime::controller::Action;
 use kube::ResourceExt;
 use tracing::{error, info, trace};
 
-use super::{BuildingState, DeployingState};
-
 pub struct InitialState;
 
 #[async_trait]
@@ -35,16 +37,25 @@ impl State<Actor> for InitialState {
 
         // Check if InitTask should be executed
         let task = InitTask::new();
-        if !task.matches(ctx) {
-            return None;
+        if task.matches(ctx) {
+            match task.execute(ctx).await {
+                Ok(Some(intent)) => return Some(intent),
+                Err(err) => error!("Error during DeployTask execution: {}", err),
+                Ok(None) => {}
+            }
         }
 
-        let result = task.execute(ctx).await;
-        if let Err(err) = &result {
-            error!("Error during InitTask execution: {}", err);
+        // Transition to the building state if status of actor is building
+        if ctx.object.status.as_ref().is_some_and(|status| status.building()) {
+            return Some(Intent::State(Box::new(BuildingState)));
         }
 
-        result.ok().and_then(|intent| intent)
+        // Transition to the deploying state if status of actor is running
+        if ctx.object.status.as_ref().is_some_and(|status| status.running()) {
+            return Some(Intent::State(Box::new(DeployingState)));
+        }
+
+        None
     }
 }
 
@@ -68,13 +79,14 @@ impl Task<Actor> for InitTask {
         if actor.spec.live || !self.built(ctx).await? {
             let condition = ActorState::building();
             actor::patch_status(&ctx.k8s, &ctx.object, condition).await.map_err(Error::ResourceError)?;
-            Ok(Some(Intent::State(Box::new(BuildingState))))
         } else {
             // patch the status to running
             let condition = ActorState::running(true, "AutoRun", None);
             actor::patch_status(&ctx.k8s, &ctx.object, condition).await.map_err(Error::ResourceError)?;
-            Ok(Some(Intent::State(Box::new(DeployingState))))
         }
+
+        // Requeue immediately
+        Ok(Some(Intent::Action(Action::requeue(Duration::ZERO))))
     }
 }