Skip to content

Commit 4369681

Browse files
authored
Merge branch 'main' into feat/add-demo-stack-deletion
2 parents 14f9f7b + a58f836 commit 4369681

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ All notable changes to this project will be documented in this file.
66

77
### Added
88

9+
- Heuristic for setting listener presets when the environment is Minikube ([#438]).
910
- Add `uninstall` subcommand for `demo`/`stack` commands ([#429]).
1011

12+
[#438]: https://github.com/stackabletech/stackable-cockpit/pull/438
1113
[#429]: https://github.com/stackabletech/stackable-cockpit/pull/429
1214

1315
## [1.4.0] - 2026-03-18

0 commit comments

Comments
 (0)