Cluster chart version (#587)

* Make cluster use top-level VERSION * Trim newlines from VERSION const in fluvio-cluster * Put VERSION behind 'platform' flag. Bump version
infinyon · Dec 21, 2020 · 6b4894c · 6b4894c
1 parent abfafa9
commit 6b4894c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-cluster"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2018"
 license = "Apache-2.0"
 authors = ["Fluvio Contributors <[email protected]>"]
@@ -24,6 +24,7 @@ cli = [
     "prettytable-rs",
     "fluvio-runner-local/platform",
 ]
+platform = []
 
 [dependencies]
 colored = "2.0.0"

diff --git a/src/cluster/src/VERSION b/src/cluster/src/VERSION
diff --git a/src/cluster/src/cli/start/mod.rs b/src/cluster/src/cli/start/mod.rs
@@ -23,7 +23,7 @@ pub struct DefaultVersion(String);
 
 impl Default for DefaultVersion {
     fn default() -> Self {
-        Self(crate::VERSION.to_string())
+        Self(crate::VERSION.trim().to_string())
     }
 }
 

diff --git a/src/cluster/src/lib.rs b/src/cluster/src/lib.rs
@@ -38,7 +38,12 @@ pub use check::{ClusterChecker, CheckStatus, CheckStatuses};
 pub use check::{RecoverableCheck, UnrecoverableCheck};
 pub use delete::ClusterUninstaller;
 
-const VERSION: &str = include_str!("VERSION");
+#[cfg(feature = "platform")]
+const VERSION: &str = include_str!("../../../VERSION");
+
+#[cfg(not(feature = "platform"))]
+const VERSION: &str = "UNDEFINED";
+
 pub(crate) const DEFAULT_NAMESPACE: &str = "default";
 pub(crate) const DEFAULT_HELM_VERSION: &str = "3.3.4";
 pub(crate) const DEFAULT_CHART_SYS_REPO: &str = "fluvio-sys";

diff --git a/src/cluster/src/start/k8.rs b/src/cluster/src/start/k8.rs
@@ -566,7 +566,7 @@ impl ClusterInstaller {
             namespace: DEFAULT_NAMESPACE.to_string(),
             image_tag: None,
             image_registry: DEFAULT_REGISTRY.to_string(),
-            chart_version: crate::VERSION.to_string(),
+            chart_version: crate::VERSION.trim().to_string(),
             chart_name: DEFAULT_CHART_APP_NAME.to_string(),
             chart_location: ChartLocation::Remote(DEFAULT_CHART_REMOTE.to_string()),
             group_name: DEFAULT_GROUP_NAME.to_string(),