Skip to content
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.

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

Release.1.5 #4594

Merged
merged 12 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
4 changes: 2 additions & 2 deletions ops/terraform/dev.tfvars
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bacalhau_version = "v1.4.0"
bacalhau_version = "v1.5.0-alpha8"
bacalhau_branch = ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this also be v1.5.0?

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"
Expand Down
7 changes: 3 additions & 4 deletions ops/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions ops/terraform/prod.tfvars
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
18 changes: 10 additions & 8 deletions ops/terraform/remote_files/scripts/start-bacalhau.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
4 changes: 2 additions & 2 deletions ops/terraform/stage.tfvars
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading