Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rust/stackable-cockpit/src/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ pub const PRODUCT_NAMES: &[&str] = &[
"kafka",
"nifi",
"opa",
"spark-history-server",
"spark-connect",
"spark-history",
"superset",
"trino",
"zookeeper",
Expand Down
20 changes: 14 additions & 6 deletions rust/stackable-cockpit/src/platform/stacklet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,23 +168,31 @@ fn build_products_gvk_list<'a>(product_names: &[&'a str]) -> IndexMap<&'a str, G
let mut map = IndexMap::new();

for product_name in product_names {
// Why? Just why? Can we please make this consistent?
if *product_name == "spark-history-server" {
// Note(techassi): Why? Just why? Can we please make this consistent?
// Note(sbernauer): I think it's legit that SparkHistoryServer and SparkConnectServer are in
// the api group spark.stackable.tech. All of this will probably be rewritten any as soon as
// we have versions different than v1alpha1.
if *product_name == "spark-history" {
map.insert(*product_name, GroupVersionKind {
group: "spark.stackable.tech".into(),
version: "v1alpha1".into(),
kind: "SparkHistoryServer".into(),
});
continue;
} else if *product_name == "spark-connect" {
map.insert(*product_name, GroupVersionKind {
group: "spark.stackable.tech".into(),
version: "v1alpha1".into(),
kind: "SparkConnectServer".into(),
});
} else {
map.insert(*product_name, gvk_from_product_name(product_name));
}

map.insert(*product_name, gvk_from_product_name(product_name));
}

map
}

// FIXME: Support SparkApplication
// FIXME: Support SparkApplication and SparkConnectServer
fn gvk_from_product_name(product_name: &str) -> GroupVersionKind {
GroupVersionKind {
group: format!("{product_name}.stackable.tech"),
Expand Down
2 changes: 2 additions & 0 deletions rust/stackablectl/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
- Pass the stack/demo namespace as a templating variable `NAMESPACE` to manifests.
This should unblock demos to run in all namespaces, as they can template the namespace e.g. for the FQDN of services ([#355]).
- Add progress reporting ([#376]).
- Include SparkConnectServer in the `stacklet list` output ([#380]).

### Changed

Expand All @@ -22,6 +23,7 @@ All notable changes to this project will be documented in this file.
[#368]: https://github.com/stackabletech/stackable-cockpit/pull/368
[#373]: https://github.com/stackabletech/stackable-cockpit/pull/373
[#376]: https://github.com/stackabletech/stackable-cockpit/pull/376
[#380]: https://github.com/stackabletech/stackable-cockpit/pull/380

## [25.3.0] - 2025-03-27

Expand Down
Loading