Skip to content

Commit e5222bb

Browse files
labrenbelabrenbe
committed
run cargo fmt
1 parent d916da2 commit e5222bb

File tree

4 files changed

+138
-130
lines changed

4 files changed

+138
-130
lines changed

‎rust/operator-binary/src/controller.rs

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -710,14 +710,11 @@ fn build_metastore_rolegroup_config_map(
710710
cm_builder.add_data(CORE_SITE_XML, to_hadoop_xml(data.iter()));
711711
}
712712

713-
extend_role_group_config_map(
714-
rolegroup,
715-
&merged_config.logging,
716-
&mut cm_builder,
717-
)
718-
.context(InvalidLoggingConfigSnafu {
719-
cm_name: rolegroup.object_name(),
720-
})?;
713+
extend_role_group_config_map(rolegroup, &merged_config.logging, &mut cm_builder).context(
714+
InvalidLoggingConfigSnafu {
715+
cm_name: rolegroup.object_name(),
716+
},
717+
)?;
721718

722719
cm_builder
723720
.build()
@@ -1041,33 +1038,33 @@ fn build_metastore_rolegroup_statefulset(
10411038
// default, is started first and can provide any dependencies that vector expects
10421039
if merged_config.logging.enable_vector_agent {
10431040
match hive
1044-
.spec
1045-
.cluster_config
1046-
.vector_aggregator_config_map_name
1047-
.to_owned()
1048-
{
1049-
Some(vector_aggregator_config_map_name) => {
1050-
pod_builder.add_container(
1051-
product_logging::framework::vector_container(
1052-
resolved_product_image,
1053-
STACKABLE_CONFIG_MOUNT_DIR_NAME,
1054-
STACKABLE_LOG_DIR_NAME,
1055-
merged_config.logging.containers.get(&Container::Vector),
1056-
ResourceRequirementsBuilder::new()
1057-
.with_cpu_request("250m")
1058-
.with_cpu_limit("500m")
1059-
.with_memory_request("128Mi")
1060-
.with_memory_limit("128Mi")
1061-
.build(),
1062-
&vector_aggregator_config_map_name,
1063-
)
1064-
.context(BuildVectorContainerSnafu)?,
1065-
);
1066-
}
1067-
None => {
1068-
VectorAggregatorConfigMapMissingSnafu.fail()?;
1069-
}
1070-
}
1041+
.spec
1042+
.cluster_config
1043+
.vector_aggregator_config_map_name
1044+
.to_owned()
1045+
{
1046+
Some(vector_aggregator_config_map_name) => {
1047+
pod_builder.add_container(
1048+
product_logging::framework::vector_container(
1049+
resolved_product_image,
1050+
STACKABLE_CONFIG_MOUNT_DIR_NAME,
1051+
STACKABLE_LOG_DIR_NAME,
1052+
merged_config.logging.containers.get(&Container::Vector),
1053+
ResourceRequirementsBuilder::new()
1054+
.with_cpu_request("250m")
1055+
.with_cpu_limit("500m")
1056+
.with_memory_request("128Mi")
1057+
.with_memory_limit("128Mi")
1058+
.build(),
1059+
&vector_aggregator_config_map_name,
1060+
)
1061+
.context(BuildVectorContainerSnafu)?,
1062+
);
1063+
}
1064+
None => {
1065+
VectorAggregatorConfigMapMissingSnafu.fail()?;
1066+
}
1067+
}
10711068
}
10721069

10731070
let mut pod_template = pod_builder.build_template();

‎rust/operator-binary/src/crd/affinity.rs

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,39 @@ mod tests {
6161
.merged_config(&role, &role.rolegroup_ref(&hive, "default"))
6262
.unwrap();
6363

64-
assert_eq!(merged_config.affinity, StackableAffinity {
65-
pod_affinity: None,
66-
pod_anti_affinity: Some(PodAntiAffinity {
67-
preferred_during_scheduling_ignored_during_execution: Some(vec![
68-
WeightedPodAffinityTerm {
69-
pod_affinity_term: PodAffinityTerm {
70-
label_selector: Some(LabelSelector {
71-
match_labels: Some(BTreeMap::from([
72-
("app.kubernetes.io/name".to_string(), "hive".to_string(),),
73-
(
74-
"app.kubernetes.io/instance".to_string(),
75-
"simple-hive".to_string(),
76-
),
77-
(
78-
"app.kubernetes.io/component".to_string(),
79-
"metastore".to_string(),
80-
)
81-
])),
82-
..LabelSelector::default()
83-
}),
84-
topology_key: "kubernetes.io/hostname".to_string(),
85-
..PodAffinityTerm::default()
86-
},
87-
weight: 70
88-
}
89-
]),
90-
required_during_scheduling_ignored_during_execution: None,
91-
}),
92-
node_affinity: None,
93-
node_selector: None,
94-
});
64+
assert_eq!(
65+
merged_config.affinity,
66+
StackableAffinity {
67+
pod_affinity: None,
68+
pod_anti_affinity: Some(PodAntiAffinity {
69+
preferred_during_scheduling_ignored_during_execution: Some(vec![
70+
WeightedPodAffinityTerm {
71+
pod_affinity_term: PodAffinityTerm {
72+
label_selector: Some(LabelSelector {
73+
match_labels: Some(BTreeMap::from([
74+
("app.kubernetes.io/name".to_string(), "hive".to_string(),),
75+
(
76+
"app.kubernetes.io/instance".to_string(),
77+
"simple-hive".to_string(),
78+
),
79+
(
80+
"app.kubernetes.io/component".to_string(),
81+
"metastore".to_string(),
82+
)
83+
])),
84+
..LabelSelector::default()
85+
}),
86+
topology_key: "kubernetes.io/hostname".to_string(),
87+
..PodAffinityTerm::default()
88+
},
89+
weight: 70
90+
}
91+
]),
92+
required_during_scheduling_ignored_during_execution: None,
93+
}),
94+
node_affinity: None,
95+
node_selector: None,
96+
}
97+
);
9598
}
9699
}

‎rust/operator-binary/src/main.rs

Lines changed: 71 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@ use stackable_operator::{
1717
k8s_openapi::api::{
1818
apps::v1::StatefulSet,
1919
core::v1::{ConfigMap, Service},
20-
}, kube::{
20+
},
21+
kube::{
22+
ResourceExt,
2123
core::DeserializeGuard,
2224
runtime::{
23-
events::{Recorder, Reporter}, reflector::ObjectRef, watcher, Controller
24-
}, ResourceExt,
25-
}, logging::controller::report_controller_reconciled, shared::yaml::SerializeOptions,
25+
Controller,
26+
events::{Recorder, Reporter},
27+
reflector::ObjectRef,
28+
watcher,
29+
},
30+
},
31+
logging::controller::report_controller_reconciled,
32+
shared::yaml::SerializeOptions,
2633
};
2734
use stackable_telemetry::{Tracing, tracing::settings::Settings};
2835
use tracing::level_filters::LevelFilter;
@@ -118,66 +125,70 @@ async fn main() -> anyhow::Result<()> {
118125
&cluster_info_opts,
119126
)
120127
.await?;
121-
let event_recorder = Arc::new(Recorder::new(client.as_kube_client(), Reporter {
122-
controller: HIVE_FULL_CONTROLLER_NAME.to_string(),
123-
instance: None,
124-
}));
128+
let event_recorder = Arc::new(Recorder::new(
129+
client.as_kube_client(),
130+
Reporter {
131+
controller: HIVE_FULL_CONTROLLER_NAME.to_string(),
132+
instance: None,
133+
},
134+
));
125135

126136
let hive_controller = Controller::new(
127137
watch_namespace.get_api::<DeserializeGuard<v1alpha1::HiveCluster>>(&client),
128138
watcher::Config::default(),
129139
);
130140
let hive_store_1 = hive_controller.store();
131-
hive_controller.owns(
132-
watch_namespace.get_api::<Service>(&client),
133-
watcher::Config::default(),
134-
)
135-
.owns(
136-
watch_namespace.get_api::<StatefulSet>(&client),
137-
watcher::Config::default(),
138-
)
139-
.owns(
140-
watch_namespace.get_api::<ConfigMap>(&client),
141-
watcher::Config::default(),
142-
)
143-
.shutdown_on_signal()
144-
.watches(
145-
watch_namespace.get_api::<DeserializeGuard<ConfigMap>>(&client),
146-
watcher::Config::default(),
147-
move |config_map| {
148-
hive_store_1
149-
.state()
150-
.into_iter()
151-
.filter(move |hive| references_config_map(hive, &config_map))
152-
.map(|hive| ObjectRef::from_obj(&*hive))
153-
},
154-
)
155-
.run(
156-
controller::reconcile_hive,
157-
controller::error_policy,
158-
Arc::new(controller::Ctx {
159-
client: client.clone(),
160-
product_config,
161-
}),
162-
)
163-
// We can let the reporting happen in the background
164-
.for_each_concurrent(
165-
16, // concurrency limit
166-
|result| {
167-
// The event_recorder needs to be shared across all invocations, so that
168-
// events are correctly aggregated
169-
let event_recorder = event_recorder.clone();
170-
async move {
171-
report_controller_reconciled(
172-
&event_recorder,
173-
HIVE_FULL_CONTROLLER_NAME,
174-
&result,
175-
)
176-
.await;
177-
}
178-
},
179-
)
180-
.await;
141+
hive_controller
142+
.owns(
143+
watch_namespace.get_api::<Service>(&client),
144+
watcher::Config::default(),
145+
)
146+
.owns(
147+
watch_namespace.get_api::<StatefulSet>(&client),
148+
watcher::Config::default(),
149+
)
150+
.owns(
151+
watch_namespace.get_api::<ConfigMap>(&client),
152+
watcher::Config::default(),
153+
)
154+
.shutdown_on_signal()
155+
.watches(
156+
watch_namespace.get_api::<DeserializeGuard<ConfigMap>>(&client),
157+
watcher::Config::default(),
158+
move |config_map| {
159+
hive_store_1
160+
.state()
161+
.into_iter()
162+
.filter(move |hive| references_config_map(hive, &config_map))
163+
.map(|hive| ObjectRef::from_obj(&*hive))
164+
},
165+
)
166+
.run(
167+
controller::reconcile_hive,
168+
controller::error_policy,
169+
Arc::new(controller::Ctx {
170+
client: client.clone(),
171+
product_config,
172+
}),
173+
)
174+
// We can let the reporting happen in the background
175+
.for_each_concurrent(
176+
16, // concurrency limit
177+
|result| {
178+
// The event_recorder needs to be shared across all invocations, so that
179+
// events are correctly aggregated
180+
let event_recorder = event_recorder.clone();
181+
async move {
182+
report_controller_reconciled(
183+
&event_recorder,
184+
HIVE_FULL_CONTROLLER_NAME,
185+
&result,
186+
)
187+
.await;
188+
}
189+
},
190+
)
191+
.await;
181192
}
182193
}
183194

@@ -195,5 +206,5 @@ fn references_config_map(
195206
match hive.spec.cluster_config.hdfs.to_owned() {
196207
Some(hdfs_connection) => hdfs_connection.config_map == config_map.name_any(),
197208
None => false,
198-
}
199-
}
209+
}
210+
}

‎rust/operator-binary/src/product_logging.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ pub fn extend_role_group_config_map(
7777
if logging.enable_vector_agent {
7878
cm_builder.add_data(
7979
product_logging::framework::VECTOR_CONFIG_FILE,
80-
product_logging::framework::create_vector_config(
81-
rolegroup,
82-
vector_log_config,
83-
),
80+
product_logging::framework::create_vector_config(rolegroup, vector_log_config),
8481
);
8582
}
8683

0 commit comments

Comments
 (0)