From 97cdba97ea9872d4be2efbbb58abafe09bc1d67f Mon Sep 17 00:00:00 2001 From: Chao Wu Date: Tue, 14 Mar 2023 16:30:18 +0800 Subject: [PATCH] runtime-rs: update load_config comment Since shimv2 create task option is already implemented, we need to update the corresponding comments. Also, the ordering is also updated to fit with the code. fixes: #3961 Signed-off-by: Chao Wu --- src/runtime-rs/crates/runtimes/src/manager.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/runtime-rs/crates/runtimes/src/manager.rs b/src/runtime-rs/crates/runtimes/src/manager.rs index 84c1fa4a95..d8aad3a0aa 100644 --- a/src/runtime-rs/crates/runtimes/src/manager.rs +++ b/src/runtime-rs/crates/runtimes/src/manager.rs @@ -353,9 +353,10 @@ impl RuntimeHandlerManager { /// Config override ordering(high to low): /// 1. podsandbox annotation -/// 2. shimv2 create task option -/// TODO: https://github.com/kata-containers/kata-containers/issues/3961 -/// 3. environment +/// 2. environment variable +/// 3. shimv2 create task option +/// 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>) -> Result { const KATA_CONF_FILE: &str = "KATA_CONF_FILE"; let annotation = Annotation::new(spec.annotations.clone());