github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-08 11:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6458 from openanolis/chao/update_comments

Browse Source 
runtime-rs: update load_config comment
This commit is contained in:
Chao Wu 2023-03-15 19:32:07 +08:00 committed by GitHub
commit 530b2a7685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime-rs/crates/runtimes/src/manager.rs
View File

@ -353,9 +353,10 @@ impl RuntimeHandlerManager {
/// Config override ordering(high to low): /// Config override ordering(high to low):
/// 1. podsandbox annotation /// 1. podsandbox annotation
/// 2. shimv2 create task option /// 2. environment variable
/// TODO: https://github.com/kata-containers/kata-containers/issues/3961 /// 3. shimv2 create task option
/// 3. environment /// 4. If above three are not set, then get default path from DEFAULT_RUNTIME_CONFIGURATIONS
/// in kata-containers/src/libs/kata-types/src/config/default.rs, in array order.
fn load_config(spec: &oci::Spec, option: &Option<Vec<u8>>) -> Result<TomlConfig> { fn load_config(spec: &oci::Spec, option: &Option<Vec<u8>>) -> Result<TomlConfig> {
const KATA_CONF_FILE: &str = "KATA_CONF_FILE"; const KATA_CONF_FILE: &str = "KATA_CONF_FILE";
let annotation = Annotation::new(spec.annotations.clone()); let annotation = Annotation::new(spec.annotations.clone());