use op-rs 0.82.0

maltesander · maltesander · commit 58a42aef1d08 · 2024-11-25T15:44:40.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,16 +21,13 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.82.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.39", features = ["full"] }
 tracing = "0.1"
 tracing-futures = { version = "0.2", features = ["futures-03"] }
 indoc = "2"
 
-[patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/SUP-148" }
-
 #[patch."https://github.com/stackabletech/operator-rs.git"]
 #stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
 #stackable-operator = { path = "../operator-rs" }
diff --git a/rust/operator-binary/src/history/history_controller.rs b/rust/operator-binary/src/history/history_controller.rs
@@ -659,6 +659,8 @@ fn build_service(
     })
 }
 
+// TODO: This function should be replaced with operator-rs build_rbac_resources.
+// See: https://github.com/stackabletech/spark-k8s-operator/issues/499
 #[allow(clippy::result_large_err)]
 fn build_history_role_serviceaccount(
     shs: &SparkHistoryServer,

Original file line number	Diff line number	Diff line change
`@@ -659,6 +659,8 @@ fn build_service(`
`659`	`659`	`})`
`660`	`660`	`}`
`661`	`661`
	`662`	`+// TODO: This function should be replaced with operator-rs build_rbac_resources.`
	`663`	`+// See: https://github.com/stackabletech/spark-k8s-operator/issues/499`
`662`	`664`	`#[allow(clippy::result_large_err)]`
`663`	`665`	`fn build_history_role_serviceaccount(`
`664`	`666`	`shs: &SparkHistoryServer,`