Skip to content

Commit c256d04

Browse files
committed
feat: Support objectOverrides
1 parent 9b33399 commit c256d04

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tokio-zookeeper = "0.4"
3232
tracing = "0.1"
3333

3434
[patch."https://github.com/stackabletech/operator-rs"]
35-
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
35+
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/object-overrides" }
3636
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
3737

3838
[patch.crates-io]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ pub mod versioned {
154154
#[serde(skip_serializing_if = "Option::is_none")]
155155
pub servers:
156156
Option<Role<ZookeeperConfigFragment, ZookeeperServerRoleConfig, JavaCommonConfig>>,
157+
158+
/// TODO docs
159+
pub object_overrides: Option<String>,
157160
}
158161

159162
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]

rust/operator-binary/src/zk_controller.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ pub async fn reconcile_zk(
373373
ZK_CONTROLLER_NAME,
374374
&zk.object_ref(&()),
375375
ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
376+
zk.spec.object_overrides.as_ref(),
376377
)
377378
.context(CreateClusterResourcesSnafu)?;
378379

rust/operator-binary/src/znode_controller.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ async fn reconcile_apply(
287287
ZNODE_CONTROLLER_NAME,
288288
&znode.object_ref(&()),
289289
ClusterResourceApplyStrategy::from(&zk.spec.cluster_operation),
290+
zk.spec.object_overrides.as_ref(),
290291
)
291292
.context(ZnodeMissingExpectedKeysSnafu { znode })?;
292293

0 commit comments

Comments
 (0)