chore: Merge branch 'main' into chore/deprecate-initialize-logging

Author: Techassi

Cargo.lock

@@ -33,7 +33,7 @@ itertools = "0.14.0"
 json-patch = "4.0.0"
 k8s-openapi = { version = "0.24.0", default-features = false, features = ["schemars", "v1_32"] }
 # 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
-kube = { version = "0.99.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] }
+kube = { version = "0.99.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
 opentelemetry = "0.23.0"
 opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] }
 opentelemetry-appender-tracing = "0.4.0"

Cargo.toml

@@ -4,11 +4,26 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- Add Deployments to `ClusterResource`s ([#992]).
+
 ### Changed
 
-- Deprecate `stackable_operator::logging::initialize_logging()`. It's recommended to use `stackable-telemetry` instead ([#950]).
+- Deprecate `stackable_operator::logging::initialize_logging()`. It's recommended to use `stackable-telemetry` instead ([#950], [#989]).
 
 [#950]: https://github.com/stackabletech/operator-rs/pull/950
+[#989]: https://github.com/stackabletech/operator-rs/pull/989
+[#992]: https://github.com/stackabletech/operator-rs/pull/992
+
+## [0.87.5] - 2025-03-19
+
+### Fixed
+
+- Enable the `kube/ring` feature to use ring as the crypto provider for `rustls`. This will
+  otherwise cause runtime errors which result in panics ([#988]).
+
+[#988]: https://github.com/stackabletech/operator-rs/pull/988
 
 ## [0.87.4] - 2025-03-17
 

crates/stackable-operator/CHANGELOG.md

@@ -1,7 +1,7 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.87.4"
+version = "0.87.5"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

crates/stackable-operator/Cargo.toml

@@ -7,7 +7,9 @@ use std::{
 
 use k8s_openapi::{
     api::{
-        apps::v1::{DaemonSet, DaemonSetSpec, StatefulSet, StatefulSetSpec},
+        apps::v1::{
+            DaemonSet, DaemonSetSpec, Deployment, DeploymentSpec, StatefulSet, StatefulSetSpec,
+        },
         batch::v1::Job,
         core::v1::{
             ConfigMap, ObjectReference, PodSpec, PodTemplateSpec, Secret, Service, ServiceAccount,
@@ -279,6 +281,29 @@ impl ClusterResource for DaemonSet {
     }
 }
 
+impl ClusterResource for Deployment {
+    fn maybe_mutate(self, strategy: &ClusterResourceApplyStrategy) -> Self {
+        match strategy {
+            ClusterResourceApplyStrategy::ClusterStopped => Deployment {
+                spec: Some(DeploymentSpec {
+                    replicas: Some(0),
+                    ..self.spec.unwrap_or_default()
+                }),
+                ..self
+            },
+            ClusterResourceApplyStrategy::Default
+            | ClusterResourceApplyStrategy::ReconciliationPaused
+            | ClusterResourceApplyStrategy::NoApply => self,
+        }
+    }
+
+    fn pod_spec(&self) -> Option<&PodSpec> {
+        self.spec
+            .as_ref()
+            .and_then(|spec| spec.template.spec.as_ref())
+    }
+}
+
 /// A structure containing the cluster resources.
 ///
 /// Cluster resources can be added and orphaned resources are deleted. A cluster resource becomes

crates/stackable-operator/src/cluster_resources.rs

@@ -0,0 +1,9 @@
+#[versioned(version(name = "v1alpha1"), version(name = "v1"))]
+// ---
+pub struct Foo<T = String>
+where
+    T: Default,
+{
+    bar: T,
+    baz: u8,
+}

crates/stackable-versioned-macros/fixtures/inputs/default/generics_defaults.rs

@@ -104,7 +104,9 @@ pub(crate) struct Enum {
 impl Enum {
     /// Generates code for the enum definition.
     pub(crate) fn generate_definition(&self, version: &VersionDefinition) -> TokenStream {
-        let (_, type_generics, where_clause) = self.generics.split_for_impl();
+        let where_clause = self.generics.where_clause.as_ref();
+        let type_generics = &self.generics;
+
         let original_attributes = &self.common.original_attributes;
         let ident = &self.common.idents.original;
         let version_docs = &version.docs;

crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__default_snapshots@generics_defaults.rs.snap

@@ -135,7 +135,9 @@ pub(crate) struct Struct {
 impl Struct {
     /// Generates code for the struct definition.
     pub(crate) fn generate_definition(&self, version: &VersionDefinition) -> TokenStream {
-        let (_, type_generics, where_clause) = self.generics.split_for_impl();
+        let where_clause = self.generics.where_clause.as_ref();
+        let type_generics = &self.generics;
+
         let original_attributes = &self.common.original_attributes;
         let ident = &self.common.idents.original;
         let version_docs = &version.docs;

crates/stackable-versioned-macros/src/codegen/container/enum.rs

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Correctly emit generic type parameter defaults in enum/struct definition blocks ([#991]).
+
+[#991]: https://github.com/stackabletech/operator-rs/pull/991
+
 ## [0.7.0] - 2025-03-17
 
 ### Changed