Add list markers to SubnetSpec

This is to allow a co-authored slice between CAPI and CAPA in server side apply. Hacks * update type definition for CRD generation purpose * make id field as a required manually
kubernetes-sigs · Jun 16, 2022 · 12218f8 · 12218f8
1 parent 851a814
commit 12218f8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/api/v1beta1/network_types.go b/api/v1beta1/network_types.go
@@ -153,6 +153,9 @@ type NetworkSpec struct {
 
 	// Subnets configuration.
 	// +optional
+	//// +listType=map
+	//// +listMapKey=id
+	//Subnets []SubnetSpec `json:"subnets,omitempty"`
 	Subnets Subnets `json:"subnets,omitempty"`
 
 	// CNI configuration
@@ -248,6 +251,8 @@ func (s *SubnetSpec) String() string {
 }
 
 // Subnets is a slice of Subnet.
+// +listType=map
+// +listMapKey=id
 type Subnets []SubnetSpec
 
 // ToMap returns a map from id to subnet.

diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -2549,7 +2549,12 @@ spec:
                             resource.
                           type: object
                       type: object
+                      required:
+                        - id
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - id
+                    x-kubernetes-list-type: map
                   vpc:
                     description: VPC configuration.
                     properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -1808,7 +1808,12 @@ spec:
                             resource.
                           type: object
                       type: object
+                      required:
+                      - id
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - id
+                    x-kubernetes-list-type: map
                   vpc:
                     description: VPC configuration.
                     properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
@@ -640,7 +640,12 @@ spec:
                                     the resource.
                                   type: object
                               type: object
+                              required:
+                                - id
                             type: array
+                            x-kubernetes-list-map-keys:
+                            - id
+                            x-kubernetes-list-type: map
                           vpc:
                             description: VPC configuration.
                             properties: