mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-15 22:53:43 +00:00
Merge pull request #10925 from katexochen/p/fail-on-layer-pull
genpolicy: fail when layer can't be processed
This commit is contained in:
commit
cb382e1367
@ -11,7 +11,7 @@ use crate::policy;
|
||||
use crate::utils::Config;
|
||||
use crate::verity;
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use anyhow::{anyhow, bail, Result};
|
||||
use docker_credential::{CredentialRetrievalError, DockerCredential};
|
||||
use fs2::FileExt;
|
||||
use log::{debug, info, warn, LevelFilter};
|
||||
@ -441,7 +441,7 @@ async fn get_verity_and_users(
|
||||
if let Some(path) = layers_cache_file_path.as_ref() {
|
||||
std::fs::remove_file(path)?;
|
||||
}
|
||||
warn!("{error_message}");
|
||||
bail!(error_message);
|
||||
}
|
||||
Ok((verity_hash, passwd))
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ use crate::registry::{
|
||||
Container, DockerConfigLayer, ImageLayer,
|
||||
};
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use anyhow::{anyhow, bail, Result};
|
||||
use containerd_client::{services::v1::GetImageRequest, with_namespace};
|
||||
use docker_credential::{CredentialRetrievalError, DockerCredential};
|
||||
use k8s_cri::v1::{image_service_client::ImageServiceClient, AuthConfig};
|
||||
@ -354,7 +354,7 @@ async fn get_verity_and_users(
|
||||
if let Some(path) = layers_cache_file_path.as_ref() {
|
||||
std::fs::remove_file(path)?;
|
||||
}
|
||||
warn!("{error_message}");
|
||||
bail!(error_message);
|
||||
}
|
||||
Ok((verity_hash, passwd))
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user