Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Added

- Add `ZOOCFGDIR` env var to `/stackable/rwconfig` to improve shell script usage like `zkCleanup.sh` ([#988]).

[#988]: https://github.com/stackabletech/zookeeper-operator/pull/988

## [25.11.0] - 2025-11-07

## [25.11.0-rc1] - 2025-11-06
Expand Down
28 changes: 18 additions & 10 deletions rust/operator-binary/src/crd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,16 +416,24 @@ impl Configuration for v1alpha1::ZookeeperConfigFragment {
resource: &Self::Configurable,
_role_name: &str,
) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
Ok([(
v1alpha1::ZookeeperConfig::MYID_OFFSET.to_string(),
self.myid_offset
.or(v1alpha1::ZookeeperConfig::default_server_config(
&resource.name_any(),
&ZookeeperRole::Server,
)
.myid_offset)
.map(|myid_offset| myid_offset.to_string()),
)]
Ok([
(
v1alpha1::ZookeeperConfig::MYID_OFFSET.to_string(),
self.myid_offset
.or(v1alpha1::ZookeeperConfig::default_server_config(
&resource.name_any(),
&ZookeeperRole::Server,
)
.myid_offset)
.map(|myid_offset| myid_offset.to_string()),
),
// This is used by zkEnv.sh and for the shell scripts in bin/
// If unset it tries to find the conf directory automatically and that fails
(
"ZOOCFGDIR".to_string(),
Some(STACKABLE_RW_CONFIG_DIR.to_string()),
),
]
.into())
}

Expand Down