From 02a0f8777ad2aa947381bc0b0566a6f616d7be5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=AB=E8=8A=B1?= Date: Thu, 24 Apr 2025 20:44:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(ctrd):=E7=A7=BB=E5=8A=A8cni=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=80=BB=E8=BE=91=E5=88=B0=E5=AE=B9=E5=99=A8=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=BF=87=E7=A8=8B=20(#87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/provider/src/handlers/deploy.rs | 2 +- crates/service/src/containerd_manager.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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(())