Skip to content

Commit a7331bb

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/namespace-templating
2 parents 4905016 + 3c84831 commit a7331bb

File tree

28 files changed

+207
-121
lines changed

28 files changed

+207
-121
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/modules/stackablectl/pages/installation.adoc

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= Installation
22
:page-aliases: stable@stackablectl::installation.adoc
33

4-
:latest-release: https://github.com/stackabletech/stackable-cockpit/releases/tag/stackablectl-24.11.1
4+
:latest-release: https://github.com/stackabletech/stackable-cockpit/releases/tag/stackablectl-25.3.0
55
:fish-comp-loations: https://fishshell.com/docs/current/completions.html#where-to-put-completions
66
:nushell-comp-locations: https://www.nushell.sh/book/custom_commands.html#persisting
77

@@ -23,14 +23,14 @@ You can also use the following command:
2323
2424
[source,console]
2525
----
26-
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-24.11.1/stackablectl-x86_64-unknown-linux-gnu
26+
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-25.3.0/stackablectl-x86_64-unknown-linux-gnu
2727
----
2828
2929
**aarch64** (arm64):
3030
3131
[source,console]
3232
----
33-
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-24.11.1/stackablectl-aarch64-unknown-linux-gnu
33+
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-25.3.0/stackablectl-aarch64-unknown-linux-gnu
3434
----
3535
3636
Install the binary into a directory in the `$PATH`, and make it executable:
@@ -60,14 +60,14 @@ You can also use the following command:
6060
6161
[source,console]
6262
----
63-
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-24.11.1/stackablectl-x86_64-apple-darwin
63+
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-25.3.0/stackablectl-x86_64-apple-darwin
6464
----
6565
6666
**aarch64** (arm64):
6767
6868
[source,console]
6969
----
70-
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-24.11.1/stackablectl-aarch64-apple-darwin
70+
$ curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-25.3.0/stackablectl-aarch64-apple-darwin
7171
----
7272
7373
Install the binary into a directory in the `$PATH`, and make it executable:
@@ -96,8 +96,14 @@ up asking if you want to allow access for `stackablectl`. You must allow access.
9696
Windows::
9797
+
9898
--
99-
Currently, there are no pre-built binaries available for Windows. Please refer to xref:#building-from-source[this]
100-
section to learn how to build the binary from source.
99+
Currently, there are no pre-built binaries available for Windows.
100+
At the time of writing, compiling `stackablectl` on Windows was impossible due to upstream bugs.
101+
While it may have become possible since then, it'll still provide significant challenges due to high technical complexity
102+
related to FFI, cgo and Windows-specific issues.
103+
104+
For Windows users, WSL will probably be the best option for using `stackablectl`.
105+
106+
If you do want to attempt compiling for Windows, please refer to xref:#building-from-source[this] section - and if you are successful, by all means, give us a shout and we will reward you handsomely!
101107
--
102108
====
103109

extra/man/stackablectl.1

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/helm-sys/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ pub fn uninstall_helm_release(
5656
}
5757
}
5858

59+
// TODO (@NickLarsenNZ): Add tracing to helm-sys, maybe?
60+
// #[instrument]
5961
pub fn check_helm_release_exists(release_name: &str, namespace: &str) -> bool {
6062
let release_name = CString::new(release_name).unwrap();
6163
let namespace = CString::new(namespace).unwrap();

rust/stackable-cockpit/src/constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub const HELM_REPO_INDEX_FILE: &str = "index.yaml";
2525
pub const HELM_OCI_BASE: &str = "oci.stackable.tech";
2626
pub const HELM_OCI_REGISTRY: &str = "oci://oci.stackable.tech/sdp-charts";
2727

28-
pub const HELM_DEFAULT_CHART_VERSION: &str = ">0.0.0-0";
28+
pub const HELM_DEFAULT_CHART_VERSION: &str = "0.0.0-dev";
2929

3030
pub const PRODUCT_NAMES: &[&str] = &[
3131
"airflow",

rust/stackable-cockpit/src/engine/docker/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub enum Error {
1919
}
2020

2121
/// Checks if Docker is running on the system
22-
#[instrument]
22+
#[instrument(skip_all)]
2323
pub async fn check_if_docker_is_running() -> Result<()> {
2424
debug!("Checking if Docker is running");
2525

rust/stackable-cockpit/src/engine/kind/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Cluster {
6464
}
6565

6666
/// Create a new local cluster by calling the kind binary.
67-
#[instrument]
67+
#[instrument(skip_all)]
6868
pub async fn create(&self) -> Result<()> {
6969
info!("Creating local cluster using kind");
7070

@@ -109,7 +109,7 @@ impl Cluster {
109109
}
110110

111111
/// Creates a kind cluster if it doesn't exist already.
112-
#[instrument]
112+
#[instrument(skip_all)]
113113
pub async fn create_if_not_exists(&self) -> Result<()> {
114114
info!("Creating cluster if it doesn't exist using kind");
115115

@@ -131,7 +131,7 @@ impl Cluster {
131131
}
132132

133133
/// Check if a kind cluster with the provided name already exists.
134-
#[instrument]
134+
#[instrument(skip_all)]
135135
async fn check_if_cluster_exists(cluster_name: &str) -> Result<bool> {
136136
debug!("Checking if kind cluster exists");
137137

rust/stackable-cockpit/src/engine/minikube/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Cluster {
4141
}
4242

4343
/// Create a new local cluster by calling the Minikube binary
44-
#[instrument]
44+
#[instrument(skip_all)]
4545
pub async fn create(&self) -> Result<(), Error> {
4646
info!("Creating local cluster using Minikube");
4747

@@ -70,7 +70,7 @@ impl Cluster {
7070
}
7171

7272
/// Creates a Minikube cluster if it doesn't exist already.
73-
#[instrument]
73+
#[instrument(skip_all)]
7474
pub async fn create_if_not_exists(&self) -> Result<(), Error> {
7575
info!("Creating cluster if it doesn't exist using Minikube");
7676

@@ -92,7 +92,7 @@ impl Cluster {
9292
}
9393

9494
/// Check if a kind cluster with the provided name already exists.
95-
#[instrument]
95+
#[instrument(skip_all)]
9696
async fn check_if_cluster_exists(cluster_name: &str) -> Result<bool, Error> {
9797
debug!("Checking if Minikube cluster exists");
9898

rust/stackable-cockpit/src/helm.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ pub struct ChartVersion<'a> {
182182
///
183183
/// This function expects the fully qualified Helm release name. In case of our
184184
/// operators this is: `<PRODUCT_NAME>-operator`.
185-
#[instrument]
185+
#[instrument(skip(values_yaml), fields(with_values = values_yaml.is_some()))]
186186
pub fn install_release_from_repo_or_registry(
187187
release_name: &str,
188188
ChartVersion {
@@ -239,8 +239,8 @@ pub fn install_release_from_repo_or_registry(
239239
let chart_version = chart_version.unwrap_or(HELM_DEFAULT_CHART_VERSION);
240240

241241
debug!(
242-
"Installing Helm release {} ({}) from chart {}",
243-
release_name, chart_version, full_chart_name
242+
release_name,
243+
chart_version, full_chart_name, "Installing Helm release"
244244
);
245245

246246
install_release(
@@ -260,6 +260,7 @@ pub fn install_release_from_repo_or_registry(
260260
///
261261
/// This function expects the fully qualified Helm release name. In case of our
262262
/// operators this is: `<PRODUCT_NAME>-operator`.
263+
#[instrument(fields(with_values = values_yaml.is_some()))]
263264
fn install_release(
264265
release_name: &str,
265266
chart_name: &str,
@@ -388,10 +389,10 @@ pub fn add_repo(repository_name: &str, repository_url: &str) -> Result<(), Error
388389
}
389390

390391
/// Retrieves the Helm index file from the repository URL.
391-
#[instrument]
392+
#[instrument(skip_all, fields(%repo_url))]
392393
pub async fn get_helm_index<T>(repo_url: T) -> Result<ChartSourceMetadata, Error>
393394
where
394-
T: AsRef<str> + std::fmt::Debug,
395+
T: AsRef<str> + std::fmt::Display + std::fmt::Debug,
395396
{
396397
debug!("Get Helm repo index file");
397398

0 commit comments

Comments
 (0)