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

This reverts commit 1bc6ce8.
kubernetes-sigs · Oct 6, 2023 · 391452a · 391452a
1 parent b36e26e
commit 391452a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 23 deletions.
diff --git a/api/v1beta2/network_types.go b/api/v1beta2/network_types.go
@@ -348,7 +348,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"`
+	ID string `json:"id,omitempty"`
 
 	// CidrBlock is the CIDR block to be used when the provider creates a managed VPC.
 	CidrBlock string `json:"cidrBlock,omitempty"`
@@ -390,8 +390,6 @@ 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
@@ -520,13 +520,8 @@ 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:
@@ -2091,13 +2086,8 @@ 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
@@ -1323,13 +1323,8 @@ 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
@@ -930,13 +930,8 @@ 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: