diff --git a/crates/provider/src/handlers/deploy.rs b/crates/provider/src/handlers/deploy.rs index e3e52a5..5c4f99f 100644 --- a/crates/provider/src/handlers/deploy.rs +++ b/crates/provider/src/handlers/deploy.rs @@ -67,7 +67,7 @@ async fn deploy(config: &FunctionDeployment) -> Result<(), CustomError> { namespace ); - ContainerdManager::new_task(&config.service, &namespace, &config.image) + ContainerdManager::new_task(&config.service, &namespace) .await .map_err(|e| { CustomError::OtherError(format!( diff --git a/crates/service/src/containerd_manager.rs b/crates/service/src/containerd_manager.rs index 405f610..1447a29 100644 --- a/crates/service/src/containerd_manager.rs +++ b/crates/service/src/containerd_manager.rs @@ -75,6 +75,7 @@ impl ContainerdManager { }; Self::do_create_container(container, ns).await?; + Self::prepare_cni_network(cid, ns, image_name)?; Ok(()) } @@ -136,9 +137,8 @@ impl ContainerdManager { } /// 创建并启动任务 - pub async fn new_task(cid: &str, ns: &str, image_name: &str) -> Result<(), ContainerdError> { + pub async fn new_task(cid: &str, ns: &str) -> Result<(), ContainerdError> { let mounts = Self::get_mounts(cid, ns).await?; - Self::prepare_cni_network(cid, ns, image_name)?; Self::do_create_task(cid, ns, mounts).await?; Self::do_start_task(cid, ns).await?; Ok(())