From 8968fd87d85e7c917032e1c4d8da22408cfa13f6 Mon Sep 17 00:00:00 2001 From: Daniele Ricci Date: Fri, 6 Sep 2024 14:18:47 +0200 Subject: [PATCH 1/5] chore: cherry pick be0d98d6af2 --- nix/cardano-services/deployments/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index c76c1bf186a..c050c306cf6 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -303,7 +303,6 @@ in backend = { enabled = true; replicas = 2; - env.NODE_ENV = "production"; }; stake-pool-provider = { enabled = true; @@ -547,22 +546,18 @@ in backend = { enabled = true; replicas = 2; - env.NODE_ENV = "production"; }; stake-pool-provider = { enabled = true; env.OVERRIDE_FUZZY_OPTIONS = "true"; - env.NODE_ENV = "production"; }; handle-provider.enabled = true; chain-history-provider = { enabled = true; replicas = 2; - env.NODE_ENV = "production"; }; asset-provider = { enabled = true; - env.NODE_ENV = "production"; }; }; From e9a48db642cb50202aee67d5eb21b70afe99747c Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Mon, 9 Sep 2024 14:55:26 +0300 Subject: [PATCH 2/5] chore: deploy asset-projector to live-* --- nix/cardano-services/deployments/default.nix | 61 ++++++++++++++------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index c050c306cf6..7eb62709feb 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -967,32 +967,59 @@ in // (builtins.mapAttrs (_: value: (final: value // { - projectors = { - stake-pool.enabled = true; - }; - providers = { - backend = { - enabled = true; - }; - }; + projectors.asset.enabled = true; values = { - stakepool.databaseName = "stakepoolv3"; ingress.enabled = false; - pg-boss-worker.enabled = true; }; })) { - #"live-preview@us-east-2@tmp" = { - # name = "tmp-cardanojs"; - # namespace = "live-preview"; - # network = "preview"; - # region = "us-east-2"; - # context = "eks-admin"; - #}; + "live-preview@us-east-2@asset" = { + name = "tmp-cardanojs"; + namespace = "live-preview"; + network = "preview"; + region = "us-east-2"; + context = "eks-admin"; + }; + "live-preview@eu-central-1@asset" = { + name = "tmp-cardanojs"; + namespace = "live-preview"; + network = "preview"; + region = "eu-central-1"; + context = "eks-admin"; + }; + "live-preprod@us-east-2@asset" = { + name = "tmp-cardanojs"; + namespace = "live-preprod"; + network = "preprod"; + region = "us-east-2"; + context = "eks-admin"; + }; + "live-preprod@eu-central-1@asset" = { + name = "tmp-cardanojs"; + namespace = "live-preprod"; + network = "preprod"; + region = "eu-central-1"; + context = "eks-admin"; + }; + "live-mainnet@us-east-2@asset" = { + name = "tmp-cardanojs"; + namespace = "live-mainnet"; + network = "mainnet"; + region = "us-east-2"; + context = "eks-admin"; + }; + "live-mainnet@eu-central-1@asset" = { + name = "tmp-cardanojs"; + namespace = "live-mainnet"; + network = "mainnet"; + region = "eu-central-1"; + context = "eks-admin"; + }; }); targetGroups = targets: { + ASSET = lib.filterAttrs (name: _: lib.hasSuffix "asset" name) targets; DEV = lib.filterAttrs (name: _: lib.hasPrefix "dev-" name) targets; LIVE = lib.filterAttrs (name: _: lib.hasPrefix "live-" name) targets; OPS = lib.filterAttrs (name: _: lib.hasPrefix "ops-" name) targets; From 1c431663fd48cc48135fca7ebf1c83eb7b0ed68a Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Tue, 10 Sep 2024 15:40:34 +0300 Subject: [PATCH 3/5] chore: enable asset provider on live-* envs --- nix/cardano-services/deployments/default.nix | 168 ++++-------------- .../deployments/wallet-api.nix | 1 - .../deployments/ws-server.deployment.nix | 6 +- nix/cardano-services/oci-images.nix | 4 +- 4 files changed, 41 insertions(+), 138 deletions(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index 7eb62709feb..9385366186b 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -1,5 +1,4 @@ # cSpell:ignore builtins cardanojs concat devs healthchecks hostnames kubeconfig pkgs stakepool stakepoolv - { pkgs, lib ? pkgs.lib, @@ -119,7 +118,8 @@ in stakepool.databaseName = "stakepool"; ingress.enabled = true; cardano-services = { - nodeEnv = if lib.hasPrefix "live" final.namespace + nodeEnv = + if lib.hasPrefix "live" final.namespace then "production" else null; image = oci.image.name; @@ -258,7 +258,6 @@ in }; }; - "dev-sanchonet@us-east-1" = final: { name = "${final.namespace}-cardanojs"; namespace = "dev-sanchonet"; @@ -293,7 +292,6 @@ in }; }; - "dev-mainnet@us-east-1" = final: { namespace = "dev-mainnet"; network = "mainnet"; @@ -438,25 +436,19 @@ in enabled = true; replicas = 4; }; - stake-pool-provider = { - enabled = true; - }; + stake-pool-provider.enabled = true; handle-provider.enabled = true; chain-history-provider = { enabled = true; replicas = 2; }; - # asset-provider = { - # enabled = true; - # }; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; - stake-pool = { - enabled = true; - }; - # asset.enabled = true; + stake-pool.enabled = true; + asset.enabled = true; }; values = { @@ -493,23 +485,19 @@ in enabled = true; replicas = 4; }; - stake-pool-provider = { - enabled = true; - }; - handle-provider.enabled = true; chain-history-provider = { enabled = true; replicas = 2; }; - #asset-provider = { - # enabled = true; - #}; + stake-pool-provider.enabled = true; + handle-provider.enabled = true; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; stake-pool.enabled = true; - # asset.enabled = true; + asset.enabled = true; }; values = { @@ -569,7 +557,6 @@ in }; values = { - cardano-services = { ingresOrder = 98; additionalRoutes = [ @@ -584,23 +571,6 @@ in ]; }; backend.allowedOrigins = lib.concatStringsSep "," allowedOrigins; - backend.routes = let - inherit (oci.meta) versions; - in - lib.concatLists [ - (map (v: "/v${v}/health") versions.root) - (map (v: "/v${v}/live") versions.root) - (map (v: "/v${v}/meta") versions.root) - (map (v: "/v${v}/ready") versions.root) - (map (v: "/v${v}/asset") versions.assetInfo) - (map (v: "/v${v}/chain-history") versions.chainHistory) - (map (v: "/v${v}/network-info") versions.networkInfo) - (map (v: "/v${v}/rewards") versions.rewards) - (map (v: "/v${v}/tx-submit") versions.txSubmit) - (map (v: "/v${v}/utxo") versions.utxo) - (map (v: "/v${v}/handle") versions.handle) - ]; - blockfrost-worker.enabled = true; pg-boss-worker.enabled = true; }; @@ -614,27 +584,17 @@ in region = "us-east-2"; providers = { - backend = { - enabled = true; - }; - stake-pool-provider = { - enabled = true; - }; - handle-provider = { - enabled = true; - }; + backend.enabled = true; + stake-pool-provider.enabled = true; + handle-provider.enabled = true; chain-history-provider.enabled = true; - #asset-provider = { - # enabled = true; - #}; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; - stake-pool = { - enabled = true; - }; - # asset.enabled = true; + stake-pool.enabled = true; + asset.enabled = true; }; values = { @@ -655,27 +615,17 @@ in region = "eu-central-1"; providers = { - backend = { - enabled = true; - }; - stake-pool-provider = { - enabled = true; - }; - handle-provider = { - enabled = true; - }; + backend.enabled = true; + stake-pool-provider.enabled = true; + handle-provider. enabled = true; chain-history-provider.enabled = true; - #asset-provider = { - # enabled = true; - #}; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; - stake-pool = { - enabled = true; - }; - # asset.enabled = true; + stake-pool.enabled = true; + asset.enabled = true; }; values = { @@ -696,27 +646,17 @@ in region = "us-east-2"; providers = { - backend = { - enabled = true; - }; - stake-pool-provider = { - enabled = true; - }; - handle-provider = { - enabled = true; - }; + backend.enabled = true; + stake-pool-provider.enabled = true; + handle-provider.enabled = true; chain-history-provider.enabled = true; - #asset-provider = { - # enabled = true; - #}; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; - stake-pool = { - enabled = true; - }; - # asset.enabled = true; + stake-pool.enabled = true; + asset.enabled = true; }; values = { @@ -737,27 +677,17 @@ in region = "eu-central-1"; providers = { - backend = { - enabled = true; - }; - stake-pool-provider = { - enabled = true; - }; - handle-provider = { - enabled = true; - }; + backend.enabled = true; + stake-pool-provider.enabled = true; + handle-provider.enabled = true; chain-history-provider.enabled = true; - #asset-provider = { - # enabled = true; - #}; + asset-provider.enabled = true; }; projectors = { handle.enabled = true; - stake-pool = { - enabled = true; - }; - # asset.enabled = true; + stake-pool.enabled = true; + asset.enabled = true; }; values = { @@ -777,15 +707,10 @@ in region = "us-east-1"; providers = { - backend = { - enabled = true; - }; + backend.enabled = true; handle-provider.enabled = true; chain-history-provider.enabled = true; - stake-pool-provider = { - enabled = true; - env.OVERRIDE_FUZZY_OPTIONS = "true"; - }; + stake-pool-provider.enabled = true; }; projectors = { @@ -794,7 +719,6 @@ in wallet-api.enabled = true; }; - values = { pg-boss-worker.enabled = true; pg-boss-worker.queues = "pool-delist-schedule,pool-metadata,pool-metrics,pool-rewards"; @@ -851,24 +775,6 @@ in pg-boss-worker.enabled = true; backend.allowedOrigins = lib.concatStringsSep "," allowedOriginsDev; - backend.routes = let - inherit (oci.meta) versions; - in - lib.concatLists [ - (map (v: "/v${v}/health") versions.root) - (map (v: "/v${v}/live") versions.root) - (map (v: "/v${v}/meta") versions.root) - (map (v: "/v${v}/ready") versions.root) - (map (v: "/v${v}/asset") versions.assetInfo) - (map (v: "/v${v}/chain-history") versions.chainHistory) - (map (v: "/v${v}/network-info") versions.networkInfo) - (map (v: "/v${v}/rewards") versions.rewards) - (map (v: "/v${v}/tx-submit") versions.txSubmit) - (map (v: "/v${v}/utxo") versions.utxo) - (map (v: "/v${v}/handle") versions.handle) - (map (v: "/v${v}/provider-server") versions.stakePool) - (map (v: "/v${v}/stake-pool-provider-server") versions.stakePool) - ]; cardano-services = { ingresOrder = 99; @@ -961,13 +867,11 @@ in }; }; }; - } # Convenient for cases when you need to create multiple temporary deployments with the same configuration // (builtins.mapAttrs (_: value: (final: value // { - projectors.asset.enabled = true; values = { diff --git a/nix/cardano-services/deployments/wallet-api.nix b/nix/cardano-services/deployments/wallet-api.nix index 1b8404f7b23..dd33c712ed6 100644 --- a/nix/cardano-services/deployments/wallet-api.nix +++ b/nix/cardano-services/deployments/wallet-api.nix @@ -6,7 +6,6 @@ chart, ... }: { - projectors.wallet-api = { inherit (values.cardano-services) image; livenessProbe = { diff --git a/nix/cardano-services/deployments/ws-server.deployment.nix b/nix/cardano-services/deployments/ws-server.deployment.nix index 54d5d32781b..68a4d865eb6 100644 --- a/nix/cardano-services/deployments/ws-server.deployment.nix +++ b/nix/cardano-services/deployments/ws-server.deployment.nix @@ -65,10 +65,10 @@ runAsGroup = 0; }; args = ["start-ws-server"]; - env = utils.mkPodEnv ({ + env = utils.mkPodEnv { NETWORK = config.network; DB_CACHE_TTL = "7200"; - OGMIOS_URL = "ws://${config.namespace}-cardano-core.${config.namespace}.svc.cluster.local:1337"; + OGMIOS_URL = "ws://${config.namespace}-cardano-core.${config.namespace}.svc.cluster.local:1337"; POSTGRES_POOL_MAX_DB_SYNC = "2"; POSTGRES_HOST_DB_SYNC = values.postgresName; @@ -88,7 +88,7 @@ }; POSTGRES_SSL_DB_SYNC = "true"; POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; - }); + }; volumeMounts = [ { mountPath = "/tls"; diff --git a/nix/cardano-services/oci-images.nix b/nix/cardano-services/oci-images.nix index fb052bd17e1..1985249e975 100644 --- a/nix/cardano-services/oci-images.nix +++ b/nix/cardano-services/oci-images.nix @@ -3,8 +3,8 @@ let # TODO: express this as OCI labels (what they are for) buildInfo = builtins.toJSON { - inherit (self) lastModifiedDate ; - rev = self.dirtyRev or self.rev ; + inherit (self) lastModifiedDate; + rev = self.dirtyRev or self.rev; shortRev = self.shortRev or self.dirtyShortRev; }; From 47eb08e5ed91ab9f34b1feb147b363bda831f191 Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Tue, 10 Sep 2024 16:22:11 +0300 Subject: [PATCH 4/5] chore: remove unused temporary deployments --- nix/cardano-services/deployments/default.nix | 28 -------------------- 1 file changed, 28 deletions(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index 9385366186b..c39718cd881 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -878,34 +878,6 @@ in ingress.enabled = false; }; })) { - "live-preview@us-east-2@asset" = { - name = "tmp-cardanojs"; - namespace = "live-preview"; - network = "preview"; - region = "us-east-2"; - context = "eks-admin"; - }; - "live-preview@eu-central-1@asset" = { - name = "tmp-cardanojs"; - namespace = "live-preview"; - network = "preview"; - region = "eu-central-1"; - context = "eks-admin"; - }; - "live-preprod@us-east-2@asset" = { - name = "tmp-cardanojs"; - namespace = "live-preprod"; - network = "preprod"; - region = "us-east-2"; - context = "eks-admin"; - }; - "live-preprod@eu-central-1@asset" = { - name = "tmp-cardanojs"; - namespace = "live-preprod"; - network = "preprod"; - region = "eu-central-1"; - context = "eks-admin"; - }; "live-mainnet@us-east-2@asset" = { name = "tmp-cardanojs"; namespace = "live-mainnet"; From 0132f0330906593eab4a754efb8fcca9bae4d251 Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Thu, 12 Sep 2024 18:06:34 +0300 Subject: [PATCH 5/5] chore: destroy temporary asset projector deployments --- nix/cardano-services/deployments/default.nix | 23 +++++++------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index c39718cd881..b22658095e8 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -872,30 +872,23 @@ in // (builtins.mapAttrs (_: value: (final: value // { + context = "eks-admin"; projectors.asset.enabled = true; values = { ingress.enabled = false; }; })) { - "live-mainnet@us-east-2@asset" = { - name = "tmp-cardanojs"; - namespace = "live-mainnet"; - network = "mainnet"; - region = "us-east-2"; - context = "eks-admin"; - }; - "live-mainnet@eu-central-1@asset" = { - name = "tmp-cardanojs"; - namespace = "live-mainnet"; - network = "mainnet"; - region = "eu-central-1"; - context = "eks-admin"; - }; + #"live-mainnet@us-east-2@asset" = { + # name = "tmp-cardanojs"; + # namespace = "live-mainnet"; + # network = "mainnet"; + # region = "us-east-2"; + #}; }); targetGroups = targets: { - ASSET = lib.filterAttrs (name: _: lib.hasSuffix "asset" name) targets; + #ASSET = lib.filterAttrs (name: _: lib.hasSuffix "asset" name) targets; DEV = lib.filterAttrs (name: _: lib.hasPrefix "dev-" name) targets; LIVE = lib.filterAttrs (name: _: lib.hasPrefix "live-" name) targets; OPS = lib.filterAttrs (name: _: lib.hasPrefix "ops-" name) targets;