Ensure subnet is accessed from correct project

openshift · Aug 13, 2020 · 3b73b7e · 3b73b7e
1 parent 2acd93e
commit 3b73b7e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/pkg/cloud/gcp/actuators/machine/reconciler.go b/pkg/cloud/gcp/actuators/machine/reconciler.go
@@ -96,15 +96,15 @@ func (r *Reconciler) create() error {
 		computeNIC := &compute.NetworkInterface{
 			AccessConfigs: accessConfigs,
 		}
+		projectID := nic.ProjectID
+		if projectID == "" {
+			projectID = r.projectID
+		}
 		if len(nic.Network) != 0 {
-			projectID := nic.ProjectID
-			if projectID == "" {
-				projectID = r.projectID
-			}
 			computeNIC.Network = fmt.Sprintf("projects/%s/global/networks/%s", projectID, nic.Network)
 		}
 		if len(nic.Subnetwork) != 0 {
-			computeNIC.Subnetwork = fmt.Sprintf("regions/%s/subnetworks/%s", r.providerSpec.Region, nic.Subnetwork)
+			computeNIC.Subnetwork = fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", projectID, r.providerSpec.Region, nic.Subnetwork)
 		}
 		networkInterfaces = append(networkInterfaces, computeNIC)
 	}

diff --git a/pkg/cloud/gcp/actuators/machine/reconciler_test.go b/pkg/cloud/gcp/actuators/machine/reconciler_test.go
@@ -99,10 +99,12 @@ func TestCreate(t *testing.T) {
 			name: "Use projectID from NetworkInterface if set",
 			providerSpec: &gcpv1beta1.GCPMachineProviderSpec{
 				ProjectID: "project",
+				Region:    "test-region",
 				NetworkInterfaces: []*gcpv1beta1.GCPNetworkInterface{
 					{
-						ProjectID: "network-project",
-						Network:   "test-network",
+						ProjectID:  "network-project",
+						Network:    "test-network",
+						Subnetwork: "test-subnetwork",
 					},
 				},
 			},
@@ -114,15 +116,21 @@ func TestCreate(t *testing.T) {
 				if instance.NetworkInterfaces[0].Network != expectedNetwork {
 					t.Errorf("Expected Network: %q, Got Network: %q", expectedNetwork, instance.NetworkInterfaces[0].Network)
 				}
+				expectedSubnetwork := fmt.Sprintf("projects/%s/regions/%s/networks/%s", "network-project", "test-region", "test-network")
+				if instance.NetworkInterfaces[0].Network != expectedNetwork {
+					t.Errorf("Expected Network: %q, Got Network: %q", expectedSubnetwork, instance.NetworkInterfaces[0].Subnetwork)
+				}
 			},
 		},
 		{
 			name: "Use projectID from ProviderSpec if not set in the NetworkInterface",
 			providerSpec: &gcpv1beta1.GCPMachineProviderSpec{
 				ProjectID: "project",
+				Region:    "test-region",
 				NetworkInterfaces: []*gcpv1beta1.GCPNetworkInterface{
 					{
-						Network: "test-network",
+						Network:    "test-network",
+						Subnetwork: "test-subnetwork",
 					},
 				},
 			},
@@ -134,6 +142,10 @@ func TestCreate(t *testing.T) {
 				if instance.NetworkInterfaces[0].Network != expectedNetwork {
 					t.Errorf("Expected Network: %q, Got Network: %q", expectedNetwork, instance.NetworkInterfaces[0].Network)
 				}
+				expectedSubnetwork := fmt.Sprintf("projects/%s/regions/%s/networks/%s", "project", "test-region", "test-network")
+				if instance.NetworkInterfaces[0].Network != expectedNetwork {
+					t.Errorf("Expected Network: %q, Got Network: %q", expectedSubnetwork, instance.NetworkInterfaces[0].Subnetwork)
+				}
 			},
 		},
 	}