Merge pull request #698 from chrischdi/pr-fix-XMapTypeFlatten-cp-0.9

k8s-ci-robot · web-flow · commit 0c985d90f528 · 2022-06-29T06:46:06.000-07:00
🐛 Fix crd flattening for structType marker to not create duplicate entries for XMapType
diff --git a/pkg/crd/flatten.go b/pkg/crd/flatten.go
@@ -143,6 +143,8 @@ func flattenAllOfInto(dst *apiext.JSONSchemaProps, src apiext.JSONSchemaProps, e
 				dstProps.Schema = &apiext.JSONSchemaProps{}
 			}
 			flattenAllOfInto(dstProps.Schema, *srcProps.Schema, errRec)
+		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
@@ -7277,9 +7277,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:
@@ -7291,6 +7288,7 @@ spec:
                 - bar
                 - foo
                 type: object
+                x-kubernetes-map-type: atomic
               nestedassociativeList:
                 description: This tests that associative lists work via a nested type.
                 items:

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,8 @@ func flattenAllOfInto(dst *apiext.JSONSchemaProps, src apiext.JSONSchemaProps, e`
`143`	`143`	`dstProps.Schema = &apiext.JSONSchemaProps{}`
`144`	`144`	`}`
`145`	`145`	`flattenAllOfInto(dstProps.Schema, *srcProps.Schema, errRec)`
	`146`	`+ case "XMapType":`
	`147`	`+ dstField.Set(srcField)`
`146`	`148`	`// NB(directxman12): no need to explicitly handle nullable -- false is considered to be the zero value`
`147`	`149`	`// TODO(directxman12): src isn't necessarily the field value -- it's just the most recent allOf entry`
`148`	`150`	`default:`