Merge branch 'main' into clean_makefile

Cargo.toml

@@ -42,11 +42,11 @@ chrono = { version = "0.4.26", default-features = false, features = [
 ] } # default features except `oldtime`
 client = { path = "./client" }
 clap = { version = "4.3.21", features = ["derive"] }
-fancy-regex = "0.11.0"
+fancy-regex = "0.13.0"
 futures-util = "0.3.28"
-heck = "0.4.1"
+heck = "0.5.0"
 lazy_static = "1.4.0"
-nix = "0.26.2"
+nix = "0.28.0"
 proc-macro2 = "1.0"
 proto = { path = "./proto" }
 proto-reader = { path = "./crates/proto-reader" }

auraed/Cargo.toml

@@ -52,26 +52,26 @@ clone3 = "0.2.3"
 fancy-regex = { workspace = true }
 futures = "0.3.28"
 ipnetwork = "0.20.0"
-iter_tools = "0.1.4"
+iter_tools = "0.20.0"
 libc = "0.2.155" # TODO: Nix comes with libc, can we rely on that?
 lazy_static = { workspace = true }
-libcgroups = { git = "https://github.com/containers/youki", tag = "v0.1.0", default-features = false, features = [
+libcgroups = { git = "https://github.com/containers/youki", rev = "5b62356e377def45c36c29183c586c4302685cf8", default-features = false, features = [
     "v2",
 ] }
-libcontainer = { git = "https://github.com/containers/youki", tag = "v0.1.0", default-features = false, features = [
+libcontainer = { git = "https://github.com/containers/youki", rev = "5b62356e377def45c36c29183c586c4302685cf8", default-features = false, features = [
     "v2",
 ] }
 log = "0.4.17"
 netlink-packet-route = "0.13.0" # Used for netlink_packet_route::rtnl::address::nlas definition
-nix = { workspace = true, features = ["sched"] }
-oci-spec = "= 0.6.1"
+nix = { workspace = true, features = ["sched", "mount", "signal"] }
+oci-spec = "0.6.4"
 once_cell = "1"
-procfs = "0.14.2"
+procfs = "0.16.0"
 proto = { workspace = true }
 rtnetlink = "0.11.0"
 serde_json.workspace = true
 serde.workspace = true
-syslog-tracing = "0.1.0"
+syslog-tracing = "0.3.1"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = [
     "fs",

auraed/src/cells/cell_service/cells/nested_auraed/nested_auraed.rs

@@ -34,7 +34,7 @@ use client::AuraeSocket;
 use clone3::Flags;
 use nix::{
     libc::SIGCHLD,
-    sys::signal::{Signal, SIGKILL, SIGTERM},
+    sys::signal::{Signal, Signal::SIGKILL, Signal::SIGTERM},
     unistd::Pid,
 };
 use std::path::PathBuf;

auraed/src/cri/oci.rs

@@ -30,8 +30,8 @@
 
 use oci_spec::runtime::{
     Capability, LinuxBuilder, LinuxDeviceCgroupBuilder, LinuxNamespaceBuilder,
-    LinuxNamespaceType, LinuxResourcesBuilder, LinuxRlimitBuilder,
-    LinuxRlimitType,
+    LinuxNamespaceType, LinuxResourcesBuilder, PosixRlimitBuilder,
+    PosixRlimitType,
 };
 use oci_spec::runtime::{
     LinuxCapabilitiesBuilder, MountBuilder, ProcessBuilder, RootBuilder, Spec,
@@ -187,8 +187,8 @@ impl AuraeOCIBuilder {
                             .build()
                             .expect("default oci: process.capabilities"))
                         .rlimits(vec![
-                            LinuxRlimitBuilder::default()
-                                .typ(LinuxRlimitType::RlimitNofile)
+                            PosixRlimitBuilder::default()
+                                .typ(PosixRlimitType::RlimitNofile)
                                 .hard(1024u32)
                                 .soft(1024u32)
                                 .build().expect("default oci: linux rlimit: RLIMIT_NOFILE"),

auraed/src/cri/runtime_service.rs

@@ -35,8 +35,8 @@ use crate::spawn_auraed_oci_to;
 use chrono::Utc;
 use libcontainer;
 use libcontainer::container::builder::ContainerBuilder;
-use libcontainer::syscall::syscall::create_syscall;
-use nix::sys::signal::SIGKILL;
+use libcontainer::syscall::syscall::SyscallType;
+use nix::sys::signal::Signal::SIGKILL;
 use proto::cri::{
     runtime_service_server, AttachRequest, AttachResponse,
     CheckpointContainerRequest, CheckpointContainerResponse,
@@ -124,11 +124,10 @@ impl runtime_service_server::RuntimeService for RuntimeService {
         // TODO We made the decision to create a "KernelSpec" *name structure that will be how we distinguish between VMs and Containers
 
         let sandbox = {
-            let scoped_syscall = create_syscall();
             // Initialize a new container builder with the AURAE_SELF_IDENTIFIER name as the "init" container running a recursive Auraed
             let container_builder = ContainerBuilder::new(
                 AURAE_SELF_IDENTIFIER.to_string(),
-                scoped_syscall.as_ref(),
+                SyscallType::default(),
             );
 
             let bundle_path = crate::AURAED_RUNTIME

auraed/src/ebpf/perf_buffer_reader.rs

@@ -54,7 +54,7 @@ pub trait PerfBufferReader<T: Clone + Send + 'static> {
         let num_cpus = nr_cpus()?;
 
         // Query the page size on the host
-        let page_size = page_size()?;
+        let page_size = page_size();
 
         // Get the size of the event payload
         let event_struct_size: usize = size_of::<T>();

auraescript/Cargo.toml

@@ -42,9 +42,9 @@ path = "src/bin/main.rs"
 [dependencies]
 anyhow = { workspace = true }
 client = { workspace = true }
-deno_ast = { version = "0.39.2", features = ["transpiling"] }
-deno_runtime = "0.166.0"
-deno_core = "0.290.0"
+deno_ast = { version = "0.40.0", features = ["transpiling"] }
+deno_runtime = "0.169.0"
+deno_core = "0.293.0"
 macros = { package = "auraescript_macros", path = "./macros" }
 proto = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread"] }