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

Merge pull request #5400 from wedsonaf/indirection

Browse Source 
image_rpc: avoid double and triple indirections
This commit is contained in:
Fabiano Fidêncio
2022-10-13 18:57:19 +02:00
committed by GitHub
parent c1fa5d60b7 2e90c62c31
commit 938de13c50
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/agent/src/image_rpc.rs
View File

@@ -63,8 +63,8 @@ impl ImageService {
fn pull_image_from_registry(
image: &str,
cid: &str,
source_creds: &Option<&str>,
policy_path: &Option<&String>,
source_creds: Option<&str>,
policy_path: Option<&str>,
aa_kbc_params: &str,
) -> Result<()> {
let source_image = format!("{}{}", "docker://", image);
@@ -262,16 +262,8 @@ impl ImageService {
if Path::new(SKOPEO_PATH).exists() {
// Read the policy path from the agent config
let config_policy_path = &AGENT_CONFIG.read().await.container_policy_path;
let policy_path = (!config_policy_path.is_empty()).then(|| config_policy_path);
Self::pull_image_from_registry(
image,
&cid,
&source_creds,
&policy_path,
aa_kbc_params,
)?;
let policy_path = (!config_policy_path.is_empty()).then(|| config_policy_path.as_str());
Self::pull_image_from_registry(image, &cid, source_creds, policy_path, aa_kbc_params)?;
Self::unpack_image(&cid)?;
} else {
// TODO #4888 - Create a better way to enable signature verification. This is temporary for the PoC