From a031d2450eb1bbbb519533f053fc84a11962f499 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Thu, 28 Dec 2023 03:46:03 +0800 Subject: [PATCH] Fix: Add `amp-` prefix to namespace for actor api handlers --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- apiserver/src/services/actor.rs | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fd979c..4bca43d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "amp-apiserver" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "amp-resources", @@ -121,7 +121,7 @@ dependencies = [ [[package]] name = "amp-controllers" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "amp-resolver", @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "amp-crdgen" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "clap", @@ -158,7 +158,7 @@ dependencies = [ [[package]] name = "amp-resolver" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "amp-resources", @@ -172,7 +172,7 @@ dependencies = [ [[package]] name = "amp-resources" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "anyhow", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "amp-syncer" -version = "0.6.11" +version = "0.6.12" dependencies = [ "amp-common", "async-nats", diff --git a/Cargo.toml b/Cargo.toml index d491aca..0e3f4a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.6.11" +version = "0.6.12" edition = "2021" license = "Apache-2.0" repository = "https://github.com/amphitheatre-app/amphitheatre" diff --git a/apiserver/src/services/actor.rs b/apiserver/src/services/actor.rs index 57326c2..32ad404 100644 --- a/apiserver/src/services/actor.rs +++ b/apiserver/src/services/actor.rs @@ -30,7 +30,7 @@ pub struct ActorService; impl ActorService { pub async fn get(ctx: Arc, pid: Uuid, name: String) -> Result { - let actor = actor::get(&ctx.k8s, &pid.to_string(), &name) + let actor = actor::get(&ctx.k8s, &format!("amp-{}", pid), &name) .await .map_err(|err| ApiError::KubernetesError(err.to_string()))?; @@ -89,7 +89,7 @@ impl ActorService { } pub async fn info(ctx: Arc, pid: Uuid, name: String) -> Result>> { - let actor = actor::get(&ctx.k8s, &pid.to_string(), &name) + let actor = actor::get(&ctx.k8s, &format!("amp-{}", pid), &name) .await .map_err(|err| ApiError::KubernetesError(err.to_string()))?;