From 47e982b29d41e8b271100b9961b6766e96e009b1 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 13 Dec 2023 17:33:56 +0100 Subject: [PATCH] garage prod: use dynamically determined ipv6 addresses --- cluster/prod/app/garage/config/garage.toml | 13 +++++++++++-- cluster/prod/app/garage/deploy/garage.hcl | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cluster/prod/app/garage/config/garage.toml b/cluster/prod/app/garage/config/garage.toml index 36daa5d..0a25255 100644 --- a/cluster/prod/app/garage/config/garage.toml +++ b/cluster/prod/app/garage/config/garage.toml @@ -6,8 +6,17 @@ db_engine = "lmdb" replication_mode = "3" -rpc_bind_addr = "[{{ env "meta.public_ipv6" }}]:3901" -rpc_public_addr = "[{{ env "meta.public_ipv6" }}]:3901" +# IPv6 config using the ipv6 address statically defined in Nomad's node metadata +# make sure to put back double { and } if re-enabling this +#rpc_bind_addr = "[{ env "meta.public_ipv6" }]:3901" +#rpc_public_addr = "[{ env "meta.public_ipv6" }]:3901" + +# IPv6 config using the ipv6 address dynamically detected from diplonat +{{ with $a := env "attr.unique.hostname" | printf "diplonat/autodiscovery/ipv6/%s" | key | parseJSON }} +rpc_bind_addr = "[{{ $a.address }}]:3901" +rpc_public_addr = "[{{ $a.address }}]:3901" +{{ end }} + rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}" [consul_discovery] diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl index 5c8a5f7..6acd31f 100644 --- a/cluster/prod/app/garage/deploy/garage.hcl +++ b/cluster/prod/app/garage/deploy/garage.hcl @@ -4,7 +4,7 @@ job "garage" { priority = 80 update { - max_parallel = 10 + max_parallel = 2 min_healthy_time = "60s" } @@ -26,7 +26,7 @@ job "garage" { task "server" { driver = "docker" config { - image = "dxflrs/garage:v0.9.0-rc2" + image = "dxflrs/garage:v0.9.0" command = "/garage" args = [ "server" ] network_mode = "host"