github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-02 17:34:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11653 from Apokleos/align-initdata-annoation

Browse Source 
Align initdata annoation with kata-runtime
This commit is contained in:
Alex Lyn
2025-08-08 16:24:09 +08:00
committed by GitHub
parent b50777a174 37685c41c7
commit 9816ffdac7
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/kata-types/src/annotations/mod.rs
View File

@@ -273,8 +273,7 @@ pub const KATA_ANNO_CFG_HYPERVISOR_VIRTIO_FS_EXTRA_ARGS: &str =
/// A sandbox annotation to specify as the msize for 9p shares. /// A sandbox annotation to specify as the msize for 9p shares.
pub const KATA_ANNO_CFG_HYPERVISOR_MSIZE_9P: &str = "io.katacontainers.config.hypervisor.msize_9p"; pub const KATA_ANNO_CFG_HYPERVISOR_MSIZE_9P: &str = "io.katacontainers.config.hypervisor.msize_9p";
/// The initdata annotation passed in when CVM launchs /// The initdata annotation passed in when CVM launchs
pub const KATA_ANNO_CFG_HYPERVISOR_INIT_DATA: &str = pub const KATA_ANNO_CFG_RUNTIME_INIT_DATA: &str = "io.katacontainers.config.runtime.cc_init_data";
"io.katacontainers.config.hypervisor.cc_init_data";
/// GPU specific annotations for remote hypervisor to help with instance selection /// GPU specific annotations for remote hypervisor to help with instance selection
/// It's for minimum number of GPUs required for the VM. /// It's for minimum number of GPUs required for the VM.
@@ -895,7 +894,7 @@ impl Annotation {
hv.security_info.validate_path(value)?; hv.security_info.validate_path(value)?;
hv.security_info.guest_hook_path = value.to_string(); hv.security_info.guest_hook_path = value.to_string();
} }
KATA_ANNO_CFG_HYPERVISOR_INIT_DATA => { KATA_ANNO_CFG_RUNTIME_INIT_DATA => {
hv.security_info.initdata = hv.security_info.initdata =
add_hypervisor_initdata_overrides(value).unwrap(); add_hypervisor_initdata_overrides(value).unwrap();
} }

6
src/runtime-rs/crates/hypervisor/src/remote/inner.rs
View File

@@ -14,8 +14,8 @@ use kata_types::{
cri_containerd::{SANDBOX_NAMESPACE_LABEL_KEY, SANDBOX_NAME_LABEL_KEY}, cri_containerd::{SANDBOX_NAMESPACE_LABEL_KEY, SANDBOX_NAME_LABEL_KEY},
KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPUS, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPU_MODEL, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPUS, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPU_MODEL,
KATA_ANNO_CFG_HYPERVISOR_DEFAULT_MEMORY, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_VCPUS, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_MEMORY, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_VCPUS,
KATA_ANNO_CFG_HYPERVISOR_IMAGE_PATH, KATA_ANNO_CFG_HYPERVISOR_INIT_DATA, KATA_ANNO_CFG_HYPERVISOR_IMAGE_PATH, KATA_ANNO_CFG_HYPERVISOR_MACHINE_TYPE,
KATA_ANNO_CFG_HYPERVISOR_MACHINE_TYPE, KATA_ANNO_CFG_RUNTIME_INIT_DATA,
}, },
capabilities::{Capabilities, CapabilityBits}, capabilities::{Capabilities, CapabilityBits},
}; };
@@ -127,7 +127,7 @@ impl RemoteInner {
config.boot_info.image.to_string(), config.boot_info.image.to_string(),
); );
annotations.insert( annotations.insert(
KATA_ANNO_CFG_HYPERVISOR_INIT_DATA.to_string(), KATA_ANNO_CFG_RUNTIME_INIT_DATA.to_string(),
config.security_info.initdata.to_string(), config.security_info.initdata.to_string(),
); );
annotations.insert( annotations.insert(