cluster-builder 0.2.1__tar.gz → 0.3.1__tar.gz

cluster_builder-0.3.1/PKG-INFO

@@ -0,0 +1,321 @@
+Metadata-Version: 2.4
+Name: cluster-builder
+Version: 0.3.1
+Summary: Swarmchestrate cluster builder
+Author-email: Gunjan <G.Kotak@westminster.ac.uk>, Jay <J.Deslauriers@westminster.ac.uk>
+License: Apache2
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: names_generator==0.2.0
+Requires-Dist: python-hcl2==7.2
+Requires-Dist: lark-parser==0.12.0
+Requires-Dist: python-dotenv==1.1.1
+Requires-Dist: psycopg2-binary==2.9.10
+Requires-Dist: yaspin==3.1.0
+Dynamic: license-file
+
+# Swarmchestrate - Cluster Builder
+
+This repository contains the codebase for **[cluster-builder]**, which builds K3s clusters for Swarmchestrate using OpenTofu.  
+
+Key features:
+- **Create**: Provisions infrastructure using OpenTofu and installs K3s.
+- **Add**: Add worker or HA nodes to existing clusters.
+- **Remove**: Selectively remove nodes from existing clusters.  
+- **Delete**: Destroys the provisioned infrastructure when no longer required. 
+
+---
+
+## Prerequisites
+
+Before proceeding, ensure the following prerequisites are installed:
+
+1. **Git**: For cloning the repository.
+2. **Python**: Version 3.9 or higher.
+3. **pip**: Python package manager.
+4. **OpenTofu**: Version 1.6 or higher for infrastructure provisioning.
+6. **Make**: To run the provided `Makefile`.
+7. **PostgreSQL**: For storing OpenTofu state.
+8. (Optional) **Docker**: To create a dev Postgres
+9. For detailed instructions on **edge device requirements**, refer to the [Edge Device Requirements](docs/edge-requirements.md) document.
+
+---
+
+## Getting Started
+
+### 1. Clone the Repository
+
+To get started, clone this repository:
+
+```bash
+git clone https://github.com/Swarmchestrate/cluster-builder.git
+ ```
+
+### 2. Navigate to the Project Directory
+
+```bash
+cd cluster-builder
+ ```
+
+### 3. Install Dependencies and Tools
+
+Run the Makefile to install all necessary dependencies, including OpenTofu:
+
+```bash
+ make install
+```
+
+This command will:
+- Install Python dependencies listed in requirements.txt.
+- Download and configure OpenTofu for infrastructure management.
+
+```bash
+ make db
+```
+
+This command will:
+- Spin up an empty dev Postgres DB (in Docker) for storing state
+
+in ths makefile database details are provide you update or use that ones name pg-db -e POSTGRES_USER=admin -e POSTGRES_PASSWORD=adminpass -e POSTGRES_DB=swarmchestrate
+
+For database setup as a service, refer to the [database setup as service](docs/database_setup.md) document
+
+### 4. Populate .env file with access config
+The .env file is used to store environment variables required by the application. It contains configuration details for connecting to your cloud providers, the PostgreSQL database, and any other necessary resources.
+
+#### 4.1.  Rename or copy the example file to **.env**
+
+```bash
+cp .env_example .env
+```
+
+#### 4.2. Open the **.env** file and add the necessary configuration for your cloud providers and PostgreSQL:
+
+```ini
+## PG Configuration
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=secret
+POSTGRES_HOST=db.example.com
+POSTGRES_DATABASE=terraform_state
+POSTGRES_SSLMODE=prefer
+
+## AWS Auth
+TF_VAR_aws_region=us-west-2
+TF_VAR_aws_access_key=AKIAXXXXXXXXXXXXXXXX
+TF_VAR_aws_secret_key=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+## OpenStack Auth - AppCreds Mode
+TF_VAR_openstack_auth_method=appcreds
+TF_VAR_openstack_auth_url=https://openstack.example.com:5000
+TF_VAR_openstack_application_credential_id=fdXXXXXXXXXXXXXXXX
+TF_VAR_openstack_application_credential_secret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+TF_VAR_openstack_region=RegionOne
+
+## OpenStack Auth - User/Pass Mode
+# TF_VAR_openstack_auth_method=userpass
+# TF_VAR_openstack_auth_url=https://openstack.example.com:5000
+# TF_VAR_openstack_region=RegionOne
+# TF_VAR_openstack_user_name=myuser
+# TF_VAR_openstack_password=mypassword
+# TF_VAR_openstack_project_id=project-id-123
+# TF_VAR_openstack_user_domain_name=Default
+```
+
+---
+
+## Basic Usage
+
+### Initialisation
+
+```python
+from cluster_builder import Swarmchestrate
+
+# Initialise the orchestrator
+orchestrator = Swarmchestrate(
+    template_dir="/path/to/templates",
+    output_dir="/path/to/output"
+)
+```
+
+### Creating a New Cluster
+
+To create a new k3s cluster, use the **add_node** method with the **master** role:
+
+```python
+# Configuration for a new cluster
+config = {
+    "cloud": "aws",  # Can be 'aws', 'openstack', or 'edge'
+    "k3s_role": "master",  # Role can be 'master', 'worker', or 'ha'
+    "ha": False,  # Set to True for high availability (HA) deployments
+    "instance_type": "t2.small",  # AWS instance type
+    "ssh_key_name": "g",  # SSH key name for AWS or OpenStack
+    "ssh_user": "ec2-user",  # SSH user for the instance
+    "ssh_private_key_path": "/workspaces/cluster-builder/scripts/g.pem",  # Path to SSH private key
+    "ami": "ami-0c0493bbac867d427",  # AMI ID for AWS (specific to region)
+    "tcp_ports": [10020],  # Optional list of TCP ports to open
+    "udp_ports": [1003]  # Optional list of UDP ports to open
+}
+
+# Create the cluster (returns the cluster name)
+cluster_name = orchestrator.add_node(config)
+print(f"Created cluster: {cluster_name}")
+```
+
+### Adding Nodes to an Existing Cluster
+
+To add worker or high-availability nodes to an existing cluster:
+
+```python
+# Configuration for adding a worker node
+worker_config = {
+    "cloud": "aws",  # Cloud provider (can be 'aws', 'openstack', or 'edge')
+    "k3s_role": "worker",  # Role can be 'worker' or 'ha'
+    "ha": False,  # Set to True for high availability (HA) deployments
+    "instance_type": "t2.small",  # AWS instance type
+    "ssh_key_name": "g",  # SSH key name
+    "ssh_user": "ec2-user",  # SSH user for the instance
+    "ssh_private_key_path": "/workspaces/cluster-builder/scripts/g.pem",  # Path to SSH private key
+    "ami": "ami-0c0493bbac867d427",  # AMI ID for AWS
+    # Optional parameters:
+    # "master_ip": "12.13.14.15",  # IP address of the master node (required for worker/HA roles)
+    # "cluster_name": "elastic_mcnulty",  # Name of the cluster
+    # "security_group_id": "sg-xxxxxxxxxxxxxxx",  # Security group ID for AWS or OpenStack
+    # "tcp_ports": [80, 443],  # List of TCP ports to open
+    # "udp_ports": [53]  # List of UDP ports to open
+}
+
+# Add the worker node
+cluster_name = orchestrator.add_node(worker_config)
+print(f"Added worker node to cluster: {cluster_name}")
+```
+
+### Removing a Specific Node
+
+To remove a specific node from a cluster:
+
+```python
+# Remove a node by its resource name
+orchestrator.remove_node(
+    cluster_name="your-cluster-name",
+    resource_name="aws_eloquent_feynman"  # The resource identifier of the node
+)
+```
+
+The **remove_node** method:
+1. Destroys the node's infrastructure resources
+2. Removes the node's configuration from the cluster
+
+---
+
+### Destroying an Entire Cluster
+
+To completely destroy a cluster and all its nodes:
+
+```python
+# Destroy the entire cluster
+orchestrator.destroy(
+    cluster_name="your-cluster-name"
+)
+```
+
+The **destroy** method:
+1. Destroys all infrastructure resources associated with the cluster
+2. Removes the cluster directory and configuration files
+
+Note for **Edge Devices**:
+Since the edge device is already provisioned, the `destroy` method will not remove K3s directly from the edge device. You will need to manually uninstall K3s from your edge device after the cluster is destroyed.
+
+---
+
+### Important Configuration Requirements
+#### High Availability Flag (ha):
+
+- For k3s_role="worker" or k3s_role="ha", you must specify a master_ip (the IP address of the master node).
+
+- For k3s_role="master", you must not specify a master_ip.
+
+- The ha flag should be set to True for high availability deployment (usually when adding a ha or worker node to an existing master).
+
+#### SSH Credentials:
+
+- For all roles (k3s_role="master", k3s_role="worker", k3s_role="ha"), you must specify both ssh_user and ssh_private_key_path except for edge.
+
+- The ssh_private_key_path should be the path to your SSH private key file. Ensure that the SSH key is copied to the specified path before running the script.
+
+- The ssh_key_name and the ssh_private_key_path are different—ensure that your SSH key is placed correctly at the provided ssh_private_key_path.
+
+#### Ports:
+You can specify custom ports for your nodes in the tcp_ports and udp_ports fields. However, certain ports are required for Kubernetes deployment (even if not specified explicitly):
+
+**TCP Ports:**
+
+- 2379-2380: For etcd communication
+- 6443: K3s API server
+- 10250: Kubelet metrics
+- 51820-51821: WireGuard (for encrypted networking)
+- 22: SSH access
+- 80, 443: HTTP/HTTPS access
+- 53: DNS (CoreDNS)
+- 5432: PostgreSQL access (master node)
+
+**UDP Ports:**
+
+- 8472: VXLAN for Flannel
+- 53: DNS
+
+#### OpenStack:
+When provisioning on OpenStack, you should provide the value for 'floating_ip_pool' from which floating IPs can be allocated for the instance. If not specified, OpenTofu will not assign floating IP.
+
+---
+
+## Advanced Usage
+
+### Dry Run Mode
+
+All operations support a **dryrun** parameter, which validates the configuration 
+without making changes. A node created with dryrun should be removed with dryrun.
+
+```python
+# Validate configuration without deploying
+orchestrator.add_node(config, dryrun=True)
+
+# Validate removal without destroying
+orchestrator.remove_node(cluster_name, resource_name, dryrun=True)
+
+# Validate destruction without destroying
+orchestrator.destroy(cluster_name, dryrun=True)
+```
+
+### Custom Cluster Names
+
+By default, cluster names are generated automatically. To specify a custom name:
+
+```python
+config = {
+    "cloud": "aws",
+    "k3s_role": "master",
+    "cluster_name": "production-cluster",
+    # ... other configuration ...
+}
+
+orchestrator.add_node(config)
+```
+
+---
+
+## Template Structure
+
+Templates should be organised as follows:
+- `templates/` - Base directory for templates
+- `templates/{cloud}/` - Terraform modules for each cloud provider
+- `templates/{role}_user_data.sh.tpl` - Node initialisation scripts
+- `templates/{cloud}_provider.tf.j2` - Provider configuration templates
+
+---
+
+## DEMO
+Some test scripts have been created for demonstrating the functionality of the cluster builder. These scripts can be referred to for understanding how the system works and for testing various configurations.
+
+For detailed service deployment examples and to explore the test scripts, refer to the [test scripts](docs/test-scripts.md) document
+
+---

cluster_builder-0.3.1/README.md

@@ -0,0 +1,305 @@
+# Swarmchestrate - Cluster Builder
+
+This repository contains the codebase for **[cluster-builder]**, which builds K3s clusters for Swarmchestrate using OpenTofu.  
+
+Key features:
+- **Create**: Provisions infrastructure using OpenTofu and installs K3s.
+- **Add**: Add worker or HA nodes to existing clusters.
+- **Remove**: Selectively remove nodes from existing clusters.  
+- **Delete**: Destroys the provisioned infrastructure when no longer required. 
+
+---
+
+## Prerequisites
+
+Before proceeding, ensure the following prerequisites are installed:
+
+1. **Git**: For cloning the repository.
+2. **Python**: Version 3.9 or higher.
+3. **pip**: Python package manager.
+4. **OpenTofu**: Version 1.6 or higher for infrastructure provisioning.
+6. **Make**: To run the provided `Makefile`.
+7. **PostgreSQL**: For storing OpenTofu state.
+8. (Optional) **Docker**: To create a dev Postgres
+9. For detailed instructions on **edge device requirements**, refer to the [Edge Device Requirements](docs/edge-requirements.md) document.
+
+---
+
+## Getting Started
+
+### 1. Clone the Repository
+
+To get started, clone this repository:
+
+```bash
+git clone https://github.com/Swarmchestrate/cluster-builder.git
+ ```
+
+### 2. Navigate to the Project Directory
+
+```bash
+cd cluster-builder
+ ```
+
+### 3. Install Dependencies and Tools
+
+Run the Makefile to install all necessary dependencies, including OpenTofu:
+
+```bash
+ make install
+```
+
+This command will:
+- Install Python dependencies listed in requirements.txt.
+- Download and configure OpenTofu for infrastructure management.
+
+```bash
+ make db
+```
+
+This command will:
+- Spin up an empty dev Postgres DB (in Docker) for storing state
+
+in ths makefile database details are provide you update or use that ones name pg-db -e POSTGRES_USER=admin -e POSTGRES_PASSWORD=adminpass -e POSTGRES_DB=swarmchestrate
+
+For database setup as a service, refer to the [database setup as service](docs/database_setup.md) document
+
+### 4. Populate .env file with access config
+The .env file is used to store environment variables required by the application. It contains configuration details for connecting to your cloud providers, the PostgreSQL database, and any other necessary resources.
+
+#### 4.1.  Rename or copy the example file to **.env**
+
+```bash
+cp .env_example .env
+```
+
+#### 4.2. Open the **.env** file and add the necessary configuration for your cloud providers and PostgreSQL:
+
+```ini
+## PG Configuration
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=secret
+POSTGRES_HOST=db.example.com
+POSTGRES_DATABASE=terraform_state
+POSTGRES_SSLMODE=prefer
+
+## AWS Auth
+TF_VAR_aws_region=us-west-2
+TF_VAR_aws_access_key=AKIAXXXXXXXXXXXXXXXX
+TF_VAR_aws_secret_key=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+## OpenStack Auth - AppCreds Mode
+TF_VAR_openstack_auth_method=appcreds
+TF_VAR_openstack_auth_url=https://openstack.example.com:5000
+TF_VAR_openstack_application_credential_id=fdXXXXXXXXXXXXXXXX
+TF_VAR_openstack_application_credential_secret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+TF_VAR_openstack_region=RegionOne
+
+## OpenStack Auth - User/Pass Mode
+# TF_VAR_openstack_auth_method=userpass
+# TF_VAR_openstack_auth_url=https://openstack.example.com:5000
+# TF_VAR_openstack_region=RegionOne
+# TF_VAR_openstack_user_name=myuser
+# TF_VAR_openstack_password=mypassword
+# TF_VAR_openstack_project_id=project-id-123
+# TF_VAR_openstack_user_domain_name=Default
+```
+
+---
+
+## Basic Usage
+
+### Initialisation
+
+```python
+from cluster_builder import Swarmchestrate
+
+# Initialise the orchestrator
+orchestrator = Swarmchestrate(
+    template_dir="/path/to/templates",
+    output_dir="/path/to/output"
+)
+```
+
+### Creating a New Cluster
+
+To create a new k3s cluster, use the **add_node** method with the **master** role:
+
+```python
+# Configuration for a new cluster
+config = {
+    "cloud": "aws",  # Can be 'aws', 'openstack', or 'edge'
+    "k3s_role": "master",  # Role can be 'master', 'worker', or 'ha'
+    "ha": False,  # Set to True for high availability (HA) deployments
+    "instance_type": "t2.small",  # AWS instance type
+    "ssh_key_name": "g",  # SSH key name for AWS or OpenStack
+    "ssh_user": "ec2-user",  # SSH user for the instance
+    "ssh_private_key_path": "/workspaces/cluster-builder/scripts/g.pem",  # Path to SSH private key
+    "ami": "ami-0c0493bbac867d427",  # AMI ID for AWS (specific to region)
+    "tcp_ports": [10020],  # Optional list of TCP ports to open
+    "udp_ports": [1003]  # Optional list of UDP ports to open
+}
+
+# Create the cluster (returns the cluster name)
+cluster_name = orchestrator.add_node(config)
+print(f"Created cluster: {cluster_name}")
+```
+
+### Adding Nodes to an Existing Cluster
+
+To add worker or high-availability nodes to an existing cluster:
+
+```python
+# Configuration for adding a worker node
+worker_config = {
+    "cloud": "aws",  # Cloud provider (can be 'aws', 'openstack', or 'edge')
+    "k3s_role": "worker",  # Role can be 'worker' or 'ha'
+    "ha": False,  # Set to True for high availability (HA) deployments
+    "instance_type": "t2.small",  # AWS instance type
+    "ssh_key_name": "g",  # SSH key name
+    "ssh_user": "ec2-user",  # SSH user for the instance
+    "ssh_private_key_path": "/workspaces/cluster-builder/scripts/g.pem",  # Path to SSH private key
+    "ami": "ami-0c0493bbac867d427",  # AMI ID for AWS
+    # Optional parameters:
+    # "master_ip": "12.13.14.15",  # IP address of the master node (required for worker/HA roles)
+    # "cluster_name": "elastic_mcnulty",  # Name of the cluster
+    # "security_group_id": "sg-xxxxxxxxxxxxxxx",  # Security group ID for AWS or OpenStack
+    # "tcp_ports": [80, 443],  # List of TCP ports to open
+    # "udp_ports": [53]  # List of UDP ports to open
+}
+
+# Add the worker node
+cluster_name = orchestrator.add_node(worker_config)
+print(f"Added worker node to cluster: {cluster_name}")
+```
+
+### Removing a Specific Node
+
+To remove a specific node from a cluster:
+
+```python
+# Remove a node by its resource name
+orchestrator.remove_node(
+    cluster_name="your-cluster-name",
+    resource_name="aws_eloquent_feynman"  # The resource identifier of the node
+)
+```
+
+The **remove_node** method:
+1. Destroys the node's infrastructure resources
+2. Removes the node's configuration from the cluster
+
+---
+
+### Destroying an Entire Cluster
+
+To completely destroy a cluster and all its nodes:
+
+```python
+# Destroy the entire cluster
+orchestrator.destroy(
+    cluster_name="your-cluster-name"
+)
+```
+
+The **destroy** method:
+1. Destroys all infrastructure resources associated with the cluster
+2. Removes the cluster directory and configuration files
+
+Note for **Edge Devices**:
+Since the edge device is already provisioned, the `destroy` method will not remove K3s directly from the edge device. You will need to manually uninstall K3s from your edge device after the cluster is destroyed.
+
+---
+
+### Important Configuration Requirements
+#### High Availability Flag (ha):
+
+- For k3s_role="worker" or k3s_role="ha", you must specify a master_ip (the IP address of the master node).
+
+- For k3s_role="master", you must not specify a master_ip.
+
+- The ha flag should be set to True for high availability deployment (usually when adding a ha or worker node to an existing master).
+
+#### SSH Credentials:
+
+- For all roles (k3s_role="master", k3s_role="worker", k3s_role="ha"), you must specify both ssh_user and ssh_private_key_path except for edge.
+
+- The ssh_private_key_path should be the path to your SSH private key file. Ensure that the SSH key is copied to the specified path before running the script.
+
+- The ssh_key_name and the ssh_private_key_path are different—ensure that your SSH key is placed correctly at the provided ssh_private_key_path.
+
+#### Ports:
+You can specify custom ports for your nodes in the tcp_ports and udp_ports fields. However, certain ports are required for Kubernetes deployment (even if not specified explicitly):
+
+**TCP Ports:**
+
+- 2379-2380: For etcd communication
+- 6443: K3s API server
+- 10250: Kubelet metrics
+- 51820-51821: WireGuard (for encrypted networking)
+- 22: SSH access
+- 80, 443: HTTP/HTTPS access
+- 53: DNS (CoreDNS)
+- 5432: PostgreSQL access (master node)
+
+**UDP Ports:**
+
+- 8472: VXLAN for Flannel
+- 53: DNS
+
+#### OpenStack:
+When provisioning on OpenStack, you should provide the value for 'floating_ip_pool' from which floating IPs can be allocated for the instance. If not specified, OpenTofu will not assign floating IP.
+
+---
+
+## Advanced Usage
+
+### Dry Run Mode
+
+All operations support a **dryrun** parameter, which validates the configuration 
+without making changes. A node created with dryrun should be removed with dryrun.
+
+```python
+# Validate configuration without deploying
+orchestrator.add_node(config, dryrun=True)
+
+# Validate removal without destroying
+orchestrator.remove_node(cluster_name, resource_name, dryrun=True)
+
+# Validate destruction without destroying
+orchestrator.destroy(cluster_name, dryrun=True)
+```
+
+### Custom Cluster Names
+
+By default, cluster names are generated automatically. To specify a custom name:
+
+```python
+config = {
+    "cloud": "aws",
+    "k3s_role": "master",
+    "cluster_name": "production-cluster",
+    # ... other configuration ...
+}
+
+orchestrator.add_node(config)
+```
+
+---
+
+## Template Structure
+
+Templates should be organised as follows:
+- `templates/` - Base directory for templates
+- `templates/{cloud}/` - Terraform modules for each cloud provider
+- `templates/{role}_user_data.sh.tpl` - Node initialisation scripts
+- `templates/{cloud}_provider.tf.j2` - Provider configuration templates
+
+---
+
+## DEMO
+Some test scripts have been created for demonstrating the functionality of the cluster builder. These scripts can be referred to for understanding how the system works and for testing various configurations.
+
+For detailed service deployment examples and to explore the test scripts, refer to the [test scripts](docs/test-scripts.md) document
+
+---

{cluster_builder-0.2.1 → cluster_builder-0.3.1}/cluster_builder/config/cluster.py

@@ -4,7 +4,8 @@ Cluster configuration management.
 
 import os
 import logging
-
+import secrets
+import string
 from names_generator import generate_name
 
 from cluster_builder.infrastructure import TemplateManager
@@ -50,9 +51,25 @@ class ClusterConfig:
             A randomly generated name
         """
         name = generate_name()
+        name = name.replace("_", "-")
         logger.debug(f"Generated random name: {name}")
         return name
 
+    def generate_k3s_token(self, length: int = 16) -> str:
+        """
+        Generate a secure random alphanumeric token for K3s.
+
+        Args:
+            length: Length of the token (default: 16)
+
+        Returns:
+            A secure, randomly generated alphanumeric token
+        """
+        chars = string.ascii_letters + string.digits
+        token = ''.join(secrets.choice(chars) for _ in range(length))
+        logger.debug(f"Generated K3s token: {token}")
+        return token
+
     def prepare(self, config: dict[str, any]) -> tuple[str, dict[str, any]]:
         """
         Prepare the configuration and template files for deployment.
@@ -84,7 +101,7 @@ class ClusterConfig:
 
         cloud = prepared_config["cloud"]
         role = prepared_config["k3s_role"]
-        logger.info(f"Preparing configuration for cloud={cloud}, role={role}")
+        logger.debug(f"Preparing configuration for cloud={cloud}, role={role}")
 
         # Set module source path
         prepared_config["module_source"] = self.template_manager.get_module_source_path(
@@ -92,14 +109,22 @@ class ClusterConfig:
         )
         logger.debug(f"Using module source: {prepared_config['module_source']}")
 
+        # create k3s-token if not provided
+        if "k3s_token" not in prepared_config:
+            logger.debug("Generating k3s token for cluster")
+            k3s_token = self.generate_k3s_token()
+            prepared_config["k3s_token"] = k3s_token
+        else:
+            logger.debug(f"Using provided K3s token: {prepared_config['k3s_token']}")
+
         # Generate a cluster name if not provided
         if "cluster_name" not in prepared_config:
             cluster_name = self.generate_random_name()
             prepared_config["cluster_name"] = cluster_name
-            logger.info(f"Generated cluster name: {cluster_name}")
+            logger.info(f"Creating new cluster: {cluster_name}")
         else:
             logger.info(
-                f"Using provided cluster name: {prepared_config['cluster_name']}"
+                f"Adding node to existing cluster: {prepared_config['cluster_name']}"
             )
 
         cluster_dir = self.get_cluster_output_dir(prepared_config["cluster_name"])
@@ -107,7 +132,7 @@ class ClusterConfig:
 
         # Generate a resource name
         random_name = self.generate_random_name()
-        prepared_config["resource_name"] = f"{cloud}_{random_name}"
+        prepared_config["resource_name"] = f"{cloud}-{random_name}"
         logger.debug(f"Resource name: {prepared_config['resource_name']}")
 
         # Create the cluster directory