From dff79b3185356177e3ef7c4458c102880d8c1337 Mon Sep 17 00:00:00 2001 From: ghe0 Date: Fri, 4 Jul 2025 00:18:20 +0300 Subject: [PATCH] adapt scripts to the new CLI --- ansible-postgres/create_vms.sh | 4 ++-- gitea/deploy_gitea.sh | 2 +- kubernetes/create_vms.sh | 10 +++++----- overlay-network/setup_wg_mesh.sh | 2 +- overlay-network/vm_configs/template-1.yaml | 8 ++++---- overlay-network/vm_configs/template-2.yaml | 9 ++++----- overlay-network/vm_configs/template-3.yaml | 8 ++++---- overlay-network/vm_configs/template-n.yaml | 6 +++--- overlay-network/vm_configs/template-x.yaml | 8 ++++---- wireguard-bastion/cali-bastion.yaml | 6 +++--- wireguard-bastion/cali-protected.yaml | 6 +++--- wireguard-bastion/vanc-bastion.yaml | 6 +++--- wireguard-bastion/vanc-protected.yaml | 6 +++--- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/ansible-postgres/create_vms.sh b/ansible-postgres/create_vms.sh index b461f80..164a137 100755 --- a/ansible-postgres/create_vms.sh +++ b/ansible-postgres/create_vms.sh @@ -7,10 +7,10 @@ export FORMAT=YAML mkdir -p tmp detee-cli vm deploy --location US --hostname postgres-writer --public-ip \ - --distro ubuntu --memory 2000 --vcpus 2 --disk 15 > tmp/writer.yaml && + --distro ubuntu --memory 2 --vcpus 2 --disk 15 > tmp/writer.yaml && echo "Postgres writer created in the US" & detee-cli vm deploy --location Canada --hostname postgres-reader --public-ip \ - --distro ubuntu --memory 2000 --vcpus 2 --disk 15 > tmp/reader.yaml && + --distro ubuntu --memory 2 --vcpus 2 --disk 15 > tmp/reader.yaml && echo "Postgres reader created in Canada" & wait diff --git a/gitea/deploy_gitea.sh b/gitea/deploy_gitea.sh index c00dfd6..7b60ac8 100755 --- a/gitea/deploy_gitea.sh +++ b/gitea/deploy_gitea.sh @@ -6,7 +6,7 @@ hostname=gitea-example set -e export FORMAT=YAML -detee-cli vm deploy --public-ip --location Random --hostname $hostname > vm_info.tmp +detee-cli vm deploy --public-ip --location Any --hostname $hostname > vm_info.tmp vm_uuid=$(grep 'uuid:' vm_info.tmp | awk '{ print $2 }') vm_ip=$(grep 'ip:' vm_info.tmp | awk '{ print $2 }') key_path=$(grep 'key_path:' vm_info.tmp | awk '{ print $2 }') diff --git a/kubernetes/create_vms.sh b/kubernetes/create_vms.sh index e0c070f..a541492 100755 --- a/kubernetes/create_vms.sh +++ b/kubernetes/create_vms.sh @@ -6,31 +6,31 @@ set -e mkdir -p tmp detee-cli vm deploy --hostname k3s-master --vcpus 2 \ - --memory 3000 --disk 20 --location Random --public-ip | + --memory 3 --disk 20 --location Any --public-ip | tail -1 > tmp/master_ssh_command && echo "k3s-master successfully created" & sleep 1 detee-cli vm deploy --hostname k3s-node-1 --vcpus 2 \ - --memory 3000 --disk 20 --location Random --public-ip | + --memory 3 --disk 20 --location Any --public-ip | tail -1 > tmp/node1_ssh_command && echo "k3s-node-1 successfully created" & sleep 1 detee-cli vm deploy --hostname k3s-node-2 --vcpus 2 \ - --memory 3000 --disk 20 --location Random --public-ip | + --memory 3 --disk 20 --location Any --public-ip | tail -1 > tmp/node2_ssh_command && echo "k3s-node-2 successfully created" & sleep 1 detee-cli vm deploy --hostname k3s-node-3 --vcpus 2 \ - --memory 3000 --disk 20 --location Random --public-ip | + --memory 3 --disk 20 --location Any --public-ip | tail -1 > tmp/node3_ssh_command && echo "k3s-node-3 successfully created" & sleep 1 detee-cli vm deploy --hostname k3s-node-4 --vcpus 2 \ - --memory 3000 --disk 20 --location Random --public-ip | + --memory 3 --disk 20 --location Any --public-ip | tail -1 > tmp/node4_ssh_command && echo "k3s-node-4 successfully created" & diff --git a/overlay-network/setup_wg_mesh.sh b/overlay-network/setup_wg_mesh.sh index 2abccf0..8ed1994 100755 --- a/overlay-network/setup_wg_mesh.sh +++ b/overlay-network/setup_wg_mesh.sh @@ -31,7 +31,7 @@ new_vm() { local vm_inspect_data="tmp/vms/${vm_name}_inspect.yaml" vm_node_ip=$(grep 'ip: ' $vm_install_data | awk '{ print $2 }') - vm_port=$(grep exposed_ports -A 1 $vm_inspect_data | tail -1 | grep -oE "[0-9]*") + vm_port=$(grep 'host_port: ' $vm_inspect_data | head -1 | awk '{ print $3 }' ) wg_privkey=$(wg genkey) wg_pubkey=$(echo $wg_privkey | wg pubkey) diff --git a/overlay-network/vm_configs/template-1.yaml b/overlay-network/vm_configs/template-1.yaml index afeda63..949a7a4 100644 --- a/overlay-network/vm_configs/template-1.yaml +++ b/overlay-network/vm_configs/template-1.yaml @@ -2,11 +2,11 @@ hostname: template-1 hours: 2 -price: 20000 +price: 1000 location: country: "FR" ipv4: !PublishPorts [ ] public_ipv6: false -vcpus: 4 -memory_mb: 8000 -disk_size_gb: 60 +vcpus: 2 +memory_gib: 4 +disk_size_gib: 10 diff --git a/overlay-network/vm_configs/template-2.yaml b/overlay-network/vm_configs/template-2.yaml index add70aa..2197314 100644 --- a/overlay-network/vm_configs/template-2.yaml +++ b/overlay-network/vm_configs/template-2.yaml @@ -2,11 +2,10 @@ hostname: template-2 hours: 2 -price: 20000 +price: 1000 location: - country: "GB" ipv4: !PublishPorts [ ] public_ipv6: false -vcpus: 4 -memory_mb: 8000 -disk_size_gb: 60 +vcpus: 2 +memory_gib: 4 +disk_size_gib: 10 diff --git a/overlay-network/vm_configs/template-3.yaml b/overlay-network/vm_configs/template-3.yaml index a674506..74c768f 100644 --- a/overlay-network/vm_configs/template-3.yaml +++ b/overlay-network/vm_configs/template-3.yaml @@ -2,11 +2,11 @@ hostname: template-3 hours: 2 -price: 20000 +price: 1000 location: country: "US" ipv4: !PublishPorts [ ] public_ipv6: false -vcpus: 4 -memory_mb: 8000 -disk_size_gb: 60 +vcpus: 2 +memory_gib: 4 +disk_size_gib: 10 diff --git a/overlay-network/vm_configs/template-n.yaml b/overlay-network/vm_configs/template-n.yaml index c43d327..b228ad5 100644 --- a/overlay-network/vm_configs/template-n.yaml +++ b/overlay-network/vm_configs/template-n.yaml @@ -2,11 +2,11 @@ hostname: template-n hours: 2 -price: 20000 +price: 1000 location: country: "US" ipv4: !PublishPorts [ ] public_ipv6: false vcpus: 2 -memory_mb: 4400 -disk_size_gb: 20 +memory_gib: 4 +disk_size_gib: 10 diff --git a/overlay-network/vm_configs/template-x.yaml b/overlay-network/vm_configs/template-x.yaml index 1449a72..f3ecfc6 100644 --- a/overlay-network/vm_configs/template-x.yaml +++ b/overlay-network/vm_configs/template-x.yaml @@ -2,11 +2,11 @@ hostname: template-x hours: 2 -price: 20000 +price: 1000 location: country: "FR" ipv4: !PublishPorts [ ] public_ipv6: false -vcpus: 4 -memory_mb: 8000 -disk_size_gb: 60 +vcpus: 2 +memory_gib: 4 +disk_size_gib: 10 diff --git a/wireguard-bastion/cali-bastion.yaml b/wireguard-bastion/cali-bastion.yaml index 46a8d13..7c78534 100644 --- a/wireguard-bastion/cali-bastion.yaml +++ b/wireguard-bastion/cali-bastion.yaml @@ -2,11 +2,11 @@ hostname: cali-bastion hours: 5 -price: 20000 +price: 1000 location: region: "California" ipv4: !PublishPorts [ 1337 ] public_ipv6: false vcpus: 2 -memory_mb: 2000 -disk_size_gb: 20 +memory_gib: 2 +disk_size_gib: 20 diff --git a/wireguard-bastion/cali-protected.yaml b/wireguard-bastion/cali-protected.yaml index 21b43c6..73c68c6 100644 --- a/wireguard-bastion/cali-protected.yaml +++ b/wireguard-bastion/cali-protected.yaml @@ -2,11 +2,11 @@ hostname: cali-protected hours: 5 -price: 20000 +price: 1000 location: region: "California" ipv4: !PublishPorts [ ] public_ipv6: false vcpus: 2 -memory_mb: 2000 -disk_size_gb: 20 +memory_gib: 2 +disk_size_gib: 20 diff --git a/wireguard-bastion/vanc-bastion.yaml b/wireguard-bastion/vanc-bastion.yaml index 1393bae..48d5eaa 100644 --- a/wireguard-bastion/vanc-bastion.yaml +++ b/wireguard-bastion/vanc-bastion.yaml @@ -2,11 +2,11 @@ hostname: vanc-bastion hours: 5 -price: 20000 +price: 1000 location: city: "Montréal" ipv4: !PublishPorts [ 1337 ] public_ipv6: false vcpus: 2 -memory_mb: 2000 -disk_size_gb: 20 +memory_gib: 2 +disk_size_gib: 20 diff --git a/wireguard-bastion/vanc-protected.yaml b/wireguard-bastion/vanc-protected.yaml index 82c60fd..d070806 100644 --- a/wireguard-bastion/vanc-protected.yaml +++ b/wireguard-bastion/vanc-protected.yaml @@ -2,11 +2,11 @@ hostname: vanc-protected hours: 5 -price: 20000 +price: 1000 location: city: "Montréal" ipv4: !PublishPorts [ ] public_ipv6: false vcpus: 2 -memory_mb: 2000 -disk_size_gb: 20 +memory_gib: 2 +disk_size_gib: 20