capi/aws: use struct as input to GenerateMachines

This makes it easier to keep track what each argument is, specially as
we add more fields.

Author: r4f4

pkg/asset/machines/aws/awsmachines.go

@@ -16,19 +16,28 @@ import (
 	"github.com/openshift/installer/pkg/types/aws"
 )
 
+// MachineInput defines the inputs needed to generate a machine asset.
+type MachineInput struct {
+	Role     string
+	Pool     *types.MachinePool
+	Subnets  map[string]string
+	Tags     map[string]string
+	PublicIP bool
+}
+
 // GenerateMachines returns manifests and runtime objects to provision the control plane (including bootstrap, if applicable) nodes using CAPI.
-func GenerateMachines(clusterID string, region string, subnets map[string]string, pool *types.MachinePool, role string, userTags map[string]string) ([]*asset.RuntimeFile, error) {
-	if poolPlatform := pool.Platform.Name(); poolPlatform != aws.Name {
+func GenerateMachines(clusterID string, in *MachineInput) ([]*asset.RuntimeFile, error) {
+	if poolPlatform := in.Pool.Platform.Name(); poolPlatform != aws.Name {
 		return nil, fmt.Errorf("non-AWS machine-pool: %q", poolPlatform)
 	}
-	mpool := pool.Platform.AWS
+	mpool := in.Pool.Platform.AWS
 
 	total := int64(1)
-	if pool.Replicas != nil {
-		total = *pool.Replicas
+	if in.Pool.Replicas != nil {
+		total = *in.Pool.Replicas
 	}
 
-	tags, err := CapaTagsFromUserTags(clusterID, userTags)
+	tags, err := CapaTagsFromUserTags(clusterID, in.Tags)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create machineapi.TagSpecifications from UserTags: %w", err)
 	}
@@ -37,8 +46,8 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
 
 	for idx := int64(0); idx < total; idx++ {
 		zone := mpool.Zones[int(idx)%len(mpool.Zones)]
-		subnetID, ok := subnets[zone]
-		if len(subnets) > 0 && !ok {
+		subnetID, ok := in.Subnets[zone]
+		if len(in.Subnets) > 0 && !ok {
 			return nil, fmt.Errorf("no subnet for zone %s", zone)
 		}
 		subnet := &capa.AWSResourceReference{}
@@ -55,7 +64,7 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
 
 		awsMachine := &capa.AWSMachine{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("%s-%s-%d", clusterID, pool.Name, idx),
+				Name: fmt.Sprintf("%s-%s-%d", clusterID, in.Pool.Name, idx),
 				Labels: map[string]string{
 					"cluster.x-k8s.io/control-plane": "",
 				},
@@ -103,7 +112,7 @@ func GenerateMachines(clusterID string, region string, subnets map[string]string
 			Spec: capi.MachineSpec{
 				ClusterName: clusterID,
 				Bootstrap: capi.Bootstrap{
-					DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, role)),
+					DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, in.Role)),
 				},
 				InfrastructureRef: v1.ObjectReference{
 					APIVersion: capa.GroupVersion.String(),

pkg/asset/machines/clusterapi.go

@@ -146,13 +146,13 @@ func (c *ClusterAPI) Generate(dependencies asset.Parents) error {
 		}
 
 		pool.Platform.AWS = &mpool
-		awsMachines, err := aws.GenerateMachines(
-			clusterID.InfraID,
-			installConfig.Config.Platform.AWS.Region,
-			subnets,
-			&pool,
-			"master",
-			installConfig.Config.Platform.AWS.UserTags,
+		awsMachines, err := aws.GenerateMachines(clusterID.InfraID, &aws.MachineInput{
+			Role:     "master",
+			Pool:     &pool,
+			Subnets:  subnets,
+			Tags:     installConfig.Config.AWS.UserTags,
+			PublicIP: false,
+		},
 		)
 		if err != nil {
 			return errors.Wrap(err, "failed to create master machine objects")