chore: Fix tests after merge

Author: NickLarsenNZ

kube-core/src/schema/transform_properties.rs

@@ -433,13 +433,13 @@ pub(crate) fn hoist_properties_for_any_of_subschemas(kube_schema: &mut SchemaObj
                     .next()
                     .expect("asserted that one and only one property exists")
                 {
-                    assert!(
-                        // While possible, it is unexpected if the subschema metadata is already set for the property
-                        subschema.metadata.is_none(),
-                        "subschema metadata for property should be empty"
-                    );
-                    // Move the variant description down to the properties (before they get hoisted)
-                    subschema.metadata = metadata
+                    if let Some(Metadata {
+                        description: Some(_d),
+                        ..
+                    }) = metadata.as_deref()
+                    {
+                        subschema.metadata = metadata
+                    }
                 };
             }
 

kube-derive/tests/crd_complex_enum_tests.rs

@@ -28,7 +28,7 @@ pub enum NormalEnumWithoutDescriptions {
     D,
 }
 
-/// A complex enum with unit and struct variants
+/// A complex enum with tuple and struct variants
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
 enum ComplexEnum {
     /// Override documentation on the Normal variant
@@ -484,11 +484,21 @@ fn complex_enum() {
                                     },
                                     "hard": {
                                       "type": "string"
+                                    },
+                                    "without_description": {
+                                      "enum": [
+                                        "A",
+                                        "B",
+                                        "C",
+                                        "D"
+                                      ],
+                                      "type": "string"
                                     }
                                   },
                                   "required": [
                                     "core",
-                                    "hard"
+                                    "hard",
+                                    "without_description"
                                   ],
                                   "type": "object"
                                 },
@@ -593,11 +603,21 @@ fn optional_complex_enum() {
                                     },
                                     "hard": {
                                       "type": "string"
+                                    },
+                                    "without_description": {
+                                      "enum": [
+                                        "A",
+                                        "B",
+                                        "C",
+                                        "D"
+                                      ],
+                                      "type": "string"
                                     }
                                   },
                                   "required": [
                                     "core",
-                                    "hard"
+                                    "hard",
+                                    "without_description"
                                   ],
                                   "type": "object"
                                 },