From ade15fb6ae0b44d3eab0178c0dab57abced3d4a1 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Thu, 1 Feb 2024 01:36:29 +0800 Subject: [PATCH] chore: Upgrade crates, adjust labels, Bump version to 0.8.10 --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- apiserver/src/handlers/actor.rs | 2 +- resources/src/actor.rs | 2 +- resources/src/deployment.rs | 2 +- resources/src/image.rs | 6 +++++- resources/src/job.rs | 2 +- resources/src/service.rs | 2 +- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 734c87f..4a1c587 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "amp-apiserver" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "amp-resources", @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "amp-builder" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "amp-resources", @@ -136,7 +136,7 @@ dependencies = [ [[package]] name = "amp-controllers" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "amp-resolver", @@ -162,7 +162,7 @@ dependencies = [ [[package]] name = "amp-crdgen" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "clap", @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "amp-resolver" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "amp-resources", @@ -188,7 +188,7 @@ dependencies = [ [[package]] name = "amp-resources" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "anyhow", @@ -208,7 +208,7 @@ dependencies = [ [[package]] name = "amp-syncer" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-common", "async-nats", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "amp-workflow" -version = "0.8.9" +version = "0.8.10" dependencies = [ "amp-builder", "amp-common", diff --git a/Cargo.toml b/Cargo.toml index 9fba0f5..b9b7194 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.8.9" +version = "0.8.10" edition = "2021" license = "Apache-2.0" repository = "https://github.com/amphitheatre-app/amphitheatre" diff --git a/apiserver/src/handlers/actor.rs b/apiserver/src/handlers/actor.rs index c55f54c..5da055f 100644 --- a/apiserver/src/handlers/actor.rs +++ b/apiserver/src/handlers/actor.rs @@ -102,7 +102,7 @@ pub async fn logs( // Watch the status of the pod, if the pod is running, then create a stream for it. tokio::spawn(async move { let api: Api = Api::namespaced(ctx.k8s.clone(), &format!("amp-{pid}")); - let config = watcher::Config::default().labels(&format!("app.kubernetes.io/name={name}")); + let config = watcher::Config::default().labels(&format!("amphitheatre.app/character={name}")); let mut watcher = watcher(api.clone(), config).applied_objects().boxed(); let subs = Arc::new(RwLock::new(HashSet::new())); diff --git a/resources/src/actor.rs b/resources/src/actor.rs index e4afb7c..42ec262 100644 --- a/resources/src/actor.rs +++ b/resources/src/actor.rs @@ -88,7 +88,7 @@ pub async fn patch_status(client: &Client, actor: &Actor, condition: Condition) pub async fn metrics(client: &Client, namespace: &str, name: &str) -> Result { let api: Api = Api::namespaced(client.clone(), namespace); - let params = ListParams::default().labels(&format!("app.kubernetes.io/name={}", name)).limit(1); + let params = ListParams::default().labels(&format!("amphitheatre.app/character={}", name)).limit(1); let resources = api.list(¶ms).await; debug!("Metrics for Actor {}:\n{:?}", name, resources); diff --git a/resources/src/deployment.rs b/resources/src/deployment.rs index d7318a8..575af69 100644 --- a/resources/src/deployment.rs +++ b/resources/src/deployment.rs @@ -72,7 +72,7 @@ pub fn new(actor: &Actor, pod: PodSpec) -> Result { // Build the metadata for the deployment let owner_reference = actor.controller_owner_ref(&()).unwrap(); let labels = BTreeMap::from([ - ("app.kubernetes.io/name".into(), name.clone()), + ("amphitheatre.app/character".into(), name.clone()), ("app.kubernetes.io/managed-by".into(), "Amphitheatre".into()), ]); let annotations = BTreeMap::from([(LAST_APPLIED_HASH_KEY.into(), hash(&actor.spec)?)]); diff --git a/resources/src/image.rs b/resources/src/image.rs index 96759fd..f0ab454 100644 --- a/resources/src/image.rs +++ b/resources/src/image.rs @@ -84,7 +84,11 @@ fn new(actor: &Actor) -> Result { "kind": "Image", "metadata": { "name": name.clone(), - "ownerReferences": vec![owner_reference] + "ownerReferences": vec![owner_reference], + "labels": { + "amphitheatre.app/character": name.clone(), + "app.kubernetes.io/managed-by": "Amphitheatre", + }, }, "spec": { "tag": actor.spec.image, diff --git a/resources/src/job.rs b/resources/src/job.rs index 0da9c85..e979cb0 100644 --- a/resources/src/job.rs +++ b/resources/src/job.rs @@ -75,7 +75,7 @@ fn new(actor: &Actor, pod: PodSpec) -> Result { let owner_reference = actor.controller_owner_ref(&()).unwrap(); let annotations = BTreeMap::from([(LAST_APPLIED_HASH_KEY.into(), hash(&actor.spec)?)]); let labels = BTreeMap::from([ - ("app.kubernetes.io/name".into(), name.clone()), + ("amphitheatre.app/character".into(), name.clone()), ("app.kubernetes.io/managed-by".into(), "Amphitheatre".into()), ]); diff --git a/resources/src/service.rs b/resources/src/service.rs index ab4e199..56481c8 100644 --- a/resources/src/service.rs +++ b/resources/src/service.rs @@ -77,7 +77,7 @@ fn new(actor: &Actor) -> Result { // Build the metadata for the service let owner_reference = actor.controller_owner_ref(&()).unwrap(); let labels = BTreeMap::from([ - ("app.kubernetes.io/name".into(), name.clone()), + ("amphitheatre.app/character".into(), name.clone()), ("app.kubernetes.io/managed-by".into(), "Amphitheatre".into()), ]); let annotations = BTreeMap::from([(LAST_APPLIED_HASH_KEY.into(), hash(&actor.spec)?)]);