chore: Merge branch 'main' into fix/stackable-versioned-kubernetes-kind

crates/stackable-versioned-macros/fixtures/inputs/k8s/crate_overrides.rs

@@ -0,0 +1,26 @@
+#[versioned(
+    version(name = "v1alpha1"),
+    version(name = "v1beta1"),
+    version(name = "v1"),
+    k8s(
+        group = "foo.example.org",
+        singular = "foo",
+        plural = "foos",
+        namespaced,
+        crates(
+            kube_core = ::kube::core
+        )
+    )
+)]
+// ---
+#[derive(
+    Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
+)]
+pub struct FooSpec {
+    #[versioned(
+        added(since = "v1beta1"),
+        changed(since = "v1", from_name = "bah", from_type = "u16")
+    )]
+    bar: usize,
+    baz: bool,
+}

crates/stackable-versioned-macros/src/attrs/k8s.rs

@@ -1,6 +1,4 @@
 use darling::{util::Flag, FromMeta};
-use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
 use syn::Path;
 
 /// This struct contains supported Kubernetes arguments.
@@ -65,29 +63,3 @@ pub(crate) struct KubernetesCrateArguments {
     pub(crate) serde: Option<Path>,
     pub(crate) serde_json: Option<Path>,
 }
-
-impl ToTokens for KubernetesCrateArguments {
-    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
-        let mut crate_overrides = TokenStream::new();
-
-        if let Some(path) = &self.k8s_openapi {
-            crate_overrides.extend(quote! { k8s_openapi = #path, });
-        }
-        if let Some(path) = &self.kube_core {
-            crate_overrides.extend(quote! { kube_core = #path, });
-        }
-        if let Some(path) = &self.schemars {
-            crate_overrides.extend(quote! { schemars = #path, });
-        }
-        if let Some(path) = &self.serde {
-            crate_overrides.extend(quote! { serde = #path, });
-        }
-        if let Some(path) = &self.serde_json {
-            crate_overrides.extend(quote! { serde_json = #path, });
-        }
-
-        if !crate_overrides.is_empty() {
-            tokens.extend(quote! { , crates(#crate_overrides) });
-        }
-    }
-}