mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-06 12:06:49 +00:00
runtime-rs: Implement guest-pull rootfs via virtual volumes
This commit introduces comprehensive support for rootfs mount mgmt through Kata Virtual Volumes, specifically enabling the guest-pull mechanism. It enhances the runtime's ability to: (1) Extract image references from container annotations (CRI/CRI-O). (2) Process `KataVirtualVolume` objects, configuring them for guest-pull operations. (3) Set up the agent's storage for guest-pulled images. This functionality streamlines the process of pulling container images directly within the guest for rootfs, aligning with guest-side image management strategies. Fixes #10690 Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
This commit is contained in:
parent
a966d1be50
commit
d4e9369d3d
@ -11,6 +11,7 @@ use anyhow::{anyhow, Context, Result};
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use kata_types::mount::Mount;
|
use kata_types::mount::Mount;
|
||||||
mod block_rootfs;
|
mod block_rootfs;
|
||||||
|
pub mod virtual_volume;
|
||||||
use hypervisor::{device::device_manager::DeviceManager, Hypervisor};
|
use hypervisor::{device::device_manager::DeviceManager, Hypervisor};
|
||||||
|
|
||||||
use std::{sync::Arc, vec::Vec};
|
use std::{sync::Arc, vec::Vec};
|
||||||
|
297
src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs
Normal file
297
src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs
Normal file
@ -0,0 +1,297 @@
|
|||||||
|
// Copyright (c) 2024-2025 Ant Group
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
//
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
use std::str::FromStr;
|
||||||
|
use std::{collections::HashMap, path::PathBuf};
|
||||||
|
|
||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
use async_trait::async_trait;
|
||||||
|
use oci_spec::runtime as oci;
|
||||||
|
use serde_json;
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
|
use hypervisor::device::device_manager::DeviceManager;
|
||||||
|
use kata_types::{
|
||||||
|
annotations,
|
||||||
|
container::ContainerType,
|
||||||
|
mount::{KataVirtualVolume, KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL},
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Image guest-pull related consts
|
||||||
|
const KUBERNETES_CRI_IMAGE_NAME: &str = "io.kubernetes.cri.image-name";
|
||||||
|
const KUBERNETES_CRIO_IMAGE_NAME: &str = "io.kubernetes.cri-o.ImageName";
|
||||||
|
const KATA_VIRTUAL_VOLUME_PREFIX: &str = "io.katacontainers.volume=";
|
||||||
|
const KATA_VIRTUAL_VOLUME_TYPE_OVERLAY_FS: &str = "overlayfs";
|
||||||
|
const KATA_GUEST_ROOT_SHARED_FS: &str = "/run/kata-containers/";
|
||||||
|
|
||||||
|
const CRI_CONTAINER_TYPE_KEY_LIST: &[&str] = &[
|
||||||
|
// cri containerd
|
||||||
|
annotations::cri_containerd::CONTAINER_TYPE_LABEL_KEY,
|
||||||
|
// cri-o
|
||||||
|
annotations::crio::CONTAINER_TYPE_LABEL_KEY,
|
||||||
|
];
|
||||||
|
|
||||||
|
/// Retrieves the image reference from OCI spec annotations.
|
||||||
|
///
|
||||||
|
/// It checks known Kubernetes CRI and CRI-O annotation keys for the container type.
|
||||||
|
/// If the container is a PodSandbox, it returns "pause".
|
||||||
|
/// Otherwise, it attempts to find the image name using the appropriate Kubernetes
|
||||||
|
/// annotation key.
|
||||||
|
pub fn get_image_reference(spec_annotations: &HashMap<String, String>) -> Result<&str> {
|
||||||
|
info!(
|
||||||
|
sl!(),
|
||||||
|
"get image reference from spec annotation: {:?}", spec_annotations
|
||||||
|
);
|
||||||
|
for &key in CRI_CONTAINER_TYPE_KEY_LIST {
|
||||||
|
if let Some(type_value) = spec_annotations.get(key) {
|
||||||
|
if let Ok(container_type) = ContainerType::from_str(type_value) {
|
||||||
|
return match container_type {
|
||||||
|
ContainerType::PodSandbox => Ok("pause"),
|
||||||
|
_ => {
|
||||||
|
let image_name_key = if key == annotations::crio::CONTAINER_TYPE_LABEL_KEY {
|
||||||
|
KUBERNETES_CRIO_IMAGE_NAME
|
||||||
|
} else {
|
||||||
|
KUBERNETES_CRI_IMAGE_NAME
|
||||||
|
};
|
||||||
|
|
||||||
|
spec_annotations
|
||||||
|
.get(image_name_key)
|
||||||
|
.map(AsRef::as_ref)
|
||||||
|
.ok_or_else(|| anyhow!("get image reference failed"))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(anyhow!("no target image reference found"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles storage configuration for KataVirtualVolume based on its type.
|
||||||
|
/// Specifically processes `KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL` type.
|
||||||
|
/// Processes a virtual volume specifically for image guest-pull scenarios.
|
||||||
|
/// It enriches the volume info with image reference and metadata, then serializes it into agent.Storage.
|
||||||
|
fn handle_virtual_volume_storage(
|
||||||
|
cid: &str,
|
||||||
|
annotations: &HashMap<String, String>,
|
||||||
|
virt_volume: &KataVirtualVolume,
|
||||||
|
) -> Result<agent::Storage> {
|
||||||
|
if virt_volume.volume_type.as_str() == KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL {
|
||||||
|
// get container image reference
|
||||||
|
let image_ref = get_image_reference(annotations).context("get image reference failed.")?;
|
||||||
|
|
||||||
|
let mut virtual_volume_info = virt_volume.clone();
|
||||||
|
// Merge metadata
|
||||||
|
for (k, v) in annotations.iter() {
|
||||||
|
if let Some(ref mut image_pull) = virtual_volume_info.image_pull {
|
||||||
|
image_pull.metadata.insert(k.to_owned(), v.to_owned());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Serialize ImagePull as JSON
|
||||||
|
let image_pull_info = serde_json::to_string(&virtual_volume_info.image_pull)
|
||||||
|
.map_err(|e| anyhow!(e.to_string()))?;
|
||||||
|
|
||||||
|
// build the agent Storage Object
|
||||||
|
Ok(agent::Storage {
|
||||||
|
source: image_ref.to_string(),
|
||||||
|
driver: KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL.to_string(),
|
||||||
|
driver_options: vec![format!(
|
||||||
|
"{}={}",
|
||||||
|
KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL, image_pull_info
|
||||||
|
)],
|
||||||
|
fs_type: KATA_VIRTUAL_VOLUME_TYPE_OVERLAY_FS.to_string(),
|
||||||
|
mount_point: Path::new(KATA_GUEST_ROOT_SHARED_FS)
|
||||||
|
.join(cid)
|
||||||
|
.join("rootfs")
|
||||||
|
.display()
|
||||||
|
.to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
Err(anyhow!(
|
||||||
|
"Error in handle virtual volume storage with unsupported type: {:?}",
|
||||||
|
virt_volume.volume_type
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Default)]
|
||||||
|
pub(crate) struct VirtualVolume {
|
||||||
|
guest_path: PathBuf,
|
||||||
|
storages: Vec<agent::Storage>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl VirtualVolume {
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub(crate) async fn new(
|
||||||
|
cid: &str,
|
||||||
|
annotations: &HashMap<String, String>,
|
||||||
|
options: Vec<String>,
|
||||||
|
) -> Result<Self> {
|
||||||
|
let mut volumes = Vec::new();
|
||||||
|
|
||||||
|
// It's ensured that the virtual volume info is indeed existing in the options, as pre-check with `is_kata_virtual_volume()` is done.
|
||||||
|
for o in options.iter() {
|
||||||
|
// Iterate over reference to avoid consuming options
|
||||||
|
if let Some(stripped_str) = o.strip_prefix(KATA_VIRTUAL_VOLUME_PREFIX) {
|
||||||
|
// Ensure `from_base64` provides a descriptive error on failure
|
||||||
|
let virt_volume = KataVirtualVolume::from_base64(stripped_str).context(format!(
|
||||||
|
"Failed to decode KataVirtualVolume from base64: {}",
|
||||||
|
stripped_str
|
||||||
|
))?;
|
||||||
|
|
||||||
|
let vol = handle_virtual_volume_storage(cid, annotations, &virt_volume)
|
||||||
|
.context("Failed to handle virtual volume storage object")?;
|
||||||
|
volumes.push(vol);
|
||||||
|
|
||||||
|
// As there's only one virtual volume supported, when the first one is hit, just break the iteration.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let guest_path = Path::new(KATA_GUEST_ROOT_SHARED_FS)
|
||||||
|
.join(cid)
|
||||||
|
.join("rootfs")
|
||||||
|
.to_path_buf();
|
||||||
|
|
||||||
|
Ok(VirtualVolume {
|
||||||
|
guest_path,
|
||||||
|
storages: volumes,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl super::Rootfs for VirtualVolume {
|
||||||
|
async fn get_guest_rootfs_path(&self) -> Result<String> {
|
||||||
|
Ok(self.guest_path.display().to_string().clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_rootfs_mount(&self) -> Result<Vec<oci::Mount>> {
|
||||||
|
Ok(vec![])
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_storage(&self) -> Option<agent::Storage> {
|
||||||
|
Some(self.storages[0].clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_device_id(&self) -> Result<Option<String>> {
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn cleanup(&self, _device_manager: &RwLock<DeviceManager>) -> Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_kata_virtual_volume(m: &kata_types::mount::Mount) -> bool {
|
||||||
|
let options = m.options.clone();
|
||||||
|
options
|
||||||
|
.iter()
|
||||||
|
.any(|o| o.starts_with(&KATA_VIRTUAL_VOLUME_PREFIX.to_owned()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use crate::rootfs::virtual_volume::{
|
||||||
|
KATA_GUEST_ROOT_SHARED_FS, KATA_VIRTUAL_VOLUME_PREFIX, KATA_VIRTUAL_VOLUME_TYPE_OVERLAY_FS,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::get_image_reference;
|
||||||
|
use super::VirtualVolume;
|
||||||
|
use kata_types::mount::{KataVirtualVolume, KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL};
|
||||||
|
use std::{collections::HashMap, path::Path};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_get_image_ref() {
|
||||||
|
// Test Standard cri-containerd image name
|
||||||
|
let mut annotations_x = HashMap::new();
|
||||||
|
annotations_x.insert(
|
||||||
|
"io.kubernetes.cri.container-type".to_string(),
|
||||||
|
"container".to_string(),
|
||||||
|
);
|
||||||
|
annotations_x.insert(
|
||||||
|
"io.kubernetes.cri.image-name".to_string(),
|
||||||
|
"example-image-x".to_string(),
|
||||||
|
);
|
||||||
|
let image_ref_result_crio = get_image_reference(&annotations_x);
|
||||||
|
assert!(image_ref_result_crio.is_ok());
|
||||||
|
assert_eq!(image_ref_result_crio.unwrap(), "example-image-x");
|
||||||
|
|
||||||
|
// Test cri-o image name
|
||||||
|
let mut annotations_crio = HashMap::new();
|
||||||
|
annotations_crio.insert(
|
||||||
|
"io.kubernetes.cri-o.ContainerType".to_string(),
|
||||||
|
"container".to_string(),
|
||||||
|
);
|
||||||
|
annotations_crio.insert(
|
||||||
|
"io.kubernetes.cri-o.ImageName".to_string(),
|
||||||
|
"example-image-y".to_string(),
|
||||||
|
);
|
||||||
|
let image_ref_result_crio = get_image_reference(&annotations_crio);
|
||||||
|
assert!(image_ref_result_crio.is_ok());
|
||||||
|
assert_eq!(image_ref_result_crio.unwrap(), "example-image-y");
|
||||||
|
|
||||||
|
// Test PodSandbox type
|
||||||
|
let mut annotations_pod_sandbox = HashMap::new();
|
||||||
|
annotations_pod_sandbox.insert(
|
||||||
|
"io.kubernetes.cri.container-type".to_string(),
|
||||||
|
"sandbox".to_string(),
|
||||||
|
);
|
||||||
|
let image_ref_result_pod_sandbox = get_image_reference(&annotations_pod_sandbox);
|
||||||
|
assert!(image_ref_result_pod_sandbox.is_ok());
|
||||||
|
assert_eq!(image_ref_result_pod_sandbox.unwrap(), "pause");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_virtual_volume_new_success() {
|
||||||
|
let virt_vol = KataVirtualVolume {
|
||||||
|
volume_type: KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL.to_string(),
|
||||||
|
source: KATA_VIRTUAL_VOLUME_TYPE_OVERLAY_FS.to_owned(),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let encoded_vol = virt_vol.to_base64().unwrap();
|
||||||
|
let options = vec![format!("{}{}", KATA_VIRTUAL_VOLUME_PREFIX, encoded_vol)];
|
||||||
|
|
||||||
|
let mut annotations = HashMap::new();
|
||||||
|
annotations.insert(
|
||||||
|
"io.kubernetes.cri.container-type".to_string(),
|
||||||
|
"container".to_string(),
|
||||||
|
);
|
||||||
|
annotations.insert(
|
||||||
|
"io.kubernetes.cri.image-name".to_string(),
|
||||||
|
"example-image-x".to_string(),
|
||||||
|
);
|
||||||
|
|
||||||
|
let cid = "4adf90201";
|
||||||
|
let result = VirtualVolume::new(cid, &annotations, options).await;
|
||||||
|
assert!(result.is_ok());
|
||||||
|
let virt_vol_obj = result.unwrap();
|
||||||
|
|
||||||
|
// 1. Verify guest_path
|
||||||
|
let expected_guest_path = Path::new(KATA_GUEST_ROOT_SHARED_FS)
|
||||||
|
.join(cid)
|
||||||
|
.join("rootfs");
|
||||||
|
assert_eq!(virt_vol_obj.guest_path, expected_guest_path);
|
||||||
|
|
||||||
|
// 2. Verify storages vector length
|
||||||
|
assert_eq!(virt_vol_obj.storages.len(), 1);
|
||||||
|
|
||||||
|
// 3. Verify the content of the AgentStorage object
|
||||||
|
let storage = &virt_vol_obj.storages[0];
|
||||||
|
|
||||||
|
assert_eq!(storage.source, "example-image-x".to_string());
|
||||||
|
assert_eq!(storage.driver, KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL);
|
||||||
|
assert_eq!(storage.fs_type, KATA_VIRTUAL_VOLUME_TYPE_OVERLAY_FS);
|
||||||
|
|
||||||
|
let expected_mount_point = Path::new(KATA_GUEST_ROOT_SHARED_FS)
|
||||||
|
.join(cid)
|
||||||
|
.join("rootfs")
|
||||||
|
.display()
|
||||||
|
.to_string();
|
||||||
|
assert_eq!(storage.mount_point, expected_mount_point);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user