Add support for AWS custom VPC

pkg/cloud/aws/aws.go

@@ -70,7 +70,34 @@ func NewProvider(info *provider.Info) (*awsProvider, error) {
 		return nil, err
 	}
 
-	cloudPrepare := cpaws.NewCloud(awsClient, info.InfraID, info.Region)
+	var cloudOptions []cpaws.CloudOption
+
+	if info.SubmarinerConfigAnnotations != nil {
+		annotations := info.SubmarinerConfigAnnotations
+
+		if vpcID, exists := annotations["submariner.io/vpc-id"]; exists {
+			cloudOptions = append(cloudOptions, cpaws.WithVPCName(vpcID))
+		}
+
+		if subnetIDList, exists := annotations["submariner.io/subnet-id-list"]; exists {
+			subnetIDs := strings.Split(subnetIDList, ",")
+			for i := range subnetIDs {
+				subnetIDs[i] = strings.TrimSpace(subnetIDs[i])
+			}
+
+			cloudOptions = append(cloudOptions, cpaws.WithPublicSubnetList(subnetIDs))
+		}
+
+		if controlPlaneSGID, exists := annotations["submariner.io/control-plane-sg-id"]; exists {
+			cloudOptions = append(cloudOptions, cpaws.WithControlPlaneSecurityGroup(controlPlaneSGID))
+		}
+
+		if workerSGID, exists := annotations["submariner.io/worker-sg-id"]; exists {
+			cloudOptions = append(cloudOptions, cpaws.WithWorkerSecurityGroup(workerSGID))
+		}
+	}
+
+	cloudPrepare := cpaws.NewCloud(awsClient, info.InfraID, info.Region, cloudOptions...)
 
 	machineSetDeployer := ocp.NewK8sMachinesetDeployer(info.RestMapper, info.DynamicClient)
 	gwDeployer, err := cpaws.NewOcpGatewayDeployer(cloudPrepare, machineSetDeployer, instanceType)

pkg/cloud/cloud.go

@@ -129,6 +129,8 @@ func (f *providerFactory) Get(config *configv1alpha1.SubmarinerConfig, eventsRec
 		return nil, true, err
 	}
 
+	info.SubmarinerConfigAnnotations = config.Annotations
+
 	instance, err := providerFn(info)
 
 	return instance, true, err

pkg/cloud/provider/info.go

@@ -17,4 +17,5 @@ type Info struct {
 	CredentialsSecret *corev1.Secret
 	configv1alpha1.SubmarinerConfigSpec
 	configv1alpha1.ManagedClusterInfo
+	SubmarinerConfigAnnotations map[string]string
 }