Merge pull request #8179 from r4f4/capi-aws-destroy-capi

CORS-2905: capi/aws: destroy CAPA resources

Author: openshift-merge-bot[bot]

pkg/asset/cluster/aws/aws.go

@@ -20,11 +20,11 @@ import (
 func Metadata(clusterID, infraID string, config *types.InstallConfig) *awstypes.Metadata {
 	return &awstypes.Metadata{
 		Region: config.Platform.AWS.Region,
-		Identifier: []map[string]string{{
-			fmt.Sprintf("kubernetes.io/cluster/%s", infraID): "owned",
-		}, {
-			"openshiftClusterID": clusterID,
-		}},
+		Identifier: []map[string]string{
+			{fmt.Sprintf("kubernetes.io/cluster/%s", infraID): "owned"},
+			{"openshiftClusterID": clusterID},
+			{fmt.Sprintf("sigs.k8s.io/cluster-api-provider-aws/cluster/%s", infraID): "owned"},
+		},
 		ServiceEndpoints: config.AWS.ServiceEndpoints,
 		ClusterDomain:    config.ClusterDomain(),
 		HostedZoneRole:   config.AWS.HostedZoneRole,