Merge remote-tracking branch 'origin/main' into chore/bumps-2026-06-17

Author: sbernauer

Cargo.lock

@@ -40,6 +40,7 @@ insta = { version = "1.48.0", features = ["glob"] }
 hyper = { version = "1.4.1", features = ["full"] }
 hyper-util = "0.1.8"
 itertools = "0.15.0"
+java-properties = "2.0"
 json-patch = "4.0.0"
 k8s-openapi = { version = "0.28.0", default-features = false, features = ["schemars", "v1_36"] }
 # We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
@@ -94,9 +95,11 @@ tracing-opentelemetry = "0.33.0"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 trybuild = "1.0.99"
 url = { version = "2.5.2", features = ["serde"] }
+uuid = "1.23"
 winnow = "1.0.3"
 x509-cert = { version = "0.2.5", features = ["builder"] }
-zeroize = "1.9.0"
+xml = "1.3"
+zeroize = "1.9"
 
 [workspace.lints.clippy]
 # Enable all pedantic lints (with lower priority so individual lints can override)

Cargo.toml

@@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.112.0] - 2026-06-22
+
 ### Added
 
 - Add `Client::{get_feature_gates,get_enabled_feature_gates,get_disabled_feature_gates}` associated
   functions to retrieve all, enabled, or disabled feature gates from the Kubernetes apiserver ([#1207], [#1208]).
+- Add a new `v2` module that provides more type-safe variants of the existing functions ([#1225]).
+- Add documentation for the `roleGroups` field, which now shows up as a description in the generated CRDs ([#1227]).
 
 ### Changed
 
@@ -18,6 +22,8 @@ All notable changes to this project will be documented in this file.
 [#1207]: https://github.com/stackabletech/operator-rs/pull/1207
 [#1208]: https://github.com/stackabletech/operator-rs/pull/1208
 [#1224]: https://github.com/stackabletech/operator-rs/pull/1224
+[#1225]: https://github.com/stackabletech/operator-rs/pull/1225
+[#1227]: https://github.com/stackabletech/operator-rs/pull/1227
 
 ## [0.111.1] - 2026-04-28
 

crates/stackable-operator/CHANGELOG.md

@@ -1,19 +1,20 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.111.1"
+version = "0.112.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
 
 [features]
 default = ["crds"]
-full = ["client-feature-gates", "crds", "certs", "time", "webhook", "kube-ws"]
+full = ["client-feature-gates", "crds", "certs", "test-support", "time", "webhook", "kube-ws"]
 
 client-feature-gates = ["dep:winnow"]
 crds = ["dep:stackable-versioned"]
 certs = ["dep:stackable-certs"]
+test-support = []
 time = ["stackable-shared/time"]
 webhook = ["dep:stackable-webhook"]
 kube-ws = ["kube/ws"]
@@ -36,8 +37,9 @@ educe.workspace = true
 futures.workspace = true
 http.workspace = true
 indexmap.workspace = true
+java-properties.workspace = true
 jiff.workspace = true
-json-patch.workspace = true
+json-patch = { workspace = true, features = ["schemars"] }
 k8s-openapi.workspace = true
 kube.workspace = true
 product-config.workspace = true
@@ -48,14 +50,17 @@ semver.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
 serde.workspace = true
+sha2.workspace = true
 snafu.workspace = true
 strum.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 tracing-appender.workspace = true
 tracing-subscriber.workspace = true
 url.workspace = true
+uuid.workspace = true
 winnow = { workspace = true, optional = true }
+xml.workspace = true
 
 [dev-dependencies]
 indoc.workspace = true

crates/stackable-operator/Cargo.toml

@@ -1751,6 +1751,21 @@ spec:
                           nullable: true
                           type: integer
                       type: object
+                    description: |-
+                      The set of role groups for this role, keyed by their name.
+
+                      A role group is a subset of the replicas of a role that share the same configuration,
+                      allowing finer-grained control than the role level. This is useful to e.g. schedule groups
+                      onto different classes of nodes or into different regions, or to run them with different
+                      settings. Configuration set on a role group is merged on top of the role-level `config`,
+                      with the more specific role group values taking precedence.
+
+                      Every role needs at least one role group. A role with a single role group conventionally
+                      names it `default`.
+
+                      Read the
+                      [roles and role groups concept documentation](https://docs.stackable.tech/home/nightly/concepts/roles-and-role-groups)
+                      for more details.
                     type: object
                 required:
                 - roleGroups

crates/stackable-operator/crds/DummyCluster.yaml

@@ -33,8 +33,8 @@ spec:
 
                   Upstream issues:
 
-                  - https://github.com/kubernetes/kubernetes/issues/105533
-                  - https://github.com/Arnavion/k8s-openapi/issues/136
+                  - <https://github.com/kubernetes/kubernetes/issues/105533>
+                  - <https://github.com/Arnavion/k8s-openapi/issues/136>
                 format: uint16
                 maximum: 65535.0
                 minimum: 0.0

crates/stackable-operator/crds/Scaler.yaml

@@ -31,8 +31,8 @@ pub mod versioned {
         ///
         /// Upstream issues:
         ///
-        /// - https://github.com/kubernetes/kubernetes/issues/105533
-        /// - https://github.com/Arnavion/k8s-openapi/issues/136
+        /// - <https://github.com/kubernetes/kubernetes/issues/105533>
+        /// - <https://github.com/Arnavion/k8s-openapi/issues/136>
         pub replicas: u16,
     }
 }

crates/stackable-operator/src/crd/scaler/mod.rs

@@ -33,6 +33,7 @@ pub mod role_utils;
 pub mod status;
 pub mod test_utils;
 pub mod utils;
+pub mod v2;
 pub mod validation;
 
 // External re-exports

crates/stackable-operator/src/lib.rs

@@ -327,6 +327,20 @@ pub struct Role<
     #[serde(default)]
     pub role_config: RoleConfig,
 
+    /// The set of role groups for this role, keyed by their name.
+    ///
+    /// A role group is a subset of the replicas of a role that share the same configuration,
+    /// allowing finer-grained control than the role level. This is useful to e.g. schedule groups
+    /// onto different classes of nodes or into different regions, or to run them with different
+    /// settings. Configuration set on a role group is merged on top of the role-level `config`,
+    /// with the more specific role group values taking precedence.
+    ///
+    /// Every role needs at least one role group. A role with a single role group conventionally
+    /// names it `default`.
+    ///
+    /// Read the
+    /// [roles and role groups concept documentation](DOCS_BASE_URL_PLACEHOLDER/concepts/roles-and-role-groups)
+    /// for more details.
     pub role_groups: HashMap<String, RoleGroup<Config, CommonConfig, ConfigOverrides>>,
 }
 

crates/stackable-operator/src/role_utils.rs

@@ -0,0 +1,5 @@
+pub mod meta;
+pub mod pdb;
+pub mod pod;
+pub mod service;
+pub mod statefulset;