diff --git a/Cargo.lock b/Cargo.lock index d5a04adbe8..a9c3293d93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1672,7 +1672,7 @@ dependencies = [ [[package]] name = "fluvio-sc" -version = "0.6.0" +version = "0.6.1" dependencies = [ "async-channel", "async-lock", @@ -1846,7 +1846,7 @@ dependencies = [ [[package]] name = "fluvio-stream-dispatcher" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-channel", "async-rwlock", @@ -1869,7 +1869,7 @@ dependencies = [ [[package]] name = "fluvio-stream-model" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-rwlock", "event-listener", diff --git a/VERSION b/VERSION index f5eda18a99..b6eb3d5184 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.1-alpha.0 \ No newline at end of file +0.7.1-beta.0 \ No newline at end of file diff --git a/src/sc/Cargo.toml b/src/sc/Cargo.toml index 13a3677ade..686bc4236f 100644 --- a/src/sc/Cargo.toml +++ b/src/sc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fluvio-sc" edition = "2018" -version = "0.6.0" +version = "0.6.1" authors = ["fluvio.io"] description = "Fluvio Stream Controller" repository = "https://github.com/infinyon/fluvio" @@ -47,7 +47,7 @@ fluvio-auth = { version = "0.4.0", path = "../auth" } fluvio-future = { version = "0.2.0", features = ["subscriber", "openssl_tls"] } fluvio-types = { version = "0.2.0", path = "../types", features = ["events"] } fluvio-sc-schema = { version = "0.7.0", path = "../sc-schema" } -fluvio-stream-model = { version = "0.5.0" , path = "../stream-model" } +fluvio-stream-model = { version = "0.5.0", path = "../stream-model" } fluvio-controlplane = { version = "0.6.0", path = "../controlplane" } fluvio-controlplane-metadata = { version = "0.7.0", features = ["k8", "serde"], path = "../controlplane-metadata" } fluvio-stream-dispatcher = { version = "0.5.0", path = "../stream-dispatcher" } diff --git a/src/sc/src/k8/controllers/spu_service.rs b/src/sc/src/k8/controllers/spu_service.rs index 32daeca1bc..ea60cdf014 100644 --- a/src/sc/src/k8/controllers/spu_service.rs +++ b/src/sc/src/k8/controllers/spu_service.rs @@ -155,13 +155,14 @@ impl SpuServiceController { let svc_name = SpuServicespec::service_name(spu_name); + let mut ctx = spg_obj + .ctx() + .create_child() + .set_labels(vec![("fluvio.io/spu-name", spu_name)]); + ctx.item_mut().annotations = spu_k8_config.lb_service_annotations.clone(); + let obj = MetadataStoreObject::with_spec(svc_name.clone(), k8_service_spec.into()) - .with_context( - spg_obj - .ctx() - .create_child() - .set_labels(vec![("fluvio.io/spu-name", spu_name)]), - ); + .with_context(ctx); debug!("action: {:#?}", obj); let action = WSAction::Apply(obj); diff --git a/src/stream-dispatcher/Cargo.toml b/src/stream-dispatcher/Cargo.toml index fdf3838e06..7a101a28fb 100644 --- a/src/stream-dispatcher/Cargo.toml +++ b/src/stream-dispatcher/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fluvio-stream-dispatcher" edition = "2018" -version = "0.5.0" +version = "0.5.1" authors = ["Fluvio Contributors "] description = "Fluvio Event Stream access" repository = "https://github.com/infinyon/fluvio" @@ -27,7 +27,7 @@ once_cell = "1.5" # Fluvio dependencies fluvio-types = { path = "../types", version = "0.2.0" } -fluvio-stream-model = { features = ["k8"], version = "0.5.0", path = "../stream-model" } +fluvio-stream-model = { features = ["k8"], version = "0.5.1", path = "../stream-model" } k8-metadata-client = { version = "3.0.0" } fluvio-future = { version = "0.2.0" } diff --git a/src/stream-dispatcher/src/dispatcher/k8_ws_service.rs b/src/stream-dispatcher/src/dispatcher/k8_ws_service.rs index dc76e5332f..61f4505646 100644 --- a/src/stream-dispatcher/src/dispatcher/k8_ws_service.rs +++ b/src/stream-dispatcher/src/dispatcher/k8_ws_service.rs @@ -72,6 +72,7 @@ where }; input_metadata.labels = ctx.item().get_labels(); + input_metadata.annotations = ctx.item().annotations.clone(); trace!("converted metadata: {:#?}", input_metadata); let new_k8 = InputK8Obj::new(k8_spec, input_metadata); diff --git a/src/stream-model/Cargo.toml b/src/stream-model/Cargo.toml index 5e05b0c544..bdc6ce5e72 100644 --- a/src/stream-model/Cargo.toml +++ b/src/stream-model/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fluvio-stream-model" edition = "2018" -version = "0.5.0" +version = "0.5.1" authors = ["Fluvio Contributors "] description = "Fluvio Event Stream Model" repository = "https://github.com/infinyon/fluvio" diff --git a/src/stream-model/src/store/k8.rs b/src/stream-model/src/store/k8.rs index 1dde8ae6db..f45dc60535 100644 --- a/src/stream-model/src/store/k8.rs +++ b/src/stream-model/src/store/k8.rs @@ -5,7 +5,7 @@ use std::convert::TryInto; use std::num::ParseIntError; use std::fmt::Display; use std::fmt::Debug; -use std::ops::Deref; +use std::ops::{Deref, DerefMut}; use std::cmp::PartialEq; use std::collections::HashMap; @@ -87,6 +87,12 @@ impl Deref for K8MetaItem { } } +impl DerefMut for K8MetaItem { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.inner + } +} + impl MetadataItem for K8MetaItem { type UId = String; fn uid(&self) -> &Self::UId {