github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-17 17:02:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9786 from microsoft/saulparedes/add_back_insecure_registry_pull

Browse Source 
genpolicy: add back support for insecure
This commit is contained in:
Wainer Moschetta 2024-06-17 15:21:25 -03:00 committed by GitHub
commit b6a28bd932
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/genpolicy/src/registry.rs
View File

@ -16,7 +16,7 @@ use docker_credential::{CredentialRetrievalError, DockerCredential};
use fs2::FileExt; use fs2::FileExt;
use log::{debug, info, warn, LevelFilter}; use log::{debug, info, warn, LevelFilter};
use oci_distribution::{ use oci_distribution::{
client::{linux_amd64_resolver, ClientConfig}, client::{linux_amd64_resolver, ClientConfig, ClientProtocol},
manifest, manifest,
secrets::RegistryAuth, secrets::RegistryAuth,
Client, Reference, Client, Reference,
@ -67,13 +67,14 @@ pub struct ImageLayer {
} }
impl Container { impl Container {
pub async fn new(use_cached_files: bool, image: &str) -> Result<Self> { pub async fn new(config: &Config, image: &str) -> Result<Self> {
info!("============================================"); info!("============================================");
info!("Pulling manifest and config for {:?}", image); info!("Pulling manifest and config for {:?}", image);
let reference: Reference = image.to_string().parse().unwrap(); let reference: Reference = image.to_string().parse().unwrap();
let auth = build_auth(&reference); let auth = build_auth(&reference);
let mut client = Client::new(ClientConfig { let mut client = Client::new(ClientConfig {
protocol: ClientProtocol::HttpsExcept(config.insecure_registries.clone()),
platform_resolver: Some(Box::new(linux_amd64_resolver)), platform_resolver: Some(Box::new(linux_amd64_resolver)),
..Default::default() ..Default::default()
}); });
@ -96,7 +97,7 @@ impl Container {
let config_layer: DockerConfigLayer = let config_layer: DockerConfigLayer =
serde_json::from_str(&config_layer_str).unwrap(); serde_json::from_str(&config_layer_str).unwrap();
let image_layers = get_image_layers( let image_layers = get_image_layers(
use_cached_files, config.use_cache,
&mut client, &mut client,
&reference, &reference,
&manifest, &manifest,
@ -459,7 +460,7 @@ pub async fn get_container(config: &Config, image: &str) -> Result<Container> {
if let Some(socket_path) = &config.containerd_socket_path { if let Some(socket_path) = &config.containerd_socket_path {
return Container::new_containerd_pull(config.use_cache, image, socket_path).await; return Container::new_containerd_pull(config.use_cache, image, socket_path).await;
} }
Container::new(config.use_cache, image).await Container::new(config, image).await
} }
fn build_auth(reference: &Reference) -> RegistryAuth { fn build_auth(reference: &Reference) -> RegistryAuth {