Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add vpc cluster support in Vultr #2196

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/dstack/_internal/core/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
BackendType.GCP,
BackendType.REMOTE,
BackendType.OCI,
BackendType.VULTR,
]
BACKENDS_WITH_CREATE_INSTANCE_SUPPORT = [
BackendType.AWS,
Expand Down
21 changes: 19 additions & 2 deletions src/dstack/_internal/core/backends/vultr/api_client.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import base64
from typing import Any
from typing import Any, Optional

import requests
from requests import Response
Expand Down Expand Up @@ -28,7 +28,21 @@ def get_instance(self, instance_id: str, plan_type: str):
response = self._make_request("GET", f"/instances/{instance_id}")
return response.json()["instance"]

def launch_instance(self, region: str, plan: str, label: str, user_data: str):
def get_vpc_for_region(self, region: str) -> Optional[str]:
response = self._make_request("GET", "/vpcs?per_page=500")
vpcs = response.json().get("vpcs", [])
if vpcs:
for vpc in vpcs:
if vpc["description"] == f"dstack-vpc-{region}":
return vpc
return None

def create_vpc(self, region: str):
data = {"region": region, "description": f"dstack-vpc-{region}"}
response = self._make_request("POST", "/vpcs", data=data)
return response.json()["vpc"]

def launch_instance(self, region: str, plan: str, label: str, user_data: str, vpc_id: str):
# For Bare-metals
if "vbm" in plan:
# "Docker on Ubuntu 22.04" is required for bare-metals.
Expand All @@ -38,6 +52,7 @@ def launch_instance(self, region: str, plan: str, label: str, user_data: str):
"label": label,
"image_id": "docker",
"user_data": base64.b64encode(user_data.encode()).decode(),
"attach_vpc": [vpc_id],
}
resp = self._make_request("POST", "/bare-metals", data)
return resp.json()["bare_metal"]["id"]
Expand All @@ -50,6 +65,7 @@ def launch_instance(self, region: str, plan: str, label: str, user_data: str):
"label": label,
"os_id": 1743,
"user_data": base64.b64encode(user_data.encode()).decode(),
"attach_vpc": [vpc_id],
}
resp = self._make_request("POST", "/instances", data)
return resp.json()["instance"]["id"]
Expand All @@ -60,6 +76,7 @@ def launch_instance(self, region: str, plan: str, label: str, user_data: str):
"label": label,
"image_id": "docker",
"user_data": base64.b64encode(user_data.encode()).decode(),
"attach_vpc": [vpc_id],
}
resp = self._make_request("POST", "/instances", data)
return resp.json()["instance"]["id"]
Expand Down
23 changes: 22 additions & 1 deletion src/dstack/_internal/core/backends/vultr/compute.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,27 @@ def run_job(
def create_instance(
self, instance_offer: InstanceOfferWithAvailability, instance_config: InstanceConfiguration
) -> JobProvisioningData:
# create vpc
vpc = self.api_client.get_vpc_for_region(instance_offer.region)
if not vpc:
vpc = self.api_client.create_vpc(instance_offer.region)

subnet = vpc["v4_subnet"]
subnet_mask = vpc["v4_subnet_mask"]

setup_commands = [
f"sudo ufw allow from {subnet}/{subnet_mask}",
"sudo ufw reload",
]
instance_id = self.api_client.launch_instance(
region=instance_offer.region,
label=instance_config.instance_name,
plan=instance_offer.instance.name,
user_data=get_user_data(authorized_keys=instance_config.get_public_keys()),
user_data=get_user_data(
authorized_keys=instance_config.get_public_keys(),
backend_specific_commands=setup_commands,
),
vpc_id=vpc["id"],
)

launched_instance = JobProvisioningData(
Expand Down Expand Up @@ -119,13 +135,18 @@ def update_provisioning_data(
# Access specific fields
instance_status = instance_data["status"]
instance_main_ip = instance_data["main_ip"]
instance_internal_ip = instance_data["internal_ip"]
if instance_status == "active":
provisioning_data.hostname = instance_main_ip
provisioning_data.internal_ip = instance_internal_ip
if instance_status == "failed":
raise ProvisioningError("VM entered FAILED state")


def _supported_instances(offer: InstanceOffer) -> bool:
# The vbm-4c-32gb plan does not support VPC, so it is excluded.
if offer.instance.name == "vbm-4c-32gb":
return False
if offer.instance.resources.spot:
return False
for family in [
Expand Down
Loading