Merge remote-tracking branch 'origin/main' into feat/support-sans

Author: sbernauer

Cargo.lock

@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for ApiVersion {
     {
         struct ApiVersionVisitor;
 
-        impl<'de> Visitor<'de> for ApiVersionVisitor {
+        impl Visitor<'_> for ApiVersionVisitor {
             type Value = ApiVersion;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/k8s-version/src/api_version/serde.rs

@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for Level {
     {
         struct LevelVisitor;
 
-        impl<'de> Visitor<'de> for LevelVisitor {
+        impl Visitor<'_> for LevelVisitor {
             type Value = Level;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/k8s-version/src/level/serde.rs

@@ -11,7 +11,7 @@ impl<'de> Deserialize<'de> for Version {
     {
         struct VersionVisitor;
 
-        impl<'de> Visitor<'de> for VersionVisitor {
+        impl Visitor<'_> for VersionVisitor {
             type Value = Version;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/k8s-version/src/version/serde.rs

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Removed
+
+- Remove instrumenation from uninteresting funtions ([#1023]).
+
+[#1023]: https://github.com/stackabletech/operator-rs/pull/1023
+
 ## [0.93.1] - 2025-05-20
 
 ### Added
@@ -23,6 +29,7 @@ All notable changes to this project will be documented in this file.
   - Import are now more granular in general.
 - BREAKING: Update to `kube` to `1.0.0` and `k8s-openapi` to `0.25.0`.
   Use k8s `1.33` for compilation ([#1037]).
+- Separate some developer docs from CRD descriptions ([#1040]).
 
 ### Fixed
 
@@ -33,6 +40,7 @@ All notable changes to this project will be documented in this file.
 [#1025]: https://github.com/stackabletech/operator-rs/pull/1025
 [#1029]: https://github.com/stackabletech/operator-rs/pull/1029
 [#1037]: https://github.com/stackabletech/operator-rs/pull/1037
+[#1040]: https://github.com/stackabletech/operator-rs/pull/1040
 
 ## [0.92.0] - 2025-04-14
 

crates/stackable-operator/CHANGELOG.md

@@ -7,7 +7,6 @@ use k8s_openapi::api::core::v1::{
     SecurityContext, VolumeMount,
 };
 use snafu::{ResultExt as _, Snafu};
-use tracing::instrument;
 #[cfg(doc)]
 use {k8s_openapi::api::core::v1::PodSpec, std::collections::BTreeMap};
 
@@ -211,7 +210,6 @@ impl ContainerBuilder {
     ///
     /// Previously, this function unconditionally added [`VolumeMount`]s, which resulted in invalid
     /// [`PodSpec`]s.
-    #[instrument(skip(self))]
     fn add_volume_mount_impl(&mut self, volume_mount: VolumeMount) -> Result<&mut Self> {
         if let Some(existing_volume_mount) = self.volume_mounts.get(&volume_mount.mount_path) {
             if existing_volume_mount != &volume_mount {

crates/stackable-operator/src/builder/pod/container.rs

@@ -10,7 +10,6 @@ use k8s_openapi::{
     apimachinery::pkg::{api::resource::Quantity, apis::meta::v1::ObjectMeta},
 };
 use snafu::{OptionExt, ResultExt, Snafu};
-use tracing::{instrument, warn};
 
 use crate::{
     builder::{
@@ -291,7 +290,6 @@ impl PodBuilder {
     ///
     /// Previously, this function unconditionally added [`Volume`]s, which resulted in invalid
     /// [`PodSpec`]s.
-    #[instrument(skip(self))]
     pub fn add_volume(&mut self, volume: Volume) -> Result<&mut Self> {
         if let Some(existing_volume) = self.volumes.get(&volume.name) {
             if existing_volume != &volume {
@@ -610,19 +608,19 @@ impl PodBuilder {
 
         pod_spec
             .check_resource_requirement(ResourceRequirementsType::Limits, "cpu")
-            .unwrap_or_else(|err| warn!("{}", err));
+            .unwrap_or_else(|err| tracing::warn!("{err}"));
 
         pod_spec
             .check_resource_requirement(ResourceRequirementsType::Limits, "memory")
-            .unwrap_or_else(|err| warn!("{}", err));
+            .unwrap_or_else(|err| tracing::warn!("{err}"));
 
         pod_spec
             .check_limit_to_request_ratio(&ComputeResource::Cpu, LIMIT_REQUEST_RATIO_CPU)
-            .unwrap_or_else(|err| warn!("{}", err));
+            .unwrap_or_else(|err| tracing::warn!("{err}"));
 
         pod_spec
             .check_limit_to_request_ratio(&ComputeResource::Memory, LIMIT_REQUEST_RATIO_MEMORY)
-            .unwrap_or_else(|err| warn!("{}", err));
+            .unwrap_or_else(|err| tracing::warn!("{err}"));
 
         pod_spec
     }

crates/stackable-operator/src/builder/pod/mod.rs

@@ -43,7 +43,6 @@ quote.workspace = true
 [dev-dependencies]
 # Only needed for doc tests / examples
 stackable-versioned = { path = "../stackable-versioned", features = ["k8s"] }
-k8s-openapi.workspace = true
 
 insta.workspace = true
 prettyplease.workspace = true

crates/stackable-versioned-macros/Cargo.toml

@@ -238,15 +238,26 @@ impl CommonItemAttributes {
                 }
             }
 
-            // The convert_with argument only makes sense to use when the
-            // type changed
-            if let Some(convert_func) = change.convert_with.as_ref() {
-                if change.from_type.is_none() {
+            if change.from_type.is_none() {
+                // The upgrade_with argument only makes sense to use when the
+                // type changed
+                if let Some(upgrade_func) = change.upgrade_with.as_ref() {
                     errors.push(
                         Error::custom(
-                            "the `convert_with` argument must be used in combination with `from_type`",
+                            "the `upgrade_with` argument must be used in combination with `from_type`",
                         )
-                        .with_span(&convert_func.span()),
+                        .with_span(&upgrade_func.span()),
+                    );
+                }
+
+                // The downgrade_with argument only makes sense to use when the
+                // type changed
+                if let Some(downgrade_func) = change.downgrade_with.as_ref() {
+                    errors.push(
+                        Error::custom(
+                            "the `downgrade_with` argument must be used in combination with `from_type`",
+                        )
+                        .with_span(&downgrade_func.span()),
                     );
                 }
             }
@@ -315,7 +326,8 @@ impl CommonItemAttributes {
                     .unwrap_or(ty.clone());
 
                 actions.insert(*change.since, ItemStatus::Change {
-                    convert_with: change.convert_with.as_deref().cloned(),
+                    downgrade_with: change.downgrade_with.as_deref().cloned(),
+                    upgrade_with: change.upgrade_with.as_deref().cloned(),
                     from_ident: from_ident.clone(),
                     from_type: from_ty.clone(),
                     to_ident: ident,
@@ -359,7 +371,8 @@ impl CommonItemAttributes {
                     .unwrap_or(ty.clone());
 
                 actions.insert(*change.since, ItemStatus::Change {
-                    convert_with: change.convert_with.as_deref().cloned(),
+                    downgrade_with: change.downgrade_with.as_deref().cloned(),
+                    upgrade_with: change.upgrade_with.as_deref().cloned(),
                     from_ident: from_ident.clone(),
                     from_type: from_ty.clone(),
                     to_ident: ident,
@@ -429,13 +442,15 @@ fn default_default_fn() -> SpannedValue<Path> {
 /// Example usage:
 /// - `changed(since = "...", from_name = "...")`
 /// - `changed(since = "...", from_name = "...", from_type="...")`
-/// - `changed(since = "...", from_name = "...", from_type="...", convert_with = "...")`
+/// - `changed(since = "...", from_name = "...", from_type="...", upgrade_with = "...")`
+/// - `changed(since = "...", from_name = "...", from_type="...", downgrade_with = "...")`
 #[derive(Clone, Debug, FromMeta)]
 pub struct ChangedAttributes {
     pub since: SpannedValue<Version>,
     pub from_name: Option<SpannedValue<String>>,
     pub from_type: Option<SpannedValue<Type>>,
-    pub convert_with: Option<SpannedValue<Path>>,
+    pub upgrade_with: Option<SpannedValue<Path>>,
+    pub downgrade_with: Option<SpannedValue<Path>>,
 }
 
 /// For the deprecated() action

crates/stackable-versioned-macros/src/attrs/item/mod.rs

@@ -22,27 +22,30 @@ use syn::Path;
 ///   times.
 /// - `skip`: Controls skipping parts of the generation.
 #[derive(Clone, Debug, FromMeta)]
-pub(crate) struct KubernetesArguments {
-    pub(crate) group: String,
-    pub(crate) kind: Option<String>,
-    pub(crate) singular: Option<String>,
-    pub(crate) plural: Option<String>,
-    pub(crate) namespaced: Flag,
+pub struct KubernetesArguments {
+    pub group: String,
+    pub kind: Option<String>,
+    pub singular: Option<String>,
+    pub plural: Option<String>,
+    pub namespaced: Flag,
     // root
-    pub(crate) crates: Option<KubernetesCrateArguments>,
-    pub(crate) status: Option<Path>,
+    pub crates: Option<KubernetesCrateArguments>,
+    pub status: Option<Path>,
     // derive
     // schema
     // scale
     // printcolumn
     #[darling(multiple, rename = "shortname")]
-    pub(crate) shortnames: Vec<String>,
+    pub shortnames: Vec<String>,
     // category
     // selectable
     // doc
     // annotation
     // label
-    pub(crate) skip: Option<KubernetesSkipArguments>,
+    pub skip: Option<KubernetesSkipArguments>,
+
+    #[darling(default)]
+    pub options: RawKubernetesOptions,
 }
 
 /// This struct contains supported kubernetes skip arguments.
@@ -52,19 +55,25 @@ pub(crate) struct KubernetesArguments {
 /// - `merged_crd` flag, which skips generating the `crd()` and `merged_crd()` functions are
 ///    generated.
 #[derive(Clone, Debug, FromMeta)]
-pub(crate) struct KubernetesSkipArguments {
+pub struct KubernetesSkipArguments {
     /// Whether the `crd()` and `merged_crd()` generation should be skipped for
     /// this container.
-    pub(crate) merged_crd: Flag,
+    pub merged_crd: Flag,
 }
 
 /// This struct contains crate overrides to be passed to `#[kube]`.
 #[derive(Clone, Debug, FromMeta)]
-pub(crate) struct KubernetesCrateArguments {
-    pub(crate) kube_core: Option<Path>,
-    pub(crate) kube_client: Option<Path>,
-    pub(crate) k8s_openapi: Option<Path>,
-    pub(crate) schemars: Option<Path>,
-    pub(crate) serde: Option<Path>,
-    pub(crate) serde_json: Option<Path>,
+pub struct KubernetesCrateArguments {
+    pub kube_core: Option<Path>,
+    pub kube_client: Option<Path>,
+    pub k8s_openapi: Option<Path>,
+    pub schemars: Option<Path>,
+    pub serde: Option<Path>,
+    pub serde_json: Option<Path>,
+    pub versioned: Option<Path>,
+}
+
+#[derive(Clone, Default, Debug, FromMeta)]
+pub struct RawKubernetesOptions {
+    pub experimental_conversion_tracking: Flag,
 }