diff --git a/src/agent/src/image_rpc.rs b/src/agent/src/image_rpc.rs index 571994a0d1..eadeabae55 100644 --- a/src/agent/src/image_rpc.rs +++ b/src/agent/src/image_rpc.rs @@ -57,18 +57,17 @@ impl ImageService { env::set_var("CC_IMAGE_WORK_DIR", KATA_CC_IMAGE_WORK_DIR); let mut image_client = ImageClient::default(); - let image_policy_file = &AGENT_CONFIG.read().await.image_policy_file; + let image_policy_file = &AGENT_CONFIG.image_policy_file; if !image_policy_file.is_empty() { image_client.config.file_paths.sigstore_config = image_policy_file.clone(); } - let simple_signing_sigstore_config = - &AGENT_CONFIG.read().await.simple_signing_sigstore_config; + let simple_signing_sigstore_config = &AGENT_CONFIG.simple_signing_sigstore_config; if !simple_signing_sigstore_config.is_empty() { image_client.config.file_paths.sigstore_config = simple_signing_sigstore_config.clone(); } - let image_registry_auth_file = &AGENT_CONFIG.read().await.image_registry_auth_file; + let image_registry_auth_file = &AGENT_CONFIG.image_registry_auth_file; if !image_registry_auth_file.is_empty() { image_client.config.file_paths.auth_file = image_registry_auth_file.clone(); } @@ -159,12 +158,12 @@ impl ImageService { async fn pull_image(&self, req: &image::PullImageRequest) -> Result { env::set_var("OCICRYPT_KEYPROVIDER_CONFIG", OCICRYPT_CONFIG_PATH); - let https_proxy = &AGENT_CONFIG.read().await.https_proxy; + let https_proxy = &AGENT_CONFIG.https_proxy; if !https_proxy.is_empty() { env::set_var("HTTPS_PROXY", https_proxy); } - let no_proxy = &AGENT_CONFIG.read().await.no_proxy; + let no_proxy = &AGENT_CONFIG.no_proxy; if !no_proxy.is_empty() { env::set_var("NO_PROXY", no_proxy); } @@ -179,7 +178,7 @@ impl ImageService { return Ok(image.to_owned()); } - let aa_kbc_params = &AGENT_CONFIG.read().await.aa_kbc_params; + let aa_kbc_params = &AGENT_CONFIG.aa_kbc_params; if !aa_kbc_params.is_empty() { match self.attestation_agent_started.compare_exchange_weak( false, @@ -200,8 +199,7 @@ impl ImageService { self.image_client.lock().await.config.auth = !aa_kbc_params.is_empty(); // Read enable signature verification from the agent config and set it in the image_client - let enable_signature_verification = - &AGENT_CONFIG.read().await.enable_signature_verification; + let enable_signature_verification = &AGENT_CONFIG.enable_signature_verification; info!( sl!(), "enable_signature_verification set to: {}", enable_signature_verification diff --git a/src/agent/src/rpc.rs b/src/agent/src/rpc.rs index e3c38f84cb..ef52a346f0 100644 --- a/src/agent/src/rpc.rs +++ b/src/agent/src/rpc.rs @@ -229,7 +229,7 @@ impl AgentService { let dev_major_minor = format!("{}:{}", specdev.major, specdev.minor); if specdev.path == TRUSTED_STORAGE_DEVICE { - let data_integrity = AGENT_CONFIG.read().await.data_integrity; + let data_integrity = AGENT_CONFIG.data_integrity; info!( sl!(), "trusted_store device major:min {}, enable data integrity {}",