From 7a59d7f937b468a7523c404e03e883e367879164 Mon Sep 17 00:00:00 2001 From: "alex.lyn" Date: Wed, 2 Jul 2025 20:57:21 +0800 Subject: [PATCH] runtime-rs: Import the public const value from libs Introduce a const value `KATA_VIRTUAL_VOLUME_PREFIX` defined in the libs/kata-types, and it'll be better import such const value from there. Signed-off-by: alex.lyn --- src/libs/kata-types/src/mount.rs | 5 ++++- src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/kata-types/src/mount.rs b/src/libs/kata-types/src/mount.rs index eac2afbffb..b557d8cdb1 100644 --- a/src/libs/kata-types/src/mount.rs +++ b/src/libs/kata-types/src/mount.rs @@ -47,6 +47,9 @@ pub const SANDBOX_BIND_MOUNTS_RO: &str = ":ro"; /// SANDBOX_BIND_MOUNTS_RO is for sandbox bindmounts with readwrite pub const SANDBOX_BIND_MOUNTS_RW: &str = ":rw"; +/// KATA_VIRTUAL_VOLUME_PREFIX is for container image guest pull +pub const KATA_VIRTUAL_VOLUME_PREFIX: &str = "io.katacontainers.volume="; + /// Directly assign a block volume to vm and mount it inside guest. pub const KATA_VIRTUAL_VOLUME_DIRECT_BLOCK: &str = "direct_block"; /// Present a container image as a generic block device. @@ -532,7 +535,7 @@ pub fn adjust_rootfs_mounts() -> Result> { // Create a new Vec with a single Mount entry. // This Mount's options will contain the base64-encoded virtual volume. Ok(vec![Mount { - options: vec![format!("{}={}", "io.katacontainers.volume", b64_vol)], + options: vec![format!("{}{}", KATA_VIRTUAL_VOLUME_PREFIX, b64_vol)], ..Default::default() // Use default values for other Mount fields }]) } diff --git a/src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs b/src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs index 32cf69a76a..882919b246 100644 --- a/src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs +++ b/src/runtime-rs/crates/resource/src/rootfs/virtual_volume.rs @@ -17,13 +17,12 @@ use hypervisor::device::device_manager::DeviceManager; use kata_types::{ annotations, container::ContainerType, - mount::{KataVirtualVolume, KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL}, + mount::{KataVirtualVolume, KATA_VIRTUAL_VOLUME_IMAGE_GUEST_PULL, KATA_VIRTUAL_VOLUME_PREFIX}, }; /// 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/";