Merge pull request #753 from kubernetes-sigs/fix-generation-of-sets

🐛 Fix the generation of listType=set

Author: k8s-ci-robot

pkg/crd/markers/topology.go

@@ -114,6 +114,13 @@ func (l ListType) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
 	if l != "map" && l != "atomic" && l != "set" {
 		return fmt.Errorf(`ListType must be either "map", "set" or "atomic"`)
 	}
+
+	if l == "set" {
+		if itemSchema := schema.Items.Schema; itemSchema != nil {
+			v := "atomic"
+			itemSchema.XMapType = &v
+		}
+	}
 	p := string(l)
 	schema.XListType = &p
 	return nil

pkg/crd/testdata/cronjob_types.go

@@ -233,6 +233,11 @@ type CronJobSpec struct {
 
 	// Checks that arrays work when the type contains a composite literal
 	ArrayUsingCompositeLiteral [len(struct{ X [3]int }{}.X)]string `json:"arrayUsingCompositeLiteral,omitempty"`
+
+	// Tests the generation of a set list type
+	// +listType=set
+	// +optional
+	Set []string `json:"set,omitempty"`
 }
 
 type ContainsNestedMap struct {

pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml

@@ -3,9 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: (devel)
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/controller-tools
     cert-manager.io/inject-ca-from-secret: cert-manager/cert-manager-webhook-ca
+    controller-gen.kubebuilder.io/version: (devel)
   creationTimestamp: null
   name: cronjobs.testdata.kubebuilder.io
 spec:
@@ -7330,6 +7330,13 @@ spec:
                 type: string
               schemaless:
                 description: This tests that the schemaless marker works
+              set:
+                description: Tests the generation of a set list type
+                items:
+                  type: string
+                  x-kubernetes-map-type: atomic
+                type: array
+                x-kubernetes-list-type: set
               startingDeadlineSeconds:
                 description: Optional deadline in seconds for starting the job if
                   it misses scheduled time for any reason.  Missed jobs executions