From 7cffb049552e00af953c4537efaddcde7102723f Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 7 Jan 2025 10:59:00 -0500 Subject: [PATCH 1/5] chore: move portal to standard-next-next --- layers/portal/portal.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/portal/portal.tf b/layers/portal/portal.tf index 2b8e067..a554262 100644 --- a/layers/portal/portal.tf +++ b/layers/portal/portal.tf @@ -28,7 +28,7 @@ module "portal" { count = local.portal_instance_count name = "pinner-portal" - image = "ghcr.io/lumeweb/akash-portal:standard-latest" + image = "ghcr.io/lumeweb/akash-portal:standard-next-next" domain = local.base_domain portal_name = var.portal_name From 1d97100f58ac76963e70ced7b703e5ba156456fd Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 7 Jan 2025 14:18:38 -0500 Subject: [PATCH 2/5] refactor: update renterd s3 address --- layers/core/outputs.tf | 2 +- layers/core/renterd.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/core/outputs.tf b/layers/core/outputs.tf index 7e13256..ae91dff 100644 --- a/layers/core/outputs.tf +++ b/layers/core/outputs.tf @@ -28,7 +28,7 @@ output "renterd_endpoint" { output "renterd_s3_endpoint" { description = "Renterd service endpoint" - value = module.renterd.s3_fqdn + value = "${module.renterd.dns_fqdn}:${module.renterd.s3_port}" } output "base_domain" { diff --git a/layers/core/renterd.tf b/layers/core/renterd.tf index 281261a..aaba57d 100644 --- a/layers/core/renterd.tf +++ b/layers/core/renterd.tf @@ -1,5 +1,5 @@ module "renterd" { - source = "git::https://github.com/LumeWeb/terraform-modules.git//modules/compute/renterd?ref=v0.1.1" + source = "git::https://github.com/LumeWeb/terraform-modules.git//modules/compute/renterd?ref=develop" name = "pinner-core-renterd" From 59b58dad19011de78e16fc7bb422a0942463245c Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 7 Jan 2025 14:23:33 -0500 Subject: [PATCH 3/5] chore: add env mapping for TF_VAR_renterd_seed --- digger.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/digger.yml b/digger.yml index 67cc53a..a071ec1 100644 --- a/digger.yml +++ b/digger.yml @@ -25,6 +25,8 @@ workflows: value: "us-east-1" - name: TF_VAR_allowed_providers value_from: PROVIDER_LIST + - name: TF_VAR_renterd_seed + value_from: RENTERD_SEED plan: steps: - run: | From 3b1ea80fd8dfb954ae616094365306701ed6c9f1 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 7 Jan 2025 14:59:47 -0500 Subject: [PATCH 4/5] refactor: use 8080 for s3 --- layers/core/renterd.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/core/renterd.tf b/layers/core/renterd.tf index aaba57d..c68b99c 100644 --- a/layers/core/renterd.tf +++ b/layers/core/renterd.tf @@ -23,7 +23,7 @@ module "renterd" { network = { http_port = 80 - s3_port = 80 + s3_port = 8080 enable_ssl = false } From fd74c4208bdb9c24587f0abf04d66a466691168e Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Thu, 9 Jan 2025 09:40:10 -0500 Subject: [PATCH 5/5] fix: add portal identity --- layers/portal/portal.tf | 1 + layers/portal/variables.tf | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/layers/portal/portal.tf b/layers/portal/portal.tf index a554262..4dd4ea5 100644 --- a/layers/portal/portal.tf +++ b/layers/portal/portal.tf @@ -33,6 +33,7 @@ module "portal" { domain = local.base_domain portal_name = var.portal_name port = var.portal_port + identity = var.portal_identity cluster = true resources = { diff --git a/layers/portal/variables.tf b/layers/portal/variables.tf index 1f8e4ee..6f7f1f3 100644 --- a/layers/portal/variables.tf +++ b/layers/portal/variables.tf @@ -84,6 +84,12 @@ variable "portal_domain" { default = "pinner.xyz" } +variable "portal_identity" { + description = "Portal identity" + type = string + sensitive = true +} + variable "portal_port" { description = "Portal core port" type = number