Support specifying VPC

This change adds a field to DONetwork specifying the VPC UUID and
updates the controllers to pass the ID into droplet and load balancer
create requests.

Author: timoreimann

api/v1alpha3/types.go

@@ -77,6 +77,10 @@ type DONetwork struct {
 	// Configures an API Server loadbalancers
 	// +optional
 	APIServerLoadbalancers DOLoadBalancer `json:"apiServerLoadbalancers,omitempty"`
+	// VPCUUID defines the VPC UUID to use. An empty value implies using the
+	// default VPC.
+	// +optional
+	VPCUUID string `json:"vpc_uuid,omitempty"`
 }
 
 // DOLoadBalancer define the DigitalOcean loadbalancers configurations.

cloud/scope/cluster.go

@@ -148,3 +148,8 @@ func (s *ClusterScope) APIServerLoadbalancers() *infrav1.DOLoadBalancer {
 func (s *ClusterScope) APIServerLoadbalancersRef() *infrav1.DOResourceReference {
 	return &s.DOCluster.Status.Network.APIServerLoadbalancersRef
 }
+
+// VPCUUID get the DOCluster Spec Network VPCUUID.
+func (s *ClusterScope) VPCUUID() string {
+	return s.DOCluster.Spec.Network.VPCUUID
+}

cloud/services/computes/droplets.go

@@ -92,6 +92,7 @@ func (s *Service) CreateDroplet(scope *scope.MachineScope) (*godo.Droplet, error
 		},
 		UserData:          bootstrapData,
 		PrivateNetworking: true,
+		VPCUUID:           s.scope.VPCUUID(),
 	}
 
 	request.Tags = infrav1.BuildTags(infrav1.BuildTagParams{

cloud/services/networking/loadbalancers.go

@@ -63,7 +63,8 @@ func (s *Service) CreateLoadBalancer(spec *infrav1.DOLoadBalancer) (*godo.LoadBa
 			UnhealthyThreshold:     spec.HealthCheck.UnhealthyThreshold,
 			HealthyThreshold:       spec.HealthCheck.HealthyThreshold,
 		},
-		Tag: infrav1.ClusterNameRoleTag(clusterName, infrav1.APIServerRoleTagValue),
+		Tag:     infrav1.ClusterNameRoleTag(clusterName, infrav1.APIServerRoleTagValue),
+		VPCUUID: s.scope.VPCUUID(),
 	}
 
 	lb, _, err := s.scope.LoadBalancers.Create(s.ctx, request)

config/crd/bases/infrastructure.cluster.x-k8s.io_doclusters.yaml

@@ -256,6 +256,10 @@ spec:
                         minimum: 1
                         type: integer
                     type: object
+                  vpc_uuid:
+                    description: VPCUUID defines the VPC UUID to use. An empty value
+                      implies using the default VPC.
+                    type: string
                 type: object
               region:
                 description: The DigitalOcean Region the cluster lives in. It must

test/e2e/config/digitalocean-ci.yaml

@@ -69,18 +69,18 @@ providers:
 
 variables:
   REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
-  KUBERNETES_VERSION: "v1.18.10"
+  KUBERNETES_VERSION: "v1.17.11"
   EXP_CLUSTER_RESOURCE_SET: "true"
   # Cluster Addons
   CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"
   CCM: "${PWD}/test/e2e/data/ccm/digitalocean-cloud-controller-manager.yaml"
   # Following CAPDO variables should be set before testing
   DO_REGION: "nyc1"
   DO_CONTROL_PLANE_MACHINE_TYPE: "s-2vcpu-2gb"
-  DO_CONTROL_PLANE_MACHINE_IMAGE: "63624555"
+  DO_CONTROL_PLANE_MACHINE_IMAGE: "74542261"
   DO_NODE_MACHINE_TYPE: "s-2vcpu-2gb"
-  DO_NODE_MACHINE_IMAGE: "63624555"
-  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.18.10"
+  DO_NODE_MACHINE_IMAGE: "74542261"
+  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.17.11"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
 

test/e2e/config/digitalocean-dev.yaml

@@ -69,6 +69,7 @@ providers:
       - sourcePath: "../data/infrastructure-digitalocean/metadata.yaml"
 
 variables:
+  REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
   KUBERNETES_VERSION: "v1.17.11"
   EXP_CLUSTER_RESOURCE_SET: "true"
   # Cluster Addons
@@ -77,9 +78,9 @@ variables:
   # Following CAPDO variables should be set before testing
   DO_REGION: "nyc1"
   DO_CONTROL_PLANE_MACHINE_TYPE: "s-2vcpu-2gb"
-  # DO_CONTROL_PLANE_MACHINE_IMAGE: ""
+  DO_CONTROL_PLANE_MACHINE_IMAGE: "74542261"
   DO_NODE_MACHINE_TYPE: "s-2vcpu-2gb"
-  # DO_NODE_MACHINE_IMAGE: ""
+  DO_NODE_MACHINE_IMAGE: "74542261"
   # Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
   # DO_SSH_KEY_FINGERPRINT: ""
 

test/e2e/data/infrastructure-digitalocean/cluster-template.yaml

@@ -25,6 +25,8 @@ metadata:
   name: "${CLUSTER_NAME}"
 spec:
   region: ${DO_REGION}
+  network:
+    vpc_uuid: 6e54bce7-b371-43fd-9f5f-b564f1f31fc8
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1alpha3