Skip to content

Commit 88c5534

Browse files
committed
bump operator-rs
1 parent 28de602 commit 88c5534

File tree

3 files changed

+46
-39
lines changed

3 files changed

+46
-39
lines changed

Cargo.lock

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

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

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -186,39 +186,45 @@ mod tests {
186186
HbaseRole::RestServer => (),
187187
};
188188

189-
assert_eq!(affinity, StackableAffinity {
190-
pod_affinity: Some(PodAffinity {
191-
preferred_during_scheduling_ignored_during_execution: Some(expected_affinities),
192-
required_during_scheduling_ignored_during_execution: None,
193-
}),
194-
pod_anti_affinity: Some(PodAntiAffinity {
195-
preferred_during_scheduling_ignored_during_execution: Some(vec![
196-
WeightedPodAffinityTerm {
197-
pod_affinity_term: PodAffinityTerm {
198-
label_selector: Some(LabelSelector {
199-
match_expressions: None,
200-
match_labels: Some(BTreeMap::from([
201-
("app.kubernetes.io/name".to_string(), "hbase".to_string(),),
202-
(
203-
"app.kubernetes.io/instance".to_string(),
204-
"simple-hbase".to_string(),
205-
),
206-
("app.kubernetes.io/component".to_string(), role.to_string(),)
207-
]))
208-
}),
209-
match_label_keys: None,
210-
mismatch_label_keys: None,
211-
namespace_selector: None,
212-
namespaces: None,
213-
topology_key: "kubernetes.io/hostname".to_string(),
214-
},
215-
weight: 70
216-
}
217-
]),
218-
required_during_scheduling_ignored_during_execution: None,
219-
}),
220-
node_affinity: None,
221-
node_selector: None,
222-
});
189+
assert_eq!(
190+
affinity,
191+
StackableAffinity {
192+
pod_affinity: Some(PodAffinity {
193+
preferred_during_scheduling_ignored_during_execution: Some(expected_affinities),
194+
required_during_scheduling_ignored_during_execution: None,
195+
}),
196+
pod_anti_affinity: Some(PodAntiAffinity {
197+
preferred_during_scheduling_ignored_during_execution: Some(vec![
198+
WeightedPodAffinityTerm {
199+
pod_affinity_term: PodAffinityTerm {
200+
label_selector: Some(LabelSelector {
201+
match_expressions: None,
202+
match_labels: Some(BTreeMap::from([
203+
("app.kubernetes.io/name".to_string(), "hbase".to_string(),),
204+
(
205+
"app.kubernetes.io/instance".to_string(),
206+
"simple-hbase".to_string(),
207+
),
208+
(
209+
"app.kubernetes.io/component".to_string(),
210+
role.to_string(),
211+
)
212+
]))
213+
}),
214+
match_label_keys: None,
215+
mismatch_label_keys: None,
216+
namespace_selector: None,
217+
namespaces: None,
218+
topology_key: "kubernetes.io/hostname".to_string(),
219+
},
220+
weight: 70
221+
}
222+
]),
223+
required_during_scheduling_ignored_during_execution: None,
224+
}),
225+
node_affinity: None,
226+
node_selector: None,
227+
}
228+
);
223229
}
224230
}

rust/operator-binary/src/main.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ use hbase_controller::FULL_HBASE_CONTROLLER_NAME;
66
use stackable_operator::{
77
YamlSchema,
88
cli::{Command, ProductOperatorRun, RollingPeriod},
9-
k8s_openapi::api::{apps::v1::StatefulSet, core::v1::Service},
9+
k8s_openapi::api::{
10+
apps::v1::StatefulSet,
11+
core::v1::{ConfigMap, Service},
12+
},
1013
kube::{
1114
ResourceExt,
1215
core::DeserializeGuard,
1316
runtime::{
1417
Controller,
1518
events::{Recorder, Reporter},
19+
reflector::ObjectRef,
1620
watcher,
1721
},
1822
},

0 commit comments

Comments
 (0)