Add custom VPC support in GCP

Signed-off-by: Aswin Suryanarayanan <[email protected]>

pkg/gcp/cloud_info.go

@@ -26,10 +26,12 @@ import (
 )
 
 type CloudInfo struct {
-	InfraID   string
-	Region    string
-	ProjectID string
-	Client    gcpclient.Interface
+	InfraID          string
+	Region           string
+	ProjectID        string
+	VpcName          string
+	PublicSubnetName string
+	Client           gcpclient.Interface
 }
 
 // Open expected ports by creating related firewall rule.

pkg/gcp/firewall_rules.go

@@ -33,24 +33,24 @@ const (
 	submarinerGatewayNodeTag = "submariner-io-gateway-node"
 )
 
-func newExternalFirewallRules(projectID, infraID string, ports []api.PortSpec) *compute.Firewall {
+func newExternalFirewallRules(projectID, infraID, network string, ports []api.PortSpec) *compute.Firewall {
 	ingressName := generateRuleName(infraID, publicPortsRuleName)
 
 	// We want the external firewall rules to be applied only to Gateway nodes. So, we use the TargetTags
 	// field and include submarinerGatewayNodeTag for selection of Gateway nodes. All the Submariner Gateway
 	// instances will be tagged with submarinerGatewayNodeTag.
-	ingressRule := newFirewallRule(projectID, infraID, ingressName, ingressDirection, ports)
+	ingressRule := newFirewallRule(projectID, ingressName, ingressDirection, network, ports)
 	ingressRule.TargetTags = []string{
 		submarinerGatewayNodeTag,
 	}
 
 	return ingressRule
 }
 
-func newInternalFirewallRule(projectID, infraID string, ports []api.PortSpec) *compute.Firewall {
+func newInternalFirewallRule(projectID, infraID, network string, ports []api.PortSpec) *compute.Firewall {
 	ingressName := generateRuleName(infraID, internalPortsRuleName)
 
-	rule := newFirewallRule(projectID, infraID, ingressName, ingressDirection, ports)
+	rule := newFirewallRule(projectID, ingressName, ingressDirection, network, ports)
 	rule.TargetTags = []string{
 		infraID + "-worker",
 		infraID + "-master",
@@ -63,7 +63,7 @@ func newInternalFirewallRule(projectID, infraID string, ports []api.PortSpec) *c
 	return rule
 }
 
-func newFirewallRule(projectID, infraID, name, direction string, ports []api.PortSpec) *compute.Firewall {
+func newFirewallRule(projectID, name, direction, network string, ports []api.PortSpec) *compute.Firewall {
 	allowedPorts := []*compute.FirewallAllowed{}
 
 	for _, port := range ports {
@@ -79,7 +79,7 @@ func newFirewallRule(projectID, infraID, name, direction string, ports []api.Por
 
 	return &compute.Firewall{
 		Name:      name,
-		Network:   fmt.Sprintf("projects/%s/global/networks/%s-network", projectID, infraID),
+		Network:   fmt.Sprintf("projects/%s/global/networks/%s", projectID, network),
 		Direction: direction,
 		Allowed:   allowedPorts,
 	}

pkg/gcp/gcp.go

@@ -27,20 +27,30 @@ import (
 )
 
 type gcpCloud struct {
-	CloudInfo
+	*CloudInfo
 }
 
 // NewCloud creates a new api.Cloud instance which can prepare GCP for Submariner to be deployed on it.
-func NewCloud(info CloudInfo) api.Cloud {
-	return &gcpCloud{CloudInfo: info}
+func NewCloud(info *CloudInfo) api.Cloud {
+	gcpCloud := &gcpCloud{CloudInfo: info}
+
+	if gcpCloud.VpcName == "" {
+		gcpCloud.VpcName = info.InfraID + "-network"
+	}
+
+	if gcpCloud.PublicSubnetName == "" {
+		gcpCloud.PublicSubnetName = info.InfraID + "-worker-subnet"
+	}
+
+	return gcpCloud
 }
 
 func (gc *gcpCloud) OpenPorts(ports []api.PortSpec, status reporter.Interface) error {
 	// Create the inbound firewall rule for submariner internal ports.
 	status.Start("Opening internal ports %q for intra-cluster communications on GCP", formatPorts(ports))
 	defer status.End()
 
-	internalIngress := newInternalFirewallRule(gc.ProjectID, gc.InfraID, ports)
+	internalIngress := newInternalFirewallRule(gc.ProjectID, gc.InfraID, gc.VpcName, ports)
 	if err := gc.openPorts(internalIngress); err != nil {
 		return status.Error(err, "unable to open ports")
 	}

pkg/gcp/gcp_cloud_test.go

@@ -190,7 +190,7 @@ func newCloudTestDriver() *cloudTestDriver {
 	BeforeEach(func() {
 		t.beforeEach()
 
-		t.cloud = gcp.NewCloud(gcp.CloudInfo{
+		t.cloud = gcp.NewCloud(&gcp.CloudInfo{
 			InfraID:   infraID,
 			Region:    region,
 			ProjectID: projectID,

pkg/gcp/gw-machineset.go

@@ -64,8 +64,8 @@ spec:
           machineType: {{.InstanceType}}
           metadata:
           networkInterfaces:
-          - network: {{.InfraID}}-network
-            subnetwork: {{.InfraID}}-worker-subnet
+          - network: {{.VpcNetworkName}}
+            subnetwork: {{.PublicSubnetName}}
             publicIP: true
           projectID: {{.ProjectID}}
           region: {{.Region}}

pkg/gcp/ocpgwdeployer.go

@@ -47,8 +47,18 @@ type ocpGatewayDeployer struct {
 func NewOcpGatewayDeployer(info CloudInfo, msDeployer ocp.MachineSetDeployer, instanceType, image string,
 	k8sClient k8s.Interface,
 ) api.GatewayDeployer {
+	cloudInfo := info
+
+	if cloudInfo.VpcName == "" {
+		cloudInfo.VpcName = info.InfraID + "-network"
+	}
+
+	if cloudInfo.PublicSubnetName == "" {
+		cloudInfo.PublicSubnetName = info.InfraID + "-worker-subnet"
+	}
+
 	return &ocpGatewayDeployer{
-		CloudInfo:    info,
+		CloudInfo:    cloudInfo,
 		msDeployer:   msDeployer,
 		instanceType: instanceType,
 		image:        image,
@@ -60,7 +70,7 @@ func (d *ocpGatewayDeployer) Deploy(input api.GatewayDeployInput, status reporte
 	status.Start("Configuring the required firewall rules for inter-cluster traffic")
 	defer status.End()
 
-	externalIngress := newExternalFirewallRules(d.ProjectID, d.InfraID, input.PublicPorts)
+	externalIngress := newExternalFirewallRules(d.ProjectID, d.InfraID, d.VpcName, input.PublicPorts)
 	if err := d.openPorts(externalIngress); err != nil {
 		return status.Error(err, "error creating firewall rule %q", externalIngress.Name)
 	}
@@ -166,6 +176,8 @@ type machineSetConfig struct {
 	Region              string
 	Image               string
 	SubmarinerGWNodeTag string
+	VpcNetworkName      string
+	PublicSubnetName    string
 }
 
 func (d *ocpGatewayDeployer) loadGatewayYAML(zone, image string) ([]byte, error) {
@@ -184,6 +196,8 @@ func (d *ocpGatewayDeployer) loadGatewayYAML(zone, image string) ([]byte, error)
 		Region:              d.Region,
 		Image:               image,
 		SubmarinerGWNodeTag: submarinerGatewayNodeTag,
+		VpcNetworkName:      d.VpcName,
+		PublicSubnetName:    d.PublicSubnetName,
 	}
 
 	err = tpl.Execute(&buf, tplVars)