Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ All notable changes to this project will be documented in this file.

### Changed

- Bump stackable-operator to 0.106.2, snafu to 0.9, strum to 0.28 ([#1011]).
- Bump stackable-operator to 0.108.0, snafu to 0.9, strum to 0.28 ([#1011], [#1013]).
- Gracefully shutdown all concurrent tasks by forwarding the SIGTERM signal ([#1004]).

### Fixed

- Fix "404 page not found" error for the initial object list ([#1013]).

### Removed

- Remove support for ZooKeeper 3.9.3 ([#1001]).
Expand All @@ -28,6 +32,7 @@ All notable changes to this project will be documented in this file.
[#1004]: https://github.com/stackabletech/zookeeper-operator/pull/1004
[#1007]: https://github.com/stackabletech/zookeeper-operator/pull/1007
[#1011]: https://github.com/stackabletech/zookeeper-operator/pull/1011
[#1013]: https://github.com/stackabletech/zookeeper-operator/pull/1013

## [25.11.0] - 2025-11-07

Expand Down
22 changes: 11 additions & 11 deletions Cargo.lock

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

37 changes: 18 additions & 19 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.106.2", features = ["telemetry", "versioned", "webhook"] }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.108.0", features = ["webhook"] }

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

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

5 changes: 4 additions & 1 deletion deploy/helm/zookeeper-operator/templates/roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ rules:
{{- if .Values.maintenance.customResourceDefinitions.maintain }}
- create
- patch
{{- end }}
- get
# Required for startup condition
- list
- watch
{{- end }}
- apiGroups:
- authentication.stackable.tech
resources:
Expand Down
17 changes: 14 additions & 3 deletions rust/operator-binary/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use stackable_operator::{
core::v1::{ConfigMap, Service},
},
kube::{
Resource,
CustomResourceExt as _, Resource,
core::DeserializeGuard,
runtime::{
Controller,
Expand All @@ -31,7 +31,7 @@ use stackable_operator::{
logging::controller::report_controller_reconciled,
shared::yaml::SerializeOptions,
telemetry::Tracing,
utils::signal::SignalWatcher,
utils::signal::{self, SignalWatcher},
};

use crate::{
Expand Down Expand Up @@ -245,8 +245,19 @@ async fn main() -> anyhow::Result<()> {
)
.map(anyhow::Ok);

let delayed_zk_controller = async {
signal::crd_established(&client, v1alpha1::ZookeeperCluster::crd_name(), None)
.await?;
zk_controller.await
};

// kube-runtime's Controller will tokio::spawn each reconciliation, so this only concerns the internal watch machinery
futures::try_join!(zk_controller, znode_controller, eos_checker, webhook_server)?;
futures::try_join!(
delayed_zk_controller,
znode_controller,
Comment thread
NickLarsenNZ marked this conversation as resolved.
Outdated
eos_checker,
webhook_server
)?;
}
}

Expand Down