Skip to content

Commit 263b9cd

Browse files
Apply suggestions from code review
Co-authored-by: Nick <[email protected]>
1 parent ca2895b commit 263b9cd

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ use stackable_operator::{
77
use tokio::sync::OnceCell;
88
use tracing::{debug, info, instrument};
99

10-
pub static LISTENER_OPERATOR_PRESET: OnceCell<ListenerOperatorPreset> = OnceCell::const_new();
10+
pub static LISTENER_CLASS_PRESET: OnceCell<ListenerClassPreset> = OnceCell::const_new();
1111

12+
/// Represents the `preset` value in the Listener Operator Helm Chart
1213
#[derive(Copy, Clone, Debug, ValueEnum)]
13-
pub enum ListenerOperatorPreset {
14+
pub enum ListenerClassPreset {
1415
None,
1516
StableNodes,
1617
EphemeralNodes,
@@ -28,39 +29,39 @@ impl ListenerOperatorPreset {
2829
}
2930

3031
#[instrument]
31-
pub async fn determine_and_store_listener_operator_preset(
32-
from_cli: Option<&ListenerOperatorPreset>,
32+
pub async fn determine_and_store_listener_class_preset(
33+
from_cli: Option<&ListenerClassPreset>,
3334
) {
3435
if let Some(from_cli) = from_cli {
35-
LISTENER_OPERATOR_PRESET
36+
LISTENER_CLASS_PRESET
3637
.set(*from_cli)
37-
.expect("We are the only function setting LISTENER_OPERATOR_PRESET");
38+
.expect("LISTENER_CLASS_PRESET should be unset");
3839
return;
3940
}
4041

4142
let kubernetes_environment = guess_kubernetes_environment().await.unwrap_or_else(|err| {
4243
info!("failed to determine Kubernetes environment, using defaults: {err:#?}");
4344
KubernetesEnvironment::Unknown
4445
});
45-
let listener_operator_preset = match kubernetes_environment {
46+
let listener_class_preset = match kubernetes_environment {
4647
// Kind does not support LoadBalancers out of the box, so avoid that
47-
KubernetesEnvironment::Kind => ListenerOperatorPreset::StableNodes,
48+
KubernetesEnvironment::Kind => ListenerClassPreset::StableNodes,
4849
// LoadBalancer support in k3s is optional, so let's be better safe than sorry and not use
4950
// them
50-
KubernetesEnvironment::K3s => ListenerOperatorPreset::StableNodes,
51+
KubernetesEnvironment::K3s => ListenerClassPreset::StableNodes,
5152
// Weekly node rotations and LoadBalancer support
52-
KubernetesEnvironment::Ionos => ListenerOperatorPreset::EphemeralNodes,
53+
KubernetesEnvironment::Ionos => ListenerClassPreset::EphemeralNodes,
5354
// Don't pin nodes and assume we have LoadBalancer support
54-
KubernetesEnvironment::Unknown => ListenerOperatorPreset::EphemeralNodes,
55+
KubernetesEnvironment::Unknown => ListenerClassPreset::EphemeralNodes,
5556
};
5657
debug!(
57-
preset = ?listener_operator_preset,
58+
preset = ?listener_class_preset,
5859
kubernetes.environment = ?kubernetes_environment,
59-
"Using listener-operator preset"
60+
"Using ListenerClass preset"
6061
);
6162

62-
LISTENER_OPERATOR_PRESET
63-
.set(listener_operator_preset)
63+
LISTENER_CLASS_PRESET
64+
.set(listener_class_preset)
6465
.expect("LISTENER_CLASS_PRESET should be unset");
6566
}
6667

0 commit comments

Comments
 (0)