🐛 Make topology markers also valid for type definitions

[k8s-infra-cherrypick-robot]

This is an automated cherry-pick of #692

/assign alvaroaleman

[alvaroaleman]

/retitle 🐛 Make topology markers also valid for type definitions
/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, k8s-infra-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [alvaroaleman]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[robbie-demuth]

I took a stab at using the new release with these changes today and am running into an issue with the way my CRD is now being generated. My CRD has fields of type []corev1.EnvVar. Previously, the schema for said fields was generated as follows:

env:
  items:
    properties:
      name:
        type: string
      value:
        type: string
      valueFrom:
        properties:
          configMapKeyRef:
            properties:
              key:
                type: string
              name:
                type: string
              optional:
                type: boolean
            required:
            - key
            type: object
          fieldRef:
            properties:
              apiVersion:
                type: string
              fieldPath:
                type: string
            required:
            - fieldPath
            type: object
          resourceFieldRef:
            properties:
              containerName:
                type: string
              divisor:
                anyOf:
                - type: integer
                - type: string
                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                x-kubernetes-int-or-string: true
              resource:
                type: string
            required:
            - resource
            type: object
          secretKeyRef:
            properties:
              key:
                type: string
              name:
                type: string
              optional:
                type: boolean
            required:
            - key
            type: object
        type: object
    required:
    - name
    type: object
  type: array
  x-kubernetes-list-map-keys:
  - name
  x-kubernetes-list-type: map

Now, however, it's generated as

env:
  items:
    properties:
      name:
        type: string
      value:
        type: string
      valueFrom:
        properties:
          configMapKeyRef:
            allOf:
            - x-kubernetes-map-type: atomic
            - x-kubernetes-map-type: atomic
            properties:
              key:
                type: string
              name:
                type: string
              optional:
                type: boolean
            required:
            - key
            type: object
          fieldRef:
            properties:
              apiVersion:
                type: string
              fieldPath:
                type: string
            required:
            - fieldPath
            type: object
            x-kubernetes-map-type: atomic
          resourceFieldRef:
            properties:
              containerName:
                type: string
              divisor:
                anyOf:
                - type: integer
                - type: string
                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                x-kubernetes-int-or-string: true
              resource:
                type: string
            required:
            - resource
            type: object
            x-kubernetes-map-type: atomic
          secretKeyRef:
            allOf:
            - x-kubernetes-map-type: atomic
            - x-kubernetes-map-type: atomic
            properties:
              key:
                type: string
              name:
                type: string
              optional:
                type: boolean
            required:
            - key
            type: object
        type: object
    required:
    - name
    type: object
  type: array
  x-kubernetes-list-map-keys:
  - name
  x-kubernetes-list-type: map

Note the addition of

allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic

to configMapKeyRef and secretKeyRef. When trying to create the new CRD in a cluster, I get errors like the following:

CustomResourceDefinition.apiextensions.k8s.io \"<CRD>\" is invalid: [spec.versions[0].schema.openAPIV3Schema.properties[spec].properties[env].items.properties[valueFrom].properties[configMapKeyRef].allOf[0].type: Required value: must be object if x-kubernetes-map-type is specified

It looks like the error is coming from here, but I'm not sure what it means. Any ideas? Thanks!

[FillZpp]

Note the addition of

allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic

Oh, it's so bad. That's what I worried when I commented #692 (comment) . It reminded me of another bug #688 , which generated duplicate x-kubernetes-preserve-unknown-fields in allOf.

[chrischdi]

@robbie-demuth could you please also share the go code which this is generated from? (at least the struct parts and markers for secretKeyRef or configMapKeyRef)?

Edit: nevermind, I see that it is also present in the test data. I'll take a look at it 👍 sorry for the circumstances though 😞