Merge pull request #1240 from input-output-hk/deployment-cleanup

Deployment cleanup
input-output-hk · May 3, 2024 · a05963b · a05963b
2 parents 51ea8bc + b52d8ef
commit a05963b
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -55,6 +55,7 @@ Automatic deployments are done for:
 - [dev-mainnet](https://dev-mainnet.lw.iog.io/v1.0.0/health) - On each release
 
 Manual deployments can be done via [STD Workflow](https://github.com/input-output-hk/cardano-js-sdk/actions/workflows/std.yml)
+
 - Click 'Run workflow'
 - Select branch
 - Check checkboxes for environments that should be deployed

diff --git a/nix/cardano-services/deployments/asset.nix b/nix/cardano-services/deployments/asset.nix
@@ -24,7 +24,7 @@
       BUILD_INFO = values.cardano-services.buildInfo;
       ALLOWED_ORIGINS = values.backend.allowedOrigins;
 
-      NETWORK = values.network;
+      NETWORK = config.network;
       OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
       LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
       ENABLE_METRICS = "true";
@@ -70,7 +70,7 @@
     env = {
       BUILD_INFO = values.cardano-services.buildInfo;
 
-      NETWORK = values.network;
+      NETWORK = config.network;
       LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
       OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
       PROJECTION_NAMES = "asset";

diff --git a/nix/cardano-services/deployments/backend-ingress.nix b/nix/cardano-services/deployments/backend-ingress.nix
@@ -6,7 +6,7 @@
   utils,
   ...
 }: {
-  templates.backend-ingress = {
+  templates.backend-ingress = lib.mkIf values.ingress.enabled {
     apiVersion = "networking.k8s.io/v1";
     kind = "Ingress";
     metadata = {
@@ -29,7 +29,7 @@
         "alb.ingress.kubernetes.io/healthcheck-interval-seconds" = toString values.backend.albHealthcheck.interval;
         "alb.ingress.kubernetes.io/healthcheck-timeout-seconds" = toString values.backend.albHealthcheck.timeout;
         # Use latency routing policy
-        "external-dns.alpha.kubernetes.io/aws-region" = values.region;
+        "external-dns.alpha.kubernetes.io/aws-region" = config.region;
         "external-dns.alpha.kubernetes.io/set-identifier" = values.backend.dnsId;
         "alb.ingress.kubernetes.io/group.name" = chart.namespace;
         # ACM

diff --git a/nix/cardano-services/deployments/backend.provider.nix b/nix/cardano-services/deployments/backend.provider.nix
@@ -20,7 +20,7 @@
 
     env =
       {
-        NETWORK = values.network;
+        NETWORK = config.network;
         ENABLE_METRICS = "true";
         SERVICE_NAMES = "asset,chain-history,network-info,rewards,stake-pool,tx-submit,utxo";
         OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
@@ -33,9 +33,9 @@
         PAGINATION_PAGE_SIZE_LIMIT = "5500";
 
         HANDLE_PROVIDER_SERVER_URL =
-          if values.network == "mainnet"
+          if config.network == "mainnet"
           then "https://api.handle.me"
-          else "https://${values.network}.api.handle.me";
+          else "https://${config.network}.api.handle.me";
 
         BUILD_INFO = values.cardano-services.buildInfo;
         ALLOWED_ORIGINS = values.backend.allowedOrigins;

diff --git a/nix/cardano-services/deployments/blockfrost-worker-deployment.nix b/nix/cardano-services/deployments/blockfrost-worker-deployment.nix
@@ -3,6 +3,7 @@
   values,
   chart,
   utils,
+  config,
   ...
 }: {
   templates.blockfrost-worker-deployment = lib.mkIf values.blockfrost-worker.enabled {
@@ -46,7 +47,7 @@
                 runAsGroup = 0;
               };
               env = utils.mkPodEnv {
-                NETWORK = values.network;
+                NETWORK = config.network;
                 LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
                 BUILD_INFO = values.cardano-services.buildInfo;