github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-02-21 22:34:29 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Extract common drop-in generation into shared helper

Browse Source 
Deduplicate the drop-in file generation logic between configure_shim_config
and install_custom_runtime_configs by extracting it into a shared
write_common_drop_ins helper function.

This ensures both standard and custom runtimes use the same code path
for generating drop-in configuration files.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
This commit is contained in:
Fabiano Fidêncio
2026-02-04 16:05:53 +01:00
parent 577aa6b319
commit eddd1b507e
1 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tools/packaging/kata-deploy/binary/src/artifacts/install.rs
View File

@@ -144,6 +144,29 @@ pub async fn remove_artifacts(config: &Config) -> Result<()> {
Ok(())
}
/// Write the common drop-in configuration files for a shim.
/// This is shared between standard runtimes and custom runtimes.
fn write_common_drop_ins(config: &Config, shim: &str, config_d_dir: &str) -> Result<()> {
// 1. Installation prefix adjustments (if not default)
if config.dest_dir != DEFAULT_KATA_INSTALL_DIR {
let prefix_content = generate_installation_prefix_drop_in(config, shim)?;
write_drop_in_file(config_d_dir, "10-installation-prefix.toml", &prefix_content)?;
}
// 2. Debug configuration (boolean flags only via drop-in)
if config.debug {
let debug_content = generate_debug_drop_in(shim)?;
write_drop_in_file(config_d_dir, "20-debug.toml", &debug_content)?;
}
// 3. Combined kernel_params (proxy, debug, etc.)
// Reads base kernel_params from original config and combines with new params
let kernel_params_content = generate_kernel_params_drop_in(config, shim)?;
write_drop_in_file(config_d_dir, "30-kernel-params.toml", &kernel_params_content)?;
Ok(())
}
/// Each custom runtime gets an isolated directory under custom-runtimes/{handler}/
/// Custom runtimes inherit the same drop-in configurations as standard runtimes
/// (installation prefix, debug, kernel_params) plus any user-provided overrides.
@@ -192,25 +215,8 @@ fn install_custom_runtime_configs(config: &Config) -> Result<()> {
);
}
// Generate the same drop-in files that standard runtimes get
// Use the base_config as the shim for hypervisor name resolution
let shim = &runtime.base_config;
// 1. Installation prefix adjustments (if not default)
if config.dest_dir != "/opt/kata" {
let prefix_content = generate_installation_prefix_drop_in(config, shim)?;
write_drop_in_file(&config_d_dir, "10-installation-prefix.toml", &prefix_content)?;
}
// 2. Debug configuration (boolean flags only via drop-in)
if config.debug {
let debug_content = generate_debug_drop_in(shim)?;
write_drop_in_file(&config_d_dir, "20-debug.toml", &debug_content)?;
}
// 3. Combined kernel_params (proxy, debug, etc.)
let kernel_params_content = generate_kernel_params_drop_in(config, shim)?;
write_drop_in_file(&config_d_dir, "30-kernel-params.toml", &kernel_params_content)?;
// Generate the common drop-in files (shared with standard runtimes)
write_common_drop_ins(config, &runtime.base_config, &config_d_dir)?;
// Copy user-provided drop-in file if provided (at 50-overrides.toml)
if let Some(ref drop_in_src) = runtime.drop_in_file {
@@ -431,22 +437,8 @@ async fn configure_shim_config(config: &Config, shim: &str) -> Result<()> {
));
}
// 1. Installation prefix adjustments (if not default)
if config.dest_dir != DEFAULT_KATA_INSTALL_DIR {
let prefix_content = generate_installation_prefix_drop_in(config, shim)?;
write_drop_in_file(&config_d_dir, "10-installation-prefix.toml", &prefix_content)?;
}
// 2. Debug configuration (boolean flags only via drop-in)
if config.debug {
let debug_content = generate_debug_drop_in(shim)?;
write_drop_in_file(&config_d_dir, "20-debug.toml", &debug_content)?;
}
// 3. Combined kernel_params (proxy, debug, etc.)
// Reads base kernel_params from original config and combines with new params
let kernel_params_content = generate_kernel_params_drop_in(config, shim)?;
write_drop_in_file(&config_d_dir, "30-kernel-params.toml", &kernel_params_content)?;
// Generate common drop-in files (shared with custom runtimes)
write_common_drop_ins(config, shim, &config_d_dir)?;
configure_hypervisor_annotations(config, shim, &kata_config_file).await?;