Make subnet spec id field required for SSA to work with CC

vincepri · Sep 22, 2022 · 1bc6ce8 · 1bc6ce8
1 parent 14109e7
commit 1bc6ce8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/api/v1beta2/network_types.go b/api/v1beta2/network_types.go
@@ -242,7 +242,7 @@ func (v *VPCSpec) IsIPv6Enabled() bool {
 // SubnetSpec configures an AWS Subnet.
 type SubnetSpec struct {
 	// ID defines a unique identifier to reference this resource.
-	ID string `json:"id,omitempty"`
+	ID string `json:"id"`
 
 	// CidrBlock is the CIDR block to be used when the provider creates a managed VPC.
 	CidrBlock string `json:"cidrBlock,omitempty"`
@@ -284,6 +284,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
@@ -446,8 +446,13 @@ spec:
                           description: Tags is a collection of tags describing the
                             resource.
                           type: object
+                      required:
+                      - id
                       type: object
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - id
+                    x-kubernetes-list-type: map
                   vpc:
                     description: VPC configuration.
                     properties:
@@ -1719,8 +1724,13 @@ spec:
                           description: Tags is a collection of tags describing the
                             resource.
                           type: object
+                      required:
+                      - id
                       type: object
                     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
@@ -1153,8 +1153,13 @@ spec:
                           description: Tags is a collection of tags describing the
                             resource.
                           type: object
+                      required:
+                      - id
                       type: object
                     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
@@ -757,8 +757,13 @@ spec:
                                   description: Tags is a collection of tags describing
                                     the resource.
                                   type: object
+                              required:
+                              - id
                               type: object
                             type: array
+                            x-kubernetes-list-map-keys:
+                            - id
+                            x-kubernetes-list-type: map
                           vpc:
                             description: VPC configuration.
                             properties: