Skip to content

network changes #150

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.

Sign up for GitHub

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

Closed
DaMandal0rian wants to merge 2 commits into from
Closed

network changes #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3fc32
network changes
DaMandal0rian Jun 24, 2023
bb643e0
Prepare Gemini-3e
DaMandal0rian Jun 24, 2023
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
20 changes: 10 additions & 10 deletions aws/devnet/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ module "devnet" {
network_name = "devnet"
bootstrap-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
genesis-hash = "8a94e770a50298516444025b8c075034f8be7745812358d25189175fe504fc66"
genesis-hash = "2e45c5cbc42f10e3faaaaa44618927ee1403a08c9625d70891ae3f2fecc35e0b"
dsn-listen-port = 50000
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
Expand All @@ -24,7 +24,7 @@ module "devnet" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
node-dsn-port = 30433
Expand All @@ -34,11 +34,11 @@ module "devnet" {

rpc-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
domain-prefix = "rpc"
reserved-only = false
prune = false
Expand All @@ -53,7 +53,7 @@ module "devnet" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
domain-prefix = "domain"
reserved-only = false
prune = false
Expand All @@ -67,16 +67,16 @@ module "devnet" {

farmer-node-config = {
instance-type = var.instance_type
deployment-version = 0
deployment-version = 1
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "snapshot-2023-jun-08-2"
docker-tag = "snapshot-2023-jun-22-4"
reserved-only = false
prune = false
plot-size = "10G"
reward-address = var.farmer_reward_address
force-block-production = true
force-block-production = false
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
Expand Down
10 changes: 5 additions & 5 deletions aws/gemini-3d/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
genesis-hash = ""
Expand All @@ -24,7 +24,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
node-dsn-port = 30433
Expand All @@ -38,7 +38,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
domain-prefix = "rpc"
reserved-only = false
prune = false
Expand All @@ -53,7 +53,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
domain-prefix = "domain"
reserved-only = false
prune = false
Expand All @@ -71,7 +71,7 @@ module "gemini-3d" {
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3d-2023-may-23"
docker-tag = "gemini-3d-2023-jun-14"
reserved-only = false
prune = false
plot-size = "10G"
Expand Down
9 changes: 9 additions & 0 deletions aws/gemini-3e/backend.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
terraform {
cloud {
organization = "subspace-sre"

workspaces {
name = "gemini-3e"
}
}
}
20 changes: 20 additions & 0 deletions aws/gemini-3e/common.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
variable "datadog_api_key" {
description = "Datadog API Key"
}

variable "cloudflare_email" {
type = string
description = "cloudflare email address"
}

variable "cloudflare_api_token" {
type = string
description = "cloudflare api token"
}

variable "netdata_token" {
default = ""
type = string
sensitive = true

}
92 changes: 92 additions & 0 deletions aws/gemini-3e/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
module "gemini-3e" {
source = "../network-primitives"
path_to_scripts = "../network-primitives/scripts"
network_name = "gemini-3e"
bootstrap-node-config = {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3e-2023-jun-26"
reserved-only = false
prune = false
genesis-hash = ""
dsn-listen-port = 50000
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
}

full-node-config = {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3e-2023-jun-26"
reserved-only = false
prune = false
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
}

rpc-node-config = {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3e-2023-jun-26"
domain-prefix = "rpc"
reserved-only = false
prune = false
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
}

domain-node-config = {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3e-2023-jun-26"
domain-prefix = "domain"
reserved-only = false
prune = false
node-dsn-port = 30434
enable-domains = true
domain-id = var.domain_id
domain-labels = var.domain_labels
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type
}

farmer-node-config = {
instance-type = var.instance_type
deployment-version = 0
regions = var.aws_region
instance-count = var.instance_count
docker-org = "subspace"
docker-tag = "gemini-3e-2023-jun-26"
reserved-only = false
prune = false
plot-size = "10G"
reward-address = var.farmer_reward_address
force-block-production = false
node-dsn-port = 30433
disk-volume-size = var.disk_volume_size
disk-volume-type = var.disk_volume_type

}

cloudflare_api_token = var.cloudflare_api_token
cloudflare_email = var.cloudflare_email
datadog_api_key = var.datadog_api_key
access_key = var.access_key
secret_key = var.secret_key

}
20 changes: 20 additions & 0 deletions aws/gemini-3e/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//output
output "full-node-ipv4-addresses" {
value = module.gemini-3d.full_node_public_ip
description = "Full node IPv4 Addresses"
}

output "farmer-node-ipv4-addresses" {
value = module.gemini-3d.farmer_node_public_ip
description = "Farmer node IPv4 Addresses"
}

output "bootstrap-node-ipv4-addresses" {
value = module.gemini-3d.bootstrap_node_public_ip
description = "Bootstrap node IPv4 Addresses"
}

output "domain-node-ipv4-addresses" {
value = module.gemini-3d.domain_node_public_ip
description = "Domain node IPv4 Addresses"
}
16 changes: 16 additions & 0 deletions aws/gemini-3e/terrafrom.tfvars.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# AWS access key used to create infrastructure
access_key = ""
# AWS secret key used to create AWS infrastructure
secret_key = ""
aws_key_name = "deployer"
ssh_user = "ubuntu"
instance_type = "m6a.xlarge"
instance_count = 1
disk_volume_size = 200
private_key_path = "~/.ssh/deployer.pem"
aws_region = ["us-east-1"]
azs = ["us-east-1a"]
cloudflare_email = ""
cloudflare_api_token = ""
datadog_api_key = ""
farmer_reward_address = ""
89 changes: 89 additions & 0 deletions aws/gemini-3e/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
variable "farmer_reward_address" {
description = "Farmer's reward address"
type = string
}

variable "domain_id" {
description = "Domain ID"
type = list(number)
default = [1, 2, 3]
}

variable "domain_labels" {
description = "Tag of the domain to run"
type = list(string)
default = ["system", "payments", "evm"]
}

variable "instance_type" {
default = "m6a.xlarge"
type = string
}

variable "vpc_id" {
default = "default"
type = string
}

variable "azs" {
type = list(string)
description = "Availability Zones"
default = ["us-east-1a", "us-east-1b"]
}

variable "instance_count" {
type = number
default = 1
}

variable "aws_region" {
description = "aws region"
type = list(string)
default = ["us-east-1"]
}

variable "public_subnet_cidrs" {
type = list(string)
description = "Public Subnet CIDR values"
default = ["172.31.3.0/24"]
}

variable "private_subnet_cidrs" {
type = list(string)
description = "Private Subnet CIDR values"
default = ["172.31.4.0/24"]
}

variable "disk_volume_size" {
type = number
}

variable "disk_volume_type" {
type = string
default = "gp3"
}

variable "secret_key" {
type = string
sensitive = true
}

variable "access_key" {
type = string
sensitive = true
}

variable "aws_key_name" {
default = "deployer"
type = string
}

variable "ssh_user" {
default = "ubuntu"
type = string
}

variable "private_key_path" {
type = string
default = "~/.ssh/deployer.pem"
}
2 changes: 1 addition & 1 deletion aws/network-primitives/domain_node_provisioner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ resource "null_resource" "inject-domain-keystore" {

provisioner "remote-exec" {
inline = [
"sudo docker cp ~/subspace/keystore/. subspace-archival-node-1:/var~/subspace/keystore/"
"sudo docker cp ~/subspace/keystore/. subspace-archival-node-1:/var/subspace/keystore/"
]
}
}
2 changes: 1 addition & 1 deletion aws/network-primitives/rpc_node_provisioner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ resource "null_resource" "inject-keystore" {

provisioner "remote-exec" {
inline = [
"sudo docker cp ~/subspace/keystore/. subspace-archival-node-1:/var~/subspace/keystore/"
"sudo docker cp ~/subspace/keystore/. subspace-archival-node-1:/var/subspace/keystore/"
]
}
}
Loading