fix: adjust metadata hoisting

Author: NickLarsenNZ

kube-core/src/schema/transform_any_of.rs

@@ -155,8 +155,15 @@ pub(crate) fn hoist_any_of_subschema_with_a_nullable_variant(kube_schema: &mut S
         panic!("oneOf is set when there is already an anyOf: {one_of:#?}");
     }
 
+    let mut to_hoist = to_hoist.clone();
+    let kube_schema_metadata = kube_schema.metadata.take();
+
+    if to_hoist.metadata.is_none() {
+        to_hoist.metadata = kube_schema_metadata;
+    }
+
     // Replace the schema with the non-null subschema
-    *kube_schema = to_hoist.clone();
+    *kube_schema = to_hoist;
 
     // Set the schema to nullable (as we know we matched the null variant earlier)
     // TODO (@NickLarsenNZ): Do we need to insert `nullable` into `other` too?

kube-core/src/schema/transform_properties.rs

@@ -371,7 +371,6 @@ pub(crate) fn hoist_properties_for_any_of_subschemas(kube_schema: &mut SchemaObj
         (Some(_), Some(_)) => panic!("oneOf and anyOf are mutually exclusive"),
     };
 
-
     if subschemas.is_empty() {
         return;
     }
@@ -419,23 +418,11 @@ pub(crate) fn hoist_properties_for_any_of_subschemas(kube_schema: &mut SchemaObj
             // Kubernetes doesn't allow variants to set additionalProperties
             object.additional_properties.take();
 
-            // For a tagged enum, we need to preserve the variant description
+            // For a tagged enum (oneOf), we need to preserve the variant description
             if preserve_description {
-                assert_eq!(
-                    object.properties.len(),
-                    1,
-                    "Expecting only a single property defined for the tagged enum variant schema"
-                );
-
-                if let Schema::Object(subschema) = object
-                    .properties
-                    .values_mut()
-                    .next()
-                    .expect("asserted that one and only one property exists")
-                {
+                if let Some(Schema::Object(subschema)) = object.properties.values_mut().next() {
                     if let Some(Metadata {
-                        description: Some(_d),
-                        ..
+                        description: Some(_), ..
                     }) = metadata.as_deref()
                     {
                         subschema.metadata = metadata