Merge branch 'ENG-594_v116_release' into 'develop'

ENG-594: 1.16.0 validation

Closes ENG-594

See merge request kasm-technologies/internal/terraform!16
This commit is contained in:
Bryan Scarbrough 2024-09-26 16:03:15 +00:00
commit a41ff96668
16 changed files with 22 additions and 19 deletions

View file

@ -19,4 +19,4 @@ Administators should review the projects and add additional customizations and s
# GCP
- [GCP Requirements](gcp/README.md)
- [Multi-Server Single Region](gcp/MULTI_SERVER.md)
- [Multi-Region](gcp/MULTI_REGION.md)
- [Multi-Region](gcp/MULTI_REGION.md)

View file

@ -16,7 +16,7 @@ manager_token = "changeme"
service_registration_token = "changeme"
## Kasm download URL
kasm_build = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
kasm_build = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"
## VM Public Access subnets
web_access_cidrs = ["0.0.0.0/0"]
@ -84,5 +84,5 @@ aws_default_tags = {
Deployed_by = "Terraform"
Deployment_type = "Multi-Region"
Service_name = "Kasm Workspaces"
Kasm_version = "1.15"
Kasm_version = "1.16"
}

View file

@ -15,7 +15,7 @@ wget "${kasm_build_url}" -O kasm_workspaces.tar.gz
tar -xf kasm_workspaces.tar.gz
echo "Checking for Kasm DB and Redis..."
apt-get update && apt-get install -y netcat
apt-get update && apt-get install -y netcat-openbsd
while ! nc -w 1 -z "${db_ip}" 5432; do
echo "Database not ready..."
sleep 5

View file

@ -15,7 +15,7 @@ wget ${kasm_build_url} -O kasm_workspaces.tar.gz
tar -xf kasm_workspaces.tar.gz
echo "Checking for Kasm DB and Redis..."
apt-get update && apt-get install -y netcat
apt-get update && apt-get install -y netcat-openbsd
while ! nc -w 1 -z ${db_ip} 5432; do
echo "Database not ready..."
sleep 5

View file

@ -50,12 +50,12 @@ manager_token = "changeme"
service_registration_token = "changeme"
## Kasm download URL
kasm_build = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
kasm_build = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"
## Default tags for all AWS resources
aws_default_tags = {
Deployed_by = "Terraform"
Deployment_type = "Multi-Server"
Service_name = "Kasm Workspaces"
Kasm_version = "1.15"
Kasm_version = "1.16"
}

View file

@ -78,7 +78,7 @@ No resources.
| <a name="input_kasm_build_url"></a> [kasm\_build\_url](#input\_kasm\_build\_url) | The Kasm build file to install | `string` | `"https://kasm-static-content.s3.amazonaws.com/kasm_release_1.12.0.d4fd8a.tar.gz"` | no |
| <a name="input_project_name"></a> [project\_name](#input\_project\_name) | The name of the project/deployment/company eg (acme). | `string` | n/a | yes |
| <a name="input_ssh_key_fingerprints"></a> [ssh\_key\_fingerprints](#input\_ssh\_key\_fingerprints) | Keys used for sshing into kasm hosts | `list(string)` | n/a | yes |
| <a name="input_swap_size"></a> [swap\_size](#input\_swap\_size) | The amount of swap (in MB) to configure inside the compute instances | `number` | `2048` | no |
| <a name="input_swap_size"></a> [swap\_size](#input\_swap\_size) | The amount of swap (in GB) to configure inside the compute instances | `number` | n/a | yes |
| <a name="input_user_password"></a> [user\_password](#input\_user\_password) | The default password to be used for the default user@kasm.local account. Only use alphanumeric characters | `string` | `"changeme"` | no |
| <a name="input_vpc_subnet_cidr"></a> [vpc\_subnet\_cidr](#input\_vpc\_subnet\_cidr) | VPC Subnet CIDR where you wish to deploy Kasm | `string` | `"10.0.0.0/24"` | no |

View file

@ -21,4 +21,4 @@ allow_ssh_cidrs = ["0.0.0.0/0"]
allow_kasm_web_cidrs = ["0.0.0.0/0"]
## Kasm download URL
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"

View file

@ -25,7 +25,7 @@ variable "do_domain_name" {
type = string
validation {
condition = can(regex("^[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}", var.do_domain_name))
condition = can(regex("^[a-z0-9_-]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,6}", var.do_domain_name))
error_message = "There are invalid characters in the do_domain_name - it must be a valid domain name."
}
}

1
gcp/gcp_credentials.json Normal file
View file

@ -0,0 +1 @@
replaceme

View file

@ -24,8 +24,8 @@ show_passwords = true
kasm_domain_name = "example.kasmweb.com"
kasm_project_name = ""
deployment_type = "Multi-Region" # Valid values Multi-Region or Multi-Server
kasm_version = "1.15.0"
kasm_download_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
kasm_version = "1.16.0"
kasm_download_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"
## Kasm VM instance configurations
# Webapp

View file

@ -13,7 +13,7 @@ swapon /mnt/kasm.swap
echo '/mnt/kasm.swap swap swap defaults 0 0' | tee -a /etc/fstab
## Install useful packages
apt update && apt install iputils-ping dnsutils netcat -y
apt update && apt install iputils-ping dnsutils netcat-openbsd -y
## Test Database connectivity before installing
while ! nc -w 1 -z ${DB_PRIVATE_IP} 5432

View file

@ -102,7 +102,7 @@ No resources.
| <a name="input_project_name"></a> [project\_name](#input\_project\_name) | The name of the deployment (e.g dev, staging). A short single word | `string` | n/a | yes |
| <a name="input_region"></a> [region](#input\_region) | The OCI Region eg: (us-ashburn-1) | `string` | n/a | yes |
| <a name="input_ssh_authorized_keys"></a> [ssh\_authorized\_keys](#input\_ssh\_authorized\_keys) | The SSH Public Keys to be installed on the OCI compute instance | `string` | n/a | yes |
| <a name="input_swap_size"></a> [swap\_size](#input\_swap\_size) | The amount of swap (in MB) to configure inside the compute instances | `number` | n/a | yes |
| <a name="input_swap_size"></a> [swap\_size](#input\_swap\_size) | The amount of swap (in GB) to configure inside the compute instances | `number` | n/a | yes |
| <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | The Tenancy OCID. | `string` | n/a | yes |
| <a name="input_user_ocid"></a> [user\_ocid](#input\_user\_ocid) | The User OCID. | `string` | n/a | yes |
| <a name="input_user_password"></a> [user\_password](#input\_user\_password) | The standard (non administrator) user password. No special characters | `string` | n/a | yes |
@ -110,7 +110,9 @@ No resources.
## Outputs
No outputs.
| Name | Description |
|------|-------------|
| <a name="output_ssh_key_info"></a> [ssh\_key\_info](#output\_ssh\_key\_info) | SSH Keys to use with Kasm Deployment |
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
# Detailed Terraform Deployment Diagram

View file

@ -1,4 +1,4 @@
module "v" {
module "kasm" {
source = "./module"
oci_domain_name = var.oci_domain_name
project_name = var.project_name

View file

@ -40,4 +40,4 @@ kasm_server_memory = 2
kasm_server_hdd_size = 120
## Kasm download URL
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"

View file

@ -17,7 +17,7 @@ wget ${kasm_build_url} -O kasm_workspaces.tar.gz
tar -xf kasm_workspaces.tar.gz
echo "Checking for Kasm DB and Redis..."
apt-get update && apt-get install -y netcat
apt-get update && apt-get install -y netcat-openbsd
while ! nc -w 1 -z ${db_ip} 5432; do
echo "Database not ready..."
sleep 5

View file

@ -1,8 +1,8 @@
## Kasm deployment settings
oci_domain_name = "kasm.contoso.com"
project_name = "contoso"
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.15.0.06fdc8.tar.gz"
vcn_subnet_cidr = "10.0.0.0/16"
kasm_build_url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"
## OCI Authentication variables
tenancy_ocid = ""