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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@ All notable changes to this project will be documented in this file.

### Changed

- Bump stackable-operator to 0.106.2, and strum to 0.28 ([#794]).
- Bump stackable-operator to 0.108.0, and strum to 0.28 ([#794], [#801]).
- Gracefully shutdown all concurrent tasks by forwarding the SIGTERM signal ([#788]).
- Bump testing-tools to `0.3.0-stackable0.0.0-dev` ([#780]).
- Increase default CPU request/limit to 300m/1200m for the router role ([#786]).

### Fixed

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

### Removed

- Remove Druid 33.0.0 ([#786]).
Expand All @@ -31,6 +35,7 @@ All notable changes to this project will be documented in this file.
[#788]: https://github.com/stackabletech/druid-operator/pull/788
[#790]: https://github.com/stackabletech/druid-operator/pull/790
[#794]: https://github.com/stackabletech/druid-operator/pull/794
[#801]: https://github.com/stackabletech/druid-operator/pull/801

## [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.

55 changes: 27 additions & 28 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/druid-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 = ["crds", "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.

3 changes: 3 additions & 0 deletions deploy/helm/druid-operator/templates/roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ rules:
{{- if .Values.maintenance.customResourceDefinitions.maintain }}
- create
- patch
# Required for startup condition
- list
- watch
{{- end }}
- apiGroups:
- listeners.stackable.tech
Expand Down
11 changes: 4 additions & 7 deletions rust/operator-binary/src/crd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1093,10 +1093,13 @@ pub struct DatabaseConnectionSpec {
pub credentials_secret: Option<String>,
}

#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Display, EnumString)]
#[derive(
Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Display, EnumString,
)]
pub enum DbType {
#[serde(rename = "derby")]
#[strum(serialize = "derby")]
#[default]
Derby,

#[serde(rename = "mysql")]
Expand All @@ -1108,12 +1111,6 @@ pub enum DbType {
Postgresql,
}

impl Default for DbType {
fn default() -> Self {
Self::Derby
}
}

#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Eq, Serialize, Display)]
#[serde(rename_all = "camelCase")]
pub enum DeepStorageSpec {
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ mod tests {
oidc: oidc::v1alpha1::ClientAuthenticationOptions {
client_credentials_secret_ref: "".to_string(),
extra_scopes: vec![],
product_specific_fields: ()
product_specific_fields: (),
}
}]
})
Expand Down
11 changes: 8 additions & 3 deletions rust/operator-binary/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use stackable_operator::{
core::v1::{ConfigMap, Service},
},
kube::{
ResourceExt,
CustomResourceExt, ResourceExt,
core::DeserializeGuard,
runtime::{
Controller,
Expand All @@ -29,7 +29,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 @@ -187,7 +187,12 @@ async fn main() -> anyhow::Result<()> {
)
.map(anyhow::Ok);

futures::try_join!(druid_controller, eos_checker, webhook_server)?;
let delayed_druid_controller = async {
signal::crd_established(&client, v1alpha1::DruidCluster::crd_name(), None).await?;
druid_controller.await
};

futures::try_join!(delayed_druid_controller, eos_checker, webhook_server)?;
}
}

Expand Down