add auto domain to infra

add auto add DNS records minor fixes domain label and ID add operator ID decouple 2 separate domains for evm and autoid add more changes to domains Fix Fix traefik labels and remove auto extra chains in configs fix merge conflict
autonomys · May 23, 2024 · cd5fdc8 · cd5fdc8
1 parent 9d5caae
commit cd5fdc8
Show file tree

Hide file tree

Showing 21 changed files with 1,093 additions and 60 deletions.
diff --git a/resources/devnet/main.tf b/resources/devnet/main.tf
@@ -37,6 +37,23 @@ module "devnet" {
     disk-volume-type   = var.disk_volume_type
   }
 
+  bootstrap-node-autoid-config = {
+    instance-type      = var.instance_type["autoid_bootstrap"]
+    deployment-version = 1
+    regions            = var.aws_region
+    instance-count     = var.instance_count["autoid_bootstrap"]
+    docker-org         = "subspace"
+    docker-tag         = "snapshot-2024-jan-23-2"
+    reserved-only      = false
+    prune              = false
+    genesis-hash       = ""
+    dsn-listen-port    = 30533
+    node-dsn-port      = 30433
+    operator-port      = 30334
+    disk-volume-size   = var.disk_volume_size
+    disk-volume-type   = var.disk_volume_type
+  }
+
   full-node-config = {
     instance-type      = var.instance_type["full"]
     deployment-version = 0
@@ -73,7 +90,25 @@ module "devnet" {
     instance-count     = var.instance_count["domain"]
     docker-org         = "subspace"
     docker-tag         = "snapshot-2024-jan-23-2"
-    domain-prefix      = "domain"
+    domain-prefix      = ["nova"]
+    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
+  }
+
+  autoid-node-config = {
+    instance-type      = var.instance_type["autoid"]
+    deployment-version = 0
+    regions            = var.aws_region
+    instance-count     = var.instance_count["autoid"]
+    docker-org         = "subspace"
+    docker-tag         = "snapshot-2024-jan-23-2"
+    domain-prefix      = ["autoid"]
     reserved-only      = false
     prune              = false
     node-dsn-port      = 30434

diff --git a/resources/devnet/outputs.tf b/resources/devnet/outputs.tf
@@ -19,6 +19,11 @@ output "bootstrap-node-evm-ipv4-addresses" {
   description = "EVM Bootstrap node IPv4 Addresses"
 }
 
+output "bootstrap-node-autoid-ipv4-addresses" {
+  value       = module.devnet.bootstrap_node_autoid_public_ip
+  description = "AutoID Bootstrap node IPv4 Addresses"
+}
+
 output "rpc-node-ipv4-addresses" {
   value       = module.devnet.rpc_node_public_ip
   description = "Domain node IPv4 Addresses"
@@ -28,3 +33,8 @@ output "domain-node-ipv4-addresses" {
   value       = module.devnet.domain_node_public_ip
   description = "Domain node IPv4 Addresses"
 }
+
+output "autoid-node-ipv4-addresses" {
+  value       = module.devnet.autoid_node_public_ip
+  description = "AutoID node IPv4 Addresses"
+}
diff --git a/resources/devnet/variables.tf b/resources/devnet/variables.tf
@@ -6,13 +6,13 @@ variable "farmer_reward_address" {
 variable "domain_id" {
   description = "Domain ID"
   type        = list(number)
-  default     = [0]
+  default     = [0, 1]
 }
 
 variable "domain_labels" {
   description = "Tag of the domain to run"
   type        = list(string)
-  default     = ["evm"]
+  default     = ["nova", "autoid"]
 }
 
 variable "instance_type" {
@@ -21,9 +21,11 @@ variable "instance_type" {
     bootstrap     = "c6a.2xlarge"
     rpc           = "m6a.xlarge"
     domain        = "m6a.xlarge"
+    autoid        = "m6a.xlarge"
     full          = "m6a.xlarge"
     farmer        = "c7i.2xlarge"
     evm_bootstrap = "m6a.xlarge"
+    autoid_bootstrap = "m6a.xlarge"
   }
 }
 
@@ -48,9 +50,11 @@ variable "instance_count" {
     bootstrap     = 2
     rpc           = 1
     domain        = 1
+    autoid        = 1
     full          = 0
     farmer        = 1
     evm_bootstrap = 1
+    autoid_bootstrap = 1
   }
 }
 

diff --git a/resources/gemini-3h/main.tf b/resources/gemini-3h/main.tf
@@ -9,7 +9,7 @@ module "gemini-3h" {
     regions            = var.aws_region
     instance-count     = var.instance_count["bootstrap"]
     docker-org         = "subspace"
-    docker-tag         = "gemini-3h-2024-mar-29"
+    docker-tag         = "gemini-3h-2024-may-06"
     reserved-only      = false
     prune              = false
     genesis-hash       = "0c121c75f4ef450f40619e1fca9d1e8e7fbabc42c895bc4790801e85d5a91c34"
@@ -25,7 +25,24 @@ module "gemini-3h" {
     regions            = var.aws_region
     instance-count     = var.instance_count["evm_bootstrap"]
     docker-org         = "subspace"
-    docker-tag         = "gemini-3h-2024-mar-29"
+    docker-tag         = "gemini-3h-2024-may-06"
+    reserved-only      = false
+    prune              = false
+    genesis-hash       = "0c121c75f4ef450f40619e1fca9d1e8e7fbabc42c895bc4790801e85d5a91c34"
+    dsn-listen-port    = 30533
+    node-dsn-port      = 30433
+    operator-port      = 30334
+    disk-volume-size   = var.disk_volume_size
+    disk-volume-type   = var.disk_volume_type
+  }
+
+  bootstrap-node-autoid-config = {
+    instance-type      = var.instance_type["autoid_bootstrap"]
+    deployment-version = 0
+    regions            = var.aws_region
+    instance-count     = var.instance_count["autoid_bootstrap"]
+    docker-org         = "subspace"
+    docker-tag         = "gemini-3h-2024-may-06"
     reserved-only      = false
     prune              = false
     genesis-hash       = "0c121c75f4ef450f40619e1fca9d1e8e7fbabc42c895bc4790801e85d5a91c34"
@@ -42,7 +59,7 @@ module "gemini-3h" {
     regions            = var.aws_region
     instance-count     = var.instance_count["full"]
     docker-org         = "subspace"
-    docker-tag         = "gemini-3h-2024-mar-29"
+    docker-tag         = "gemini-3h-2024-may-06"
     reserved-only      = false
     prune              = false
     node-dsn-port      = 30433
@@ -56,7 +73,7 @@ module "gemini-3h" {
     regions            = var.aws_region
     instance-count     = var.instance_count["rpc"]
     docker-org         = "subspace"
-    docker-tag         = "gemini-3h-2024-mar-29"
+    docker-tag         = "gemini-3h-2024-may-06"
     domain-prefix      = "rpc"
     reserved-only      = false
     prune              = false
@@ -71,8 +88,8 @@ module "gemini-3h" {
     regions            = var.aws_region
     instance-count     = var.instance_count["domain"]
     docker-org         = "subspace"
-    docker-tag         = "gemini-3h-2024-mar-29"
-    domain-prefix      = "nova"
+    docker-tag         = "gemini-3h-2024-may-06"
+    domain-prefix      = ["nova"]
     reserved-only      = false
     prune              = false
     node-dsn-port      = 30433
@@ -83,13 +100,31 @@ module "gemini-3h" {
     disk-volume-type   = var.disk_volume_type
   }
 
+  autoid-node-config = {
+    instance-type      = var.instance_type["autoid"]
+    deployment-version = 0
+    regions            = var.aws_region
+    instance-count     = var.instance_count["autoid"]
+    docker-org         = "subspace"
+    docker-tag         = "gemini-3h-2024-may-06"
+    domain-prefix      = ["autoid"]
+    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["farmer"]
     deployment-version     = 0
     regions                = var.aws_region
     instance-count         = var.instance_count["farmer"]
     docker-org             = "subspace"
-    docker-tag             = "gemini-3h-2024-mar-29"
+    docker-tag             = "gemini-3h-2024-may-06"
     reserved-only          = false
     prune                  = false
     plot-size              = "100G"

diff --git a/resources/gemini-3h/outputs.tf b/resources/gemini-3h/outputs.tf
@@ -19,11 +19,21 @@ output "bootstrap-node-evm-ipv4-addresses" {
   description = "EVM Bootstrap node IPv4 Addresses"
 }
 
+output "bootstrap-node-autoid-ipv4-addresses" {
+  value       = module.gemini-3h.bootstrap_node_autoid_public_ip
+  description = "AutoID Bootstrap node IPv4 Addresses"
+}
+
 output "domain-node-ipv4-addresses" {
   value       = module.gemini-3h.domain_node_public_ip
   description = "Domain node IPv4 Addresses"
 }
 
+output "autoid-node-ipv4-addresses" {
+  value       = module.gemini-3h.autoid_node_public_ip
+  description = "AutoID node IPv4 Addresses"
+}
+
 output "rpc-node-ipv4-addresses" {
   value       = module.gemini-3h.rpc_node_public_ip
   description = "RPC node IPv4 Addresses"

diff --git a/resources/gemini-3h/variables.tf b/resources/gemini-3h/variables.tf
@@ -13,14 +13,14 @@ variable "farmer_reward_address" {
 variable "domain_id" {
   description = "Domain ID"
   type        = list(number)
-  default     = [0]
+  default     = [0, 1]
 }
 
 //todo change this to a map
 variable "domain_labels" {
   description = "Tag of the domain to run"
   type        = list(string)
-  default     = ["evm"]
+  default     = ["nova, "autoid"]
 }
 
 variable "instance_type" {
@@ -29,9 +29,11 @@ variable "instance_type" {
     bootstrap     = "c7a.4xlarge"
     rpc           = "m6a.xlarge"
     domain        = "m6a.xlarge"
+    autoid        = "m6a.xlarge"
     full          = "c7a.2xlarge"
     farmer        = "c7a.2xlarge"
     evm_bootstrap = "c7a.xlarge"
+    autoid_bootstrap = "c7a.xlarge"
   }
 }
 
@@ -56,6 +58,7 @@ variable "instance_count" {
     bootstrap     = 2
     rpc           = 2
     domain        = 2
+    autoid        = 2
     full          = 1
     farmer        = 0
     evm_bootstrap = 1