Merge pull request openshift#8150 from r4f4/capi-aws-user-tags

CORS-2892: capi/aws: add user tags to CAPA cluster

Author: openshift-merge-bot[bot]

pkg/asset/manifests/aws/cluster.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
+	"github.com/openshift/installer/pkg/asset/machines/aws"
 	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
 )
 
@@ -26,6 +27,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 		return nil, errors.Wrap(err, "failed to get availability zones")
 	}
 
+	tags, err := aws.CapaTagsFromUserTags(clusterID.InfraID, installConfig.Config.AWS.UserTags)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get user tags: %w", err)
+	}
+
 	awsCluster := &capa.AWSCluster{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      clusterID.InfraID,
@@ -161,6 +167,7 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 					},
 				},
 			},
+			AdditionalTags: tags,
 		},
 	}