Skip to content
Open
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ All notable changes to this project will be documented in this file.
- Add `ZOOCFGDIR` env var to `/stackable/rwconfig` to improve shell script usage like `zkCleanup.sh` ([#988]).
- Support objectOverrides using `.spec.objectOverrides`.
See [objectOverrides concepts page](https://docs.stackable.tech/home/nightly/concepts/overrides/#object-overrides) for details ([#987]).
- Enable the [restart-controller](https://docs.stackable.tech/home/nightly/commons-operator/restarter/), so that the Pods are automatically restarted on config changes ([#999]).

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

## [25.11.0] - 2025-11-07

Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/zookeeper-operator"

[workspace.dependencies]
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.101.2", features = ["telemetry", "versioned"] }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.102.0", features = ["telemetry", "versioned"] }

anyhow = "1.0"
built = { version = "0.8", features = ["chrono", "git2"] }
Expand Down
14 changes: 7 additions & 7 deletions crate-hashes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions rust/operator-binary/src/zk_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use stackable_operator::{
product_image_selection::{self, ResolvedProductImage},
rbac::build_rbac_resources,
},
constants::RESTART_CONTROLLER_ENABLED_LABEL,
k8s_openapi::{
DeepMerge,
api::{
Expand Down Expand Up @@ -486,6 +487,9 @@ pub async fn reconcile_zk(
rolegroup: rolegroup.clone(),
})?;

// Note: The StatefulSet needs to be applied after all ConfigMaps and Secrets it mounts
// to prevent unnecessary Pod restarts.
// See https://github.com/stackabletech/commons-operator/issues/111 for details.
ss_cond_builder.add(
cluster_resources
.add(client, rg_statefulset)
Expand Down Expand Up @@ -1019,10 +1023,8 @@ fn build_server_rolegroup_statefulset(
&rolegroup_ref.role,
&rolegroup_ref.role_group,
))
// The initial restart muddles up the integration tests. This can be re-enabled as soon
// as https://github.com/stackabletech/commons-operator/issues/111 is implemented.
// .with_label("restarter.stackable.tech/enabled", "true")
.context(ObjectMetaSnafu)?
.with_label(RESTART_CONTROLLER_ENABLED_LABEL.to_owned())
.build();

let statefulset_match_labels =
Expand Down
1 change: 1 addition & 0 deletions tests/templates/kuttl/smoke/10-assert.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: test-zk-server-primary
generation: 1 # There should be no unneeded Pod restarts
spec:
template:
spec:
Expand Down