merge main and refer to op-rs 0.114.0

Author: adwk67

CHANGELOG.md

@@ -8,8 +8,10 @@ All notable changes to this project will be documented in this file.
 
 - Internal operator refactoring: introduce a build() step in the reconciler that
   assembles all relevant Kubernetes resources before anything is applied ([#985]).
+- Bump stackable-operator to 0.114.0 ([#994]).
 
 [#985]: https://github.com/stackabletech/kafka-operator/pull/985
+[#994]: https://github.com/stackabletech/kafka-operator/pull/994
 
 ## [26.7.0] - 2026-07-21
 

Cargo.lock

@@ -10,7 +10,7 @@ edition = "2024"
 repository = "https://github.com/stackabletech/kafka-operator"
 
 [workspace.dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.113.3", features = ["crds", "webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.114.0", features = ["crds", "webhook"] }
 
 anyhow = "1.0.103"
 built = { version = "0.8", features = ["chrono", "git2"] }
@@ -30,4 +30,4 @@ tracing = "0.1"
 
 [patch."https://github.com/stackabletech/operator-rs.git"]
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

Cargo.nix

@@ -438,7 +438,7 @@ impl Resource for ValidatedCluster {
     }
 }
 
-/// The validated, merged per-role-group product config.
+/// The validated, merged per-role-group config.
 #[derive(Clone, Debug, PartialEq)]
 pub struct ValidatedKafkaConfig {
     pub config: AnyConfig,

Cargo.toml

@@ -156,6 +156,7 @@ pub fn build(cluster: &ValidatedCluster) -> Result<KubernetesResources, Error> {
 #[cfg(test)]
 mod tests {
     use std::collections::BTreeMap;
+
     use stackable_operator::kube::Resource;
 
     use super::build;

crate-hashes.json

@@ -37,8 +37,8 @@ pub enum ConfigFileName {
     Log4j2,
 }
 
-/// The product config-file name for a role group, derived from its role
-/// (`broker.properties` for brokers, `controller.properties` for controllers).
+/// The config file name for a role group, derived from its role (`broker.properties` for brokers,
+/// `controller.properties` for controllers).
 pub fn config_file_name(config: &AnyConfig) -> ConfigFileName {
     match config {
         AnyConfig::Broker(_) => ConfigFileName::BrokerProperties,

rust/operator-binary/src/controller.rs

@@ -167,8 +167,8 @@ pub enum AnyConfigOverrides {
 }
 
 impl AnyConfigOverrides {
-    /// The merged product config-file overrides (`broker.properties` for brokers,
-    /// `controller.properties` for controllers).
+    /// The merged config file overrides (`broker.properties` for brokers, `controller.properties`
+    /// for controllers).
     pub fn config_file_overrides(&self) -> &KeyValueConfigOverrides {
         match self {
             AnyConfigOverrides::Broker(o) => &o.broker_properties,

rust/operator-binary/src/controller/build/mod.rs

@@ -75,7 +75,6 @@ async fn main() -> anyhow::Result<()> {
                     watch_namespace,
                     maintenance,
                     common,
-                    ..
                 },
             ..
         }) => {