github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 01:13:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6007 from jongwu/single_container

Browse Source 
runtime-rs: add Single Container support
This commit is contained in:
Bin Liu 2023-01-11 10:55:50 +08:00 committed by GitHub
commit 0ec4aa1a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/kata-sys-util/src/spec.rs
View File

@ -68,7 +68,7 @@ pub fn get_container_type(spec: &oci::Spec) -> Result<ContainerType, Error> {
pub fn get_shim_id_info() -> Result<ShimIdInfo, Error> { pub fn get_shim_id_info() -> Result<ShimIdInfo, Error> {
let spec = load_oci_spec()?; let spec = load_oci_spec()?;
match get_container_type(&spec)? { match get_container_type(&spec)? {
ContainerType::PodSandbox => Ok(ShimIdInfo::Sandbox), ContainerType::PodSandbox | ContainerType::SingleContainer => Ok(ShimIdInfo::Sandbox),
ContainerType::PodContainer => { ContainerType::PodContainer => {
for k in CRI_SANDBOX_ID_KEY_LIST { for k in CRI_SANDBOX_ID_KEY_LIST {
if let Some(sandbox_id) = spec.annotations.get(*k) { if let Some(sandbox_id) = spec.annotations.get(*k) {

5
src/libs/kata-types/src/container.rs
View File

@ -19,6 +19,8 @@ pub(crate) const SANDBOX: &str = "sandbox";
// docker: a sandbox sandbox container // docker: a sandbox sandbox container
pub(crate) const PODSANDBOX: &str = "podsandbox"; pub(crate) const PODSANDBOX: &str = "podsandbox";
pub(crate) const SINGLE_CONTAINER: &str = "single_container";
const STATE_READY: &str = "ready"; const STATE_READY: &str = "ready";
const STATE_RUNNING: &str = "running"; const STATE_RUNNING: &str = "running";
const STATE_STOPPED: &str = "stopped"; const STATE_STOPPED: &str = "stopped";
@ -45,6 +47,8 @@ pub enum ContainerType {
PodContainer, PodContainer,
/// A pod sandbox. /// A pod sandbox.
PodSandbox, PodSandbox,
/// A single container.
SingleContainer,
} }
impl ContainerType { impl ContainerType {
@ -64,6 +68,7 @@ impl Display for ContainerType {
match self { match self {
ContainerType::PodContainer => write!(f, "{}", POD_CONTAINER), ContainerType::PodContainer => write!(f, "{}", POD_CONTAINER),
ContainerType::PodSandbox => write!(f, "{}", POD_SANDBOX), ContainerType::PodSandbox => write!(f, "{}", POD_SANDBOX),
ContainerType::SingleContainer => write!(f, "{}", SINGLE_CONTAINER),
} }
} }
} }

4
src/libs/kata-types/src/k8s.rs
View File

@ -69,7 +69,7 @@ pub fn container_type(spec: &oci::Spec) -> ContainerType {
} }
} }
ContainerType::PodSandbox ContainerType::SingleContainer
} }
/// Determine the k8s sandbox ID from OCI annotations. /// Determine the k8s sandbox ID from OCI annotations.
@ -269,7 +269,7 @@ mod tests {
// default // default
assert_eq!( assert_eq!(
container_type_with_id(&spec), container_type_with_id(&spec),
(ContainerType::PodSandbox, None) (ContainerType::SingleContainer, None)
); );
// crio sandbox // crio sandbox

2
src/runtime-rs/crates/shim/src/shim_start.rs
View File

@ -38,7 +38,7 @@ impl ShimExecutor {
let (container_type, id) = k8s::container_type_with_id(&spec); let (container_type, id) = k8s::container_type_with_id(&spec);
match container_type { match container_type {
ContainerType::PodSandbox => { ContainerType::PodSandbox | ContainerType::SingleContainer => {
let address = self.socket_address(&self.args.id)?; let address = self.socket_address(&self.args.id)?;
let socket = new_listener(&address)?; let socket = new_listener(&address)?;
let child_pid = self.create_shim_process(socket)?; let child_pid = self.create_shim_process(socket)?;