add option for all subnets in az

Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
kubernetes-sigs · Sep 1, 2023 · 10d8620 · 10d8620
1 parent 8bb961c
commit 10d8620
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 8 deletions.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml
@@ -539,6 +539,7 @@ spec:
                 enum:
                 - public
                 - private
+                - all
                 type: string
               availabilityZones:
                 description: AvailabilityZones is an array of availability zones instances

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
@@ -525,6 +525,7 @@ spec:
                 enum:
                 - public
                 - private
+                - all
                 type: string
               availabilityZones:
                 description: AvailabilityZones is an array of availability zones instances

diff --git a/exp/api/v1beta1/conversion.go b/exp/api/v1beta1/conversion.go
@@ -96,12 +96,6 @@ func (src *AWSManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		}
 		dst.Spec.AWSLaunchTemplate.InstanceMetadataOptions = restored.Spec.AWSLaunchTemplate.InstanceMetadataOptions
 	}
-
-	// Manually restore data.
-	restored := &infrav1exp.AWSManagedMachinePool{}
-	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
-		return err
-	}
 	if restored.Spec.AvailabilityZoneSubnetType != nil {
 		dst.Spec.AvailabilityZoneSubnetType = restored.Spec.AvailabilityZoneSubnetType
 	}

diff --git a/exp/api/v1beta2/awsmachinepool_types.go b/exp/api/v1beta2/awsmachinepool_types.go
@@ -53,7 +53,7 @@ type AWSMachinePoolSpec struct {
 	AvailabilityZones []string `json:"availabilityZones,omitempty"`
 
 	// AvailabilityZoneSubnetType specifies which type of subnets to use when an availability zone is specified.
-	// +kubebuilder:validation:Enum:=public;private
+	// +kubebuilder:validation:Enum:=public;private;all
 	// +optional
 	AvailabilityZoneSubnetType *AZSubnetType `json:"availabilityZoneSubnetType,omitempty"`
 

diff --git a/exp/api/v1beta2/awsmanagedmachinepool_types.go b/exp/api/v1beta2/awsmanagedmachinepool_types.go
@@ -69,7 +69,7 @@ type AWSManagedMachinePoolSpec struct {
 	AvailabilityZones []string `json:"availabilityZones,omitempty"`
 
 	// AvailabilityZoneSubnetType specifies which type of subnets to use when an availability zone is specified.
-	// +kubebuilder:validation:Enum:=public;private
+	// +kubebuilder:validation:Enum:=public;private;all
 	// +optional
 	AvailabilityZoneSubnetType *AZSubnetType `json:"availabilityZoneSubnetType,omitempty"`
 

diff --git a/exp/api/v1beta2/types.go b/exp/api/v1beta2/types.go
@@ -305,6 +305,8 @@ const (
 	AZSubnetTypePublic AZSubnetType = "public"
 	// AZSubnetTypePrivate is a private subnet.
 	AZSubnetTypePrivate AZSubnetType = "private"
+	// AZSubnetTypeAll is all subnets in an availability zone.
+	AZSubnetTypeAll AZSubnetType = "all"
 )
 
 // NewAZSubnetType returns a pointer to an AZSubnetType.

diff --git a/pkg/cloud/scope/shared.go b/pkg/cloud/scope/shared.go
@@ -111,6 +111,8 @@ func (p *defaultSubnetPlacementStrategy) getSubnetsForAZs(azs []string, controlP
 		subnets := controlPlaneSubnets.FilterByZone(zone)
 		if placementType != nil {
 			switch *placementType {
+			case expinfrav1.AZSubnetTypeAll:
+				// no-op
 			case expinfrav1.AZSubnetTypePublic:
 				subnets = subnets.FilterPublic()
 			case expinfrav1.AZSubnetTypePrivate:

diff --git a/pkg/cloud/scope/shared_test.go b/pkg/cloud/scope/shared_test.go
@@ -224,6 +224,43 @@ func TestSubnetPlacement(t *testing.T) {
 			expectedSubnetIDs: []string{"az2"},
 			expectError:       false,
 		},
+		{
+			name:                "spec all azs expected",
+			specSubnetIDs:       []string{},
+			specAZs:             []string{"eu-west-1b"},
+			parentAZs:           []string{"eu-west-1c"},
+			subnetPlacementType: expinfrav1.NewAZSubnetType(expinfrav1.AZSubnetTypeAll),
+			controlPlaneSubnets: infrav1.Subnets{
+				infrav1.SubnetSpec{
+					ID:               "az1",
+					AvailabilityZone: "eu-west-1a",
+					IsPublic:         false,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az2",
+					AvailabilityZone: "eu-west-1b",
+					IsPublic:         true,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az3",
+					AvailabilityZone: "eu-west-1b",
+					IsPublic:         false,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az4",
+					AvailabilityZone: "eu-west-1c",
+					IsPublic:         true,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az5",
+					AvailabilityZone: "eu-west-1c",
+					IsPublic:         false,
+				},
+			},
+			logger:            logger.NewLogger(klog.Background()),
+			expectedSubnetIDs: []string{"az2", "az3"},
+			expectError:       false,
+		},
 		{
 			name:                "spec public no azs found",
 			specSubnetIDs:       []string{},
@@ -335,6 +372,43 @@ func TestSubnetPlacement(t *testing.T) {
 			expectedSubnetIDs: []string{"az4"},
 			expectError:       false,
 		},
+		{
+			name:                "parent all azs expected",
+			specSubnetIDs:       []string{},
+			specAZs:             []string{},
+			parentAZs:           []string{"eu-west-1c"},
+			subnetPlacementType: expinfrav1.NewAZSubnetType(expinfrav1.AZSubnetTypeAll),
+			controlPlaneSubnets: infrav1.Subnets{
+				infrav1.SubnetSpec{
+					ID:               "az1",
+					AvailabilityZone: "eu-west-1a",
+					IsPublic:         false,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az2",
+					AvailabilityZone: "eu-west-1b",
+					IsPublic:         true,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az3",
+					AvailabilityZone: "eu-west-1b",
+					IsPublic:         false,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az4",
+					AvailabilityZone: "eu-west-1c",
+					IsPublic:         true,
+				},
+				infrav1.SubnetSpec{
+					ID:               "az5",
+					AvailabilityZone: "eu-west-1c",
+					IsPublic:         false,
+				},
+			},
+			logger:            logger.NewLogger(klog.Background()),
+			expectedSubnetIDs: []string{"az4", "az5"},
+			expectError:       false,
+		},
 		{
 			name:          "use control plane subnets",
 			specSubnetIDs: []string{},