Merge branch 'nightly' into release/nightly/bin/nanocl/0.16.0

bin/nanocl/src/config.rs

@@ -46,10 +46,7 @@ impl UserConfig {
       Ok(s) => s,
       Err(_) => return UserConfig::default(),
     };
-    match serde_yaml::from_str::<UserConfig>(&s) {
-      Ok(config) => config,
-      Err(_) => UserConfig::default(),
-    }
+    serde_yaml::from_str::<UserConfig>(&s).unwrap_or_default()
   }
 }
 

bin/nanocld/Cargo.toml

@@ -78,7 +78,7 @@ chrono = { version = "0.4", default-features = false, features = [
   "clock",
   "serde",
 ] }
-jsonschema = { version = "0.22", default-features = false }
+jsonschema = { version = "0.23", default-features = false }
 nanocld_client = { version = "0.16", features = ["tokio"] }
 metrsd_client = "0.5"
 nanocl_stubs = { version = "0.16", features = ["serde", "clap"] }

bin/nanocld/specs/swagger.yaml

@@ -3259,7 +3259,7 @@ components:
         Name:
           type: string
         IpAddress:
-          type: string
+          $ref: '#/components/schemas/NetworkKind'
       additionalProperties: false
     Driver:
       type: object
@@ -5774,7 +5774,7 @@ components:
           nullable: true
           minimum: 0
         Network:
-          $ref: '#/components/schemas/ProxyNetwork'
+          $ref: '#/components/schemas/NetworkKind'
         LimitReqZone:
           allOf:
           - $ref: '#/components/schemas/LimitReqZone'
@@ -5805,7 +5805,7 @@ components:
       - Target
       properties:
         Network:
-          $ref: '#/components/schemas/ProxyNetwork'
+          $ref: '#/components/schemas/NetworkKind'
         Protocol:
           $ref: '#/components/schemas/ProxyStreamProtocol'
         Port:
@@ -6039,7 +6039,7 @@ components:
       - Entries
       properties:
         Network:
-          type: string
+          $ref: '#/components/schemas/NetworkKind'
         Entries:
           type: array
           items:

bin/nanocld/src/main.rs

@@ -38,7 +38,6 @@ async fn main() -> std::io::Result<()> {
       err.print_and_exit();
     }
     Ok(config) => config,
-    // gfg
   };
   // Boot internal dependencies (database, event bus, etc...)
   let daemon_state = match system::init(&config).await {

bin/nanocld/src/objects/cargo.rs

@@ -89,9 +89,12 @@ impl ObjDelByPk for CargoDb {
     state: &SystemState,
   ) -> HttpResult<Self::ObjDelOut> {
     let cargo = CargoDb::transform_read_by_pk(pk, &state.inner.pool).await?;
-    let processes =
-      ProcessDb::read_by_kind_key(&cargo.spec.cargo_key, &state.inner.pool)
-        .await?;
+    let processes = ProcessDb::read_by_kind_key(
+      &cargo.spec.cargo_key,
+      None,
+      &state.inner.pool,
+    )
+    .await?;
     let (_, _, _, running) =
       utils::container::generic::count_status(&processes);
     if running > 0 && !opts.force.unwrap_or(false) {
@@ -272,7 +275,8 @@ impl ObjInspectByPk for CargoDb {
     state: &SystemState,
   ) -> HttpResult<Self::ObjInspectOut> {
     let cargo = CargoDb::transform_read_by_pk(pk, &state.inner.pool).await?;
-    let processes = ProcessDb::read_by_kind_key(pk, &state.inner.pool).await?;
+    let processes =
+      ProcessDb::read_by_kind_key(pk, None, &state.inner.pool).await?;
     let (_, _, _, running_instances) =
       utils::container::generic::count_status(&processes);
     let status = ObjPsStatusDb::read_by_pk(pk, &state.inner.pool).await?;

bin/nanocld/src/objects/job.rs

@@ -73,7 +73,8 @@ impl ObjInspectByPk for JobDb {
     state: &crate::models::SystemState,
   ) -> HttpResult<Self::ObjInspectOut> {
     let job = JobDb::transform_read_by_pk(pk, &state.inner.pool).await?;
-    let instances = ProcessDb::read_by_kind_key(pk, &state.inner.pool).await?;
+    let instances =
+      ProcessDb::read_by_kind_key(pk, None, &state.inner.pool).await?;
     let (instance_total, instance_failed, instance_success, instance_running) =
       utils::container::generic::count_status(&instances);
     let job_inspect = JobInspect {

bin/nanocld/src/objects/vm.rs

@@ -211,7 +211,8 @@ impl ObjInspectByPk for VmDb {
   ) -> HttpResult<Self::ObjInspectOut> {
     let vm = VmDb::transform_read_by_pk(pk, &state.inner.pool).await?;
     let processes =
-      ProcessDb::read_by_kind_key(&vm.spec.vm_key, &state.inner.pool).await?;
+      ProcessDb::read_by_kind_key(&vm.spec.vm_key, None, &state.inner.pool)
+        .await?;
     let (total, _, _, running_instances) =
       utils::container::generic::count_status(&processes);
     Ok(VmInspect {

bin/nanocld/src/repositories/cargo.rs

@@ -238,17 +238,30 @@ impl CargoDb {
       let spec = SpecDb::read_by_pk(&cargo.spec.key, &state.inner.pool)
         .await?
         .try_to_cargo_spec()?;
-      let processes =
-        ProcessDb::read_by_kind_key(&cargo.spec.cargo_key, &state.inner.pool)
-          .await?;
+      let filter = GenericFilter::new().r#where(
+        "data",
+        GenericClause::Contains(serde_json::json!({
+          "Config": {
+            "Labels": {
+              "io.nanocl.not-init-c": "true"
+            }
+          }
+        })),
+      );
+      let processes = ProcessDb::read_by_kind_key(
+        &cargo.spec.cargo_key,
+        Some(filter),
+        &state.inner.pool,
+      )
+      .await?;
       let (_, _, _, running) =
         utils::container::generic::count_status(&processes);
       cargo_summaries.push(CargoSummary {
         created_at: cargo.created_at,
         status: cargo.status,
         namespace_name: cargo.namespace_name,
-        instance_total: processes.len(),
         instance_running: running,
+        instance_total: processes.len(),
         spec: spec.clone(),
       });
     }

bin/nanocld/src/repositories/job.rs

@@ -155,7 +155,8 @@ impl JobDb {
       .iter()
       .map(|job| async {
         let instances =
-          ProcessDb::read_by_kind_key(&job.name, &state.inner.pool).await?;
+          ProcessDb::read_by_kind_key(&job.name, None, &state.inner.pool)
+            .await?;
         let (
           instance_total,
           instance_failed,

bin/nanocld/src/repositories/process.rs

@@ -112,9 +112,11 @@ impl RepositoryReadByTransform for ProcessDb {
 impl ProcessDb {
   pub async fn read_by_kind_key(
     kind_key: &str,
+    filter: Option<GenericFilter>,
     pool: &Pool,
   ) -> IoResult<Vec<Process>> {
-    let filter = GenericFilter::new()
+    let filter = filter
+      .unwrap_or_default()
       .r#where("kind_key", GenericClause::Eq(kind_key.to_owned()));
     ProcessDb::transform_read_by(&filter, pool).await
   }

bin/nanocld/src/repositories/vm.rs

@@ -173,7 +173,7 @@ impl VmDb {
         .await?
         .try_to_vm_spec()?;
       let processes =
-        ProcessDb::read_by_kind_key(&vm.spec.vm_key, pool).await?;
+        ProcessDb::read_by_kind_key(&vm.spec.vm_key, None, pool).await?;
       let (_, _, _, running_instances) =
         utils::container::generic::count_status(&processes);
       vm_summaries.push(VmSummary {

bin/nanocld/src/services/process.rs

@@ -76,7 +76,7 @@ async fn logs_processes(
   let kind = kind.parse().map_err(HttpError::bad_request)?;
   let kind_key = utils::key::gen_kind_key(&kind, &name, &qs.namespace);
   let processes =
-    ProcessDb::read_by_kind_key(&kind_key, &state.inner.pool).await?;
+    ProcessDb::read_by_kind_key(&kind_key, None, &state.inner.pool).await?;
   log::debug!("process::logs_process: {kind_key}");
   let options: LogsOptions<String> = qs.into_inner().into();
   let futures = processes
@@ -337,7 +337,7 @@ pub async fn wait_processes(
     condition: qs.condition.clone().unwrap_or_default(),
   };
   let processes =
-    ProcessDb::read_by_kind_key(&kind_pk, &state.inner.pool).await?;
+    ProcessDb::read_by_kind_key(&kind_pk, None, &state.inner.pool).await?;
   let mut streams = Vec::new();
   for process in processes {
     let options = Some(opts.clone());
@@ -410,7 +410,7 @@ pub async fn stats_processes(
   let kind_key = utils::key::gen_kind_key(&kind, &name, &qs.namespace);
   let opts: StatsOptions = qs.clone().into();
   let processes =
-    ProcessDb::read_by_kind_key(&kind_key, &state.inner.pool).await?;
+    ProcessDb::read_by_kind_key(&kind_key, None, &state.inner.pool).await?;
   let streams =
     processes
       .into_iter()

bin/nanocld/src/system/event.rs

@@ -36,7 +36,7 @@ async fn job_ttl(actor: &EventActor, state: &SystemState) -> IoResult<()> {
     _ => {}
   }
   let instances =
-    ProcessDb::read_by_kind_key(&job.name, &state.inner.pool).await?;
+    ProcessDb::read_by_kind_key(&job.name, None, &state.inner.pool).await?;
   let (_, instance_failed, _, running) =
     utils::container::generic::count_status(&instances);
   log::debug!(