From 83130ed03cc1c715f577a5fae834da92f6d22de3 Mon Sep 17 00:00:00 2001
From: Walid Baruni <wdbaruni@gmail.com>
Date: Mon, 7 Oct 2024 18:14:50 +0200
Subject: [PATCH] Release.1.5 (#4594)

---
 ops/terraform/dev.tfvars                       |  4 ++--
 ops/terraform/main.tf                          |  7 +++----
 ops/terraform/prod.tfvars                      |  4 ++--
 .../remote_files/scripts/start-bacalhau.sh     | 18 ++++++++++--------
 ops/terraform/stage.tfvars                     |  4 ++--
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ops/terraform/dev.tfvars b/ops/terraform/dev.tfvars
index d1dbfa7e0b..cf966dcb6a 100644
--- a/ops/terraform/dev.tfvars
+++ b/ops/terraform/dev.tfvars
@@ -1,8 +1,8 @@
-bacalhau_version       = "v1.4.0"
+bacalhau_version       = "v1.5.0"
 bacalhau_branch        = ""
 bacalhau_port          = "1235"
 bacalhau_environment   = "development"
-ipfs_version           = "v0.12.2"
+ipfs_version           = "v0.18.1"
 gcp_project            = "bacalhau-dev"
 grafana_cloud_prometheus_user      = "14299"
 grafana_cloud_prometheus_endpoint  = "https://prometheus-us-central1.grafana.net/api/prom/push"
diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf
index ec6c73d682..da5d9fa6d5 100644
--- a/ops/terraform/main.tf
+++ b/ops/terraform/main.tf
@@ -67,11 +67,10 @@ export GRAFANA_CLOUD_TEMPO_ENDPOINT="${var.grafana_cloud_tempo_endpoint}"
 export OTEL_COLLECTOR_VERSION="${var.otel_collector_version}"
 export OTEL_EXPORTER_OTLP_ENDPOINT="${var.otel_collector_endpoint}"
 export OTEL_RESOURCE_ATTRIBUTES="deployment.environment=${terraform.workspace}"
-export BACALHAU_NODE_NETWORK_ORCHESTRATORS="${var.internal_ip_addresses[0]}:4222"
-export BACALHAU_NODE_NETWORK_ADVERTISEDADDRESS="${var.public_ip_addresses[count.index]}:4222"
-export BACALHAU_NODE_NETWORK_CLUSTER_PEERS=""
+export BACALHAU_ORCHESTRATORS="${var.internal_ip_addresses[0]}:4222"
+export BACALHAU_ORCHESTRATOR_ADVERTISE="${var.public_ip_addresses[count.index]}:4222"
 export BACALHAU_LOCAL_PUBLISHER_ADDRESS="${var.public_ip_addresses[count.index]}"
-
+export BACALHAU_WEBUI_BACKEND="http://${var.public_ip_addresses[0]}:1234"
 
 ### secrets are installed in the install-node.sh script
 export SECRETS_GRAFANA_CLOUD_PROMETHEUS_API_KEY="${var.grafana_cloud_prometheus_api_key}"
diff --git a/ops/terraform/prod.tfvars b/ops/terraform/prod.tfvars
index f123692123..c626227559 100644
--- a/ops/terraform/prod.tfvars
+++ b/ops/terraform/prod.tfvars
@@ -1,7 +1,7 @@
-bacalhau_version            = "v1.4.0"
+bacalhau_version            = "v1.5.0"
 bacalhau_port               = "1235"
 bacalhau_environment        = "production"
-ipfs_version                = "v0.12.2"
+ipfs_version                = "v0.18.1"
 gcp_project                 = "bacalhau-prod"
 grafana_cloud_prometheus_user      = "1008771"
 grafana_cloud_prometheus_endpoint  = "https://prometheus-us-central1.grafana.net/api/prom/push"
diff --git a/ops/terraform/remote_files/scripts/start-bacalhau.sh b/ops/terraform/remote_files/scripts/start-bacalhau.sh
index 318faefd82..252fbb148c 100644
--- a/ops/terraform/remote_files/scripts/start-bacalhau.sh
+++ b/ops/terraform/remote_files/scripts/start-bacalhau.sh
@@ -36,12 +36,14 @@ bacalhau serve \
   --job-execution-timeout-bypass-client-id="${TRUSTED_CLIENT_IDS}" \
   --ipfs-connect /ip4/127.0.0.1/tcp/5001 \
   --api-port 1234 \
-  --web-ui="${BACALHAU_NODE_WEBUI}" \
-  --web-ui-port 80 \
-  --labels owner=bacalhau \
   --requester-job-translation-enabled \
-  --config Job.Defaults.Batch.Task.Publisher.Type=local \
-  --config Job.Defaults.Ops.Task.Publisher.Type=local \
-  --config Job.Defaults.Service.Task.Publisher.Type=local \
-  --config Job.Defaults.Daemon.Task.Publisher.Type=local \
-  --local-publisher-address "${BACALHAU_LOCAL_PUBLISHER_ADDRESS}"
+  --config DisableAnalytics \
+  --config labels="owner=bacalhau,name=node-${TERRAFORM_NODE_INDEX}"\
+  --config Compute.Orchestrators="${BACALHAU_ORCHESTRATORS}" \
+  --config Orchestrator.Advertise="${BACALHAU_ORCHESTRATOR_ADVERTISE}" \
+  --config WebUI.Enabled="${BACALHAU_NODE_WEBUI}" \
+  --config WebUI.Listen=0.0.0.0:80 \
+  --config WebUI.Backend="${BACALHAU_WEBUI_BACKEND}" \
+  --config JobDefaults.Batch.Task.Publisher.Type=local \
+  --config JobDefaults.Ops.Task.Publisher.Type=local \
+  --config Publishers.Types.Local.Address="${BACALHAU_LOCAL_PUBLISHER_ADDRESS}"
diff --git a/ops/terraform/stage.tfvars b/ops/terraform/stage.tfvars
index 544b263869..628f78e0ee 100644
--- a/ops/terraform/stage.tfvars
+++ b/ops/terraform/stage.tfvars
@@ -1,8 +1,8 @@
-bacalhau_version            = "v1.5.0-dev2"
+bacalhau_version            = "v1.5.0"
 bacalhau_branch             = "" # deploy from a branch instead of the version above
 bacalhau_port               = "1235"
 bacalhau_environment        = "staging"
-ipfs_version                = "v0.12.2"
+ipfs_version                = "v0.18.1"
 gcp_project                 = "bacalhau-stage"
 grafana_cloud_prometheus_user      = "1008771"
 grafana_cloud_prometheus_endpoint  = "https://prometheus-us-central1.grafana.net/api/prom/push"