Skip to content

Commit 3ae19c3

Browse files
committed
Addressed review comments.
1 parent bbaa5fc commit 3ae19c3

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ tracing-futures = { version = "0.2", features = ["futures-03"] }
3030

3131
#[patch."https://github.com/stackabletech/operator-rs.git"]
3232
#stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
33-
#stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" }
33+
#stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

rust/operator-binary/src/hdfs_clusterrolebinding_nodes_controller.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ pub async fn reconcile(
6565
Err(e) => {
6666
error!(
6767
?object,
68-
?e,
68+
error = &e as &dyn std::error::Error,
6969
"Failed to build serviceAccount name for hdfs cluster"
7070
);
7171
None
7272
}
7373
}
7474
})
75-
.map(|(meta, sa_name)| {
75+
.flat_map(|(meta, sa_name)| {
7676
let mut result = vec![
7777
Subject {
7878
kind: "ServiceAccount".to_string(),
@@ -100,7 +100,6 @@ pub async fn reconcile(
100100
result.dedup();
101101
result
102102
})
103-
.flat_map(|vec| vec.into_iter())
104103
.collect();
105104

106105
let patch = Patch::Apply(json!({

rust/operator-binary/src/hdfs_controller.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ pub async fn reconcile_hdfs(
324324
.context(BuildRbacResourcesSnafu)?;
325325

326326
cluster_resources
327-
// We clone here because we need to use rbac_sa further down
328327
.add(client, rbac_sa.clone())
329328
.await
330329
.context(ApplyServiceAccountSnafu)?;

0 commit comments

Comments
 (0)