JsonInstance update with new field and requeue Action reconcil

Author: EliXorZz

resources/epsilon_instance-definition.yaml

@@ -46,6 +46,9 @@ spec:
                 ip:
                   nullable: true
                   type: string
+                online:
+                  format: int32
+                  type: integer
                 slots:
                   format: int32
                   type: integer
@@ -67,6 +70,7 @@ spec:
                 - close
                 - content
                 - hub
+                - online
                 - slots
                 - state
                 - t

src/controller/definitions/epsilon_instance.rs

@@ -40,24 +40,33 @@ pub struct EpsilonInstanceStatus {
     pub state: EpsilonState,
 
     pub slots: i32,
+    pub online: i32,
 
     pub close: bool,
 }
 
 impl EpsilonInstance {
     pub async fn to_json(&self) -> Result<InstanceJson, EpsilonError> {
+        let status = self
+            .status
+            .as_ref()
+            .ok_or(EpsilonError::RetrieveStatusError)?.clone();
+
         Ok(InstanceJson {
             name: self.get_name(),
             template: self.spec.template.clone(),
-            state: self.get_state(),
 
-            slots: self
-                .status
-                .as_ref()
-                .ok_or(EpsilonError::RetrieveStatusError)?
-                .slots,
+            content: status.content,
 
+            hub: status.hub,
+
+            t: status.t,
+            state: self.get_state(),
+
+            slots: status.slots,
             online_count: self.get_online_count().await.unwrap_or(0),
+
+            ip: status.ip,
         })
     }
 
@@ -137,7 +146,17 @@ impl VectorOfInstance for Vec<Arc<EpsilonInstance>> {
 pub struct InstanceJson {
     pub name: String,
     pub template: String,
+
+    pub content: String,
+
+    pub hub: bool,
+
+    #[serde(rename = "type")]
+    pub t: InstanceType,
     pub state: EpsilonState,
+
     pub slots: i32,
     pub online_count: i32,
+
+    pub ip: Option<String>
 }

src/controller/epsilon_controller.rs

@@ -21,6 +21,7 @@ use serde_json::json;
 use std::collections::BTreeMap;
 use std::env;
 use std::sync::Arc;
+use std::time::Duration;
 
 pub struct EpsilonController {
     context: Arc<Context>,
@@ -57,7 +58,7 @@ impl EpsilonController {
                 .run(Self::reconcile, Self::on_error, clone_context)
                 .for_each(|res| async move {
                     match res {
-                        Ok(_) => {}
+                        Ok(_) => debug!("Sync successful"),
                         Err(e) => debug!("Reconcile failed: {:?}", e),
                     }
                 })
@@ -202,6 +203,7 @@ impl EpsilonController {
                                     content: String::from(""),
 
                                     slots: template.slots,
+                                    online: 0,
 
                                     close: state == EpsilonState::Stopping,
 
@@ -212,6 +214,10 @@ impl EpsilonController {
                                 status.ip = pod_ip;
                                 status.state = state;
 
+                                if state == EpsilonState::Running {
+                                    status.online = epsilon_instance.get_online_count().await.unwrap_or(0);
+                                }
+
                                 status
                             }
                         };
@@ -247,7 +253,7 @@ impl EpsilonController {
             }
         };
 
-        Ok(Action::await_change())
+        Ok(Action::requeue(Duration::from_secs(30)))
     }
 
     fn on_error(error: &Error, _context: Arc<Context>) -> Action {