From 79b7d7e3c7e649a44e9c4328b1db8cbcafc45f28 Mon Sep 17 00:00:00 2001 From: Jamie Bertram Date: Thu, 16 Mar 2023 12:43:28 -0400 Subject: [PATCH] Update Marlowe profile and chart --- nix/marlowe/hydrationProfiles.nix | 9 ++++---- nix/marlowe/nomadEnvs/default.nix | 35 ++++++++++++++++++------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/nix/marlowe/hydrationProfiles.nix b/nix/marlowe/hydrationProfiles.nix index 9a1392f..1abdfe3 100644 --- a/nix/marlowe/hydrationProfiles.nix +++ b/nix/marlowe/hydrationProfiles.nix @@ -5,7 +5,7 @@ workload-policies-marlowe-runtime = { tf.hydrate-cluster.configuration.locals.policies = { consul.marlowe-runtime = { - # chainseek also needs to read the cardano config + # chain-indexer also needs to read the cardano config key_prefix."config/cardano" = { policy = "read"; intentions = "deny"; @@ -16,9 +16,10 @@ }; }; vault.marlowe-runtime = { - # Only chainseek task in marlowe-runtime needs secrets to access db - path."kv/data/chainseek/*".capabilities = ["read" "list"]; - path."kv/metadata/chainseek/*".capabilities = ["read" "list"]; + path."kv/data/chainsync/*".capabilities = ["read" "list"]; + path."kv/metadata/chainsync/*".capabilities = ["read" "list"]; + path."kv/data/marlowe/*".capabilities = ["read" "list"]; + path."kv/metadata/marlowe/*".capabilities = ["read" "list"]; path."consul/creds/marlowe-runtime".capabilities = ["read"]; }; }; diff --git a/nix/marlowe/nomadEnvs/default.nix b/nix/marlowe/nomadEnvs/default.nix index 6d84026..b904c5e 100644 --- a/nix/marlowe/nomadEnvs/default.nix +++ b/nix/marlowe/nomadEnvs/default.nix @@ -1,5 +1,5 @@ {inputs}: let - inherit (inputs) self data-merge cardano-world nixpkgs bitte-cells; + inherit (inputs) self data-merge cardano-world nixpkgs bitte-cells cells; inherit (cardano-world) cardano; inherit (bitte-cells) vector; @@ -7,19 +7,24 @@ inherit (nixpkgs.lib) genAttrs head splitString concatStringsSep toUpper replaceStrings; inherit (self) nomadTasks; + inherit (cells.cloud.constants) baseDomain; # ports to configure for each task servicePorts = [ - "chainseekd" - "chainseekd_query" - "chainseekd_command" - "history" - "history_query" - "history_sync" - "discovery" - "discovery_query" - "discovery_sync" + "chain_indexer_http" + "marlowe_chain_sync" + "marlowe_chain_sync_query" + "marlowe_chain_sync_command" + "chain_sync_http" + "indexer_http" + "marlowe_sync" + "marlowe_header_sync" + "marlowe_query" + "sync_http" "tx" + "tx_http" + "proxy" + "proxy_http" ]; # environments to configure the runtime for @@ -39,8 +44,7 @@ id = jobname; namespace = "marlowe"; - # TODO: get base domain from dapps-world if its an input to this flake - domain = "${jobname}.dapps.aws.iohkdev.io"; + domain = "${jobname}.${baseDomain}"; scaling = 1; datacenters = ["us-east-1" "eu-central-1" "eu-west-1"]; @@ -103,10 +107,11 @@ inherit (nomadTasks) chain-indexer - chainseekd - marlowe-history - marlowe-discovery + marlowe-chain-sync + marlowe-indexer + marlowe-sync marlowe-tx + marlowe-proxy ; }; }