Merge pull request #697 from chrischdi/pr-fix-XMapTypeFlatten

🐛 Fix crd flattening for structType marker to not create duplicate entries for XMapType
kubernetes-sigs · Jun 29, 2022 · 1878064 · 1878064
2 parents 6bfa604 + 1bb8449
commit 1878064
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/crd/flatten.go b/pkg/crd/flatten.go
@@ -145,6 +145,8 @@ func flattenAllOfInto(dst *apiext.JSONSchemaProps, src apiext.JSONSchemaProps, e
 			flattenAllOfInto(dstProps.Schema, *srcProps.Schema, errRec)
 		case "XPreserveUnknownFields":
 			dstField.Set(srcField)
+		case "XMapType":
+			dstField.Set(srcField)
 		// NB(directxman12): no need to explicitly handle nullable -- false is considered to be the zero value
 		// TODO(directxman12): src isn't necessarily the field value -- it's just the most recent allOf entry
 		default:

diff --git a/pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml b/pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml
@@ -7278,9 +7278,6 @@ spec:
                 description: Checks that multiply-nested maps work
                 type: object
               nestedStructWithSeveralFields:
-                allOf:
-                - x-kubernetes-map-type: atomic
-                - x-kubernetes-map-type: atomic
                 description: A struct that can only be entirely replaced via a nested
                   type.
                 properties:
@@ -7292,6 +7289,7 @@ spec:
                 - bar
                 - foo
                 type: object
+                x-kubernetes-map-type: atomic
               nestedassociativeList:
                 description: This tests that associative lists work via a nested type.
                 items: