diff --git a/controller/src/core/instance.rs b/controller/src/core/instance.rs index 45ed32ef..b68eaba7 100644 --- a/controller/src/core/instance.rs +++ b/controller/src/core/instance.rs @@ -29,7 +29,7 @@ impl From for Instance { namespace: String::from("default"), kind: workload_definition.kind, id: value.instance_id.unwrap(), - status: InstanceStatus::Unknown(String::from("Generated with APIChannel event")), + status: InstanceStatus::Pending, spec: workload_definition.spec, } } diff --git a/crates/definition/src/lib.rs b/crates/definition/src/lib.rs index 325fc2c9..94e72fc5 100644 --- a/crates/definition/src/lib.rs +++ b/crates/definition/src/lib.rs @@ -136,7 +136,6 @@ pub mod workload { #[derive(Serialize, Deserialize, Clone)] pub enum InstanceStatus { - Unknown(String), Pending, Running, Failed, @@ -148,7 +147,6 @@ pub enum InstanceStatus { impl Display for InstanceStatus { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - InstanceStatus::Unknown(_) => write!(f, "Unknown"), InstanceStatus::Pending => write!(f, "Pending"), InstanceStatus::Running => write!(f, "Running"), InstanceStatus::Failed => write!(f, "Failed"), @@ -162,7 +160,6 @@ impl Display for InstanceStatus { impl From for i32 { fn from(value: InstanceStatus) -> Self { match value { - InstanceStatus::Unknown(_) => 0, InstanceStatus::Pending => 1, InstanceStatus::Running => 2, InstanceStatus::Failed => 3, @@ -176,14 +173,12 @@ impl From for i32 { impl From for InstanceStatus { fn from(value: i32) -> Self { match value { - 0 => InstanceStatus::Unknown(String::from("")), - 1 => InstanceStatus::Pending, 2 => InstanceStatus::Running, 3 => InstanceStatus::Failed, 4 => InstanceStatus::Terminated, 5 => InstanceStatus::Creating, 6 => InstanceStatus::Destroying, - _ => InstanceStatus::Unknown(String::from("")), + _ => InstanceStatus::Pending, } } } diff --git a/proto/src/lib.rs b/proto/src/lib.rs index 67b83524..5530e215 100644 --- a/proto/src/lib.rs +++ b/proto/src/lib.rs @@ -39,7 +39,7 @@ impl From for ResourceStatus { impl From for InstanceStatus { fn from(value: ResourceStatus) -> Self { match value { - ResourceStatus::Unknown => InstanceStatus::Unknown(String::from("")), + ResourceStatus::Unknown => InstanceStatus::Pending, ResourceStatus::Pending => InstanceStatus::Pending, ResourceStatus::Running => InstanceStatus::Running, ResourceStatus::Failed => InstanceStatus::Failed,