Skip to content

Commit 6ed83e5

Browse files
committed
chore: Merge branch 'main' into fix/stackablectl_current_release
2 parents 89c3c15 + a58f836 commit 6ed83e5

File tree

10 files changed

+76
-12
lines changed

10 files changed

+76
-12
lines changed

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,16 @@ repos:
103103

104104
- id: cargo-rustfmt
105105
name: cargo-rustfmt
106+
files: \.rs$
106107
language: system
107108
# Pinning to a specific rustc version, so that we get consistent formatting
108109
entry: cargo +nightly-2025-05-26 fmt --all -- --check
109110
stages: [pre-commit]
110111
pass_filenames: false
112+
113+
- id: ./scripts/verify_release_notes
114+
name: ./scripts/verify_release_notes
115+
language: system
116+
entry: ./scripts/verify_release_notes.sh
117+
stages: [pre-commit, pre-merge-commit, manual]
118+
pass_filenames: false

Cargo.lock

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

Cargo.nix

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

docs/modules/stackablectl/pages/release-notes.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ A full list of changes is available directly in https://github.com/stackabletech
66

77
// WARNING: Please keep the empty newlines, otherwise headings are broken.
88

9+
include::partial$release-notes/release-1.4.0.adoc[]
10+
11+
include::partial$release-notes/release-1.3.0.adoc[]
12+
13+
include::partial$release-notes/release-1.2.2.adoc[]
14+
915
include::partial$release-notes/release-1.2.1.adoc[]
1016

1117
include::partial$release-notes/release-1.2.0.adoc[]
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
== 1.3.0
2+
3+
* Allow specifying Helm values for operator installations.
4+
See https://github.com/stackabletech/stackable-cockpit/pull/425[stackable-cockpit#425].
5+
* Bump Rust to `1.93.0` as well as dependencies.
6+
See https://github.com/stackabletech/stackable-cockpit/pull/426[stackable-cockpit#426].
7+
* Bump Go to `1.26.0` as well as dependencies.
8+
See https://github.com/stackabletech/stackable-cockpit/pull/426[stackable-cockpit#426].
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
== 1.4.0
2+
3+
* Add `STACK` and `DEMO` templating parameters. Have a look at the `README.md` for details.
4+
See https://github.com/stackabletech/stackable-cockpit/pull/432[stackable-cockpit#432].

rust/stackable-cockpit/src/platform/operator/listener_operator.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ pub async fn determine_and_store_listener_class_preset(from_cli: Option<&Listene
4545
let listener_class_preset = match kubernetes_environment {
4646
// Kind does not support LoadBalancers out of the box, so avoid that
4747
KubernetesEnvironment::Kind => ListenerClassPreset::StableNodes,
48+
// Minikube does support LoadBalancers via "minikube tunnel", but that requires additional setup
49+
// and we assume that users running Minikube with stackablectl want to keep things simple.
50+
KubernetesEnvironment::Minikube => ListenerClassPreset::StableNodes,
4851
// LoadBalancer support in k3s is optional, so let's be better safe than sorry and not use
4952
// them
5053
KubernetesEnvironment::K3s => ListenerClassPreset::StableNodes,
@@ -69,6 +72,7 @@ enum KubernetesEnvironment {
6972
Kind,
7073
K3s,
7174
Ionos,
75+
Minikube,
7276
Unknown,
7377
}
7478

@@ -100,6 +104,13 @@ async fn guess_kubernetes_environment() -> Result<KubernetesEnvironment, snafu::
100104
}
101105
}
102106
}
107+
108+
// Check labels for minikube (since minikube doesn't set providerID)
109+
if let Some(labels) = node.metadata.labels.as_ref() {
110+
if labels.contains_key("minikube.k8s.io/version") {
111+
return Ok(KubernetesEnvironment::Minikube);
112+
}
113+
}
103114
}
104115

105116
Ok(KubernetesEnvironment::Unknown)

rust/stackablectl/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Added
8+
9+
- Heuristic for setting listener presets when the environment is Minikube ([#438]).
10+
11+
[#438]: https://github.com/stackabletech/stackable-cockpit/pull/438
12+
713
## [1.4.0] - 2026-03-18
814

915
### Added

rust/stackablectl/RELEASE.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ to be done:
66
1. Ensure your local `main` branch is up-to-date and then proceed to checkout a new branch using
77
`git checkout -b chore/release-stackablectl-X.Y.Z`.
88
2. Update both the Cargo.toml and CHANGELOG.md file to the new version `X.Y.Z`.
9-
3. Update various files by running the following xtask `cargo xtask gen-man` and
9+
3. Add the relevant changes from the changelog to a new release notes partial under
10+
`docs/stackablectl/partials/release-notes`.
11+
4. Update various files by running the following xtask `cargo xtask gen-man` and
1012
`make regenerate-nix`. This is also automatically done if pre-commit is enabled.
11-
4. Push the changes and raise a PR.
12-
5. Merge the PR onto `main` and then proceed to tag the appropriate commit using
13+
5. Push the changes and raise a PR.
14+
6. Merge the PR onto `main` and then proceed to tag the appropriate commit using
1315
`git tag -s stackablectl-Y.Y.Z -m stackablectl-Y.Y.Z`.
14-
6. Building the artifacts and creating the release on GitHub is fully automated from this point
16+
7. Building the artifacts and creating the release on GitHub is fully automated from this point
1517
onward.

scripts/verify_release_notes.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
STACKABLECTL_VERSION=$(grep 'version' "./rust/stackablectl/Cargo.toml" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
6+
[ -n "$STACKABLECTL_VERSION" ] || (
7+
echo "CRATE_VERSION for is empty." >&2
8+
echo "Please check ./rust/stackablectl/Cargo.toml" >&2
9+
exit 1
10+
)
11+
12+
RELEASE_NOTES_FILE="./docs/modules/stackablectl/partials/release-notes/release-${STACKABLECTL_VERSION}.adoc"
13+
14+
if [ ! -f "$RELEASE_NOTES_FILE" ]; then
15+
echo "$RELEASE_NOTES_FILE does not exist, please create it and add the appropriate content" >&2
16+
exit 1
17+
fi

0 commit comments

Comments
 (0)