github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-01 14:38:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Actually send cdh_api_timeout as kernel_param

Browse Source 
The cdh_api_timeout_ms configuration parameter wasn't being used
anywhere, so add the logic to process it as an annotation into the runtime-rs
agent config and then use that as a kernel_param.

Assisted-by IBM Bob

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2026-04-27 16:42:46 +01:00
parent 6237a43a8d
commit 7aa3f7777a
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/how-to/how-to-set-sandbox-config-kata.md
View File

@@ -40,7 +40,8 @@ There are several kinds of Kata configurations and they are listed below.
| `io.katacontainers.config.agent.enable_tracing` | `boolean` | enable tracing for the agent |
| `io.katacontainers.config.agent.container_pipe_size` | uint32 | specify the size of the std(in/out) pipes created for containers |
| `io.katacontainers.config.agent.kernel_modules` | string | the list of kernel modules and their parameters that will be loaded in the guest kernel. Semicolon separated list of kernel modules and their parameters. These modules will be loaded in the guest kernel using `modprobe`(8). E.g., `e1000e InterruptThrottleRate=3000,3000,3000 EEE=1; i915 enable_ppgtt=0` |
| `io.katacontainers.config.agent.cdh_api_timeout` | uint32 | timeout in second for Confidential Data Hub (CDH) API service, default is `50` |
| `io.katacontainers.config.agent.cdh_api_timeout` | uint32 | Go runtime timeout in seconds for Confidential Data Hub (CDH) API service, default is `50` |
| `io.katacontainers.config.agent.cdh_api_timeout_ms` | uint32 | runtime-rs timeout in milliseconds for Confidential Data Hub (CDH) API service, default is `50000` |
### Hypervisor Options
@@ -167,7 +168,6 @@ In the following example two PODs are created, but the kernel modules `e1000e`
and `i915` are inserted only in the POD `pod1`. Also guest `seccomp` is only enabled
in the POD `pod2`.
```yaml
apiVersion: v1
kind: Pod

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

@@ -79,6 +79,9 @@ pub const KATA_ANNO_CFG_AGENT_CONTAINER_PIPE_SIZE: &str =
"io.katacontainers.config.agent.container_pipe_size";
/// An annotation key to specify the size of the pipes created for containers.
pub const CONTAINER_PIPE_SIZE_KERNEL_PARAM: &str = "agent.container_pipe_size";
/// An annotation to specify the Confidential Data Hub API timeout in milliseconds.
pub const KATA_ANNO_CFG_AGENT_CDH_API_TIMEOUT: &str =
"io.katacontainers.config.agent.cdh_api_timeout_ms";
// Hypervisor related annotations
/// Prefix for Hypervisor configurations.
@@ -1085,6 +1088,14 @@ impl Annotation {
return Err(u32_err);
}
},
KATA_ANNO_CFG_AGENT_CDH_API_TIMEOUT => match self.get_value::<u32>(key) {
Ok(v) => {
ag.cdh_api_timeout_ms = v.unwrap_or_default();
}
Err(_e) => {
return Err(u32_err);
}
},
KATA_ANNO_CFG_RUNTIME_CREATE_CONTAINTER_TIMEOUT => {
match self.get_value::<u32>(key) {
Ok(v) => {

8
src/libs/kata-types/src/config/mod.rs
View File

@@ -228,6 +228,14 @@ impl TomlConfig {
launch_process_timeout,
);
}
if cfg.cdh_api_timeout_ms > 0 {
// Convert milliseconds to seconds for agent kernel parameter
let cdh_api_timeout_secs = cfg.cdh_api_timeout_ms / 1000;
kv.insert(
"agent.cdh_api_timeout".to_string(),
cdh_api_timeout_secs.to_string(),
);
}
if cfg.debug_console_enabled {
kv.insert(DEBUG_CONSOLE_FLAG.to_string(), "".to_string());
kv.insert(