Merge pull request #1236 from input-output-hk/chore/LW-10311-smash-cf…

…g-cleanup Add pool-delist-schedule and pool-rewards queues to deployed pg-boss-worker
input-output-hk · May 6, 2024 · e7867d3 · e7867d3
2 parents 692624e + f47db74
commit e7867d3
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 29 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -114,6 +114,9 @@ WORKDIR /app/packages/cardano-services
 CMD ["node", "dist/cjs/cli.js", "start-blockfrost-worker"]
 
 FROM cardano-services as pg-boss-worker
+WORKDIR /config
+COPY compose/schedules.json .
+ENV SCHEDULES=/config/schedules.json
 WORKDIR /app/packages/cardano-services
 CMD ["node", "dist/cjs/cli.js", "start-pg-boss-worker"]
 

diff --git a/...dano-services/environments/schedules.json → compose/schedules.json b/...dano-services/environments/schedules.json → compose/schedules.json
diff --git a/nix/cardano-services/deployments/pg-boss-worker-deployment.nix b/nix/cardano-services/deployments/pg-boss-worker-deployment.nix
@@ -56,7 +56,7 @@
               env = utils.mkPodEnv ({
                   NETWORK = config.network;
                   LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
-                  QUEUES = "pool-metadata,pool-metrics";
+                  QUEUES = "pool-delist-schedule,pool-metadata,pool-metrics,pool-rewards";
                   STAKE_POOL_PROVIDER_URL = "http://${chart.name}-backend.${chart.namespace}.svc.cluster.local";
                   BUILD_INFO = values.cardano-services.buildInfo;
 

diff --git a/nix/cardano-services/oci-images.nix b/nix/cardano-services/oci-images.nix
@@ -11,10 +11,25 @@ let
       path = self.outPath;
     };
   };
+
+  setupSchedules =
+    std.lib.ops.mkSetup "schedules" [
+      {
+        regex = ".*";
+        mode = "0444";
+      }
+    ] ''
+      mkdir -p $out/config
+      cp ${self}/compose/schedules.json $out/config/schedules.json
+    '';
 in {
   cardano-services = std.lib.ops.mkStandardOCI {
     name = "926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services";
     operable = cell.operables.cardano-services;
+    config.Env = [
+      "SCHEDULES=/config/schedules.json"
+    ];
+    setup = [setupSchedules];
     meta.description = "Minimal Cardano Services OCI Image";
     meta.versions = builtins.fromJSON (builtins.readFile (self + /packages/cardano-services-client/supportedVersions.json));
     meta.buildInfo = buildInfo;

diff --git a/packages/cardano-services/config/network/preprod/schedule.json b/packages/cardano-services/config/network/preprod/schedule.json
diff --git a/packages/cardano-services/config/network/preprod/schedules.json b/packages/cardano-services/config/network/preprod/schedules.json
diff --git a/packages/cardano-services/docker-compose.yml b/packages/cardano-services/docker-compose.yml
@@ -25,10 +25,6 @@ services:
     volumes:
       - ./config/network/${NETWORK:-mainnet}:/config
 
-  pg-boss-worker:
-    volumes:
-      - ./environments/.schedules.json:/config/schedules.json
-
   cardano-submit-api:
     volumes:
       - ./config/network/${NETWORK:-mainnet}:/config

diff --git a/packages/cardano-services/environments/.env.local b/packages/cardano-services/environments/.env.local
@@ -1,3 +1 @@
-METADATA_FETCH_MODE="smash"
 SMASH_URL="http://cardano-smash:3100/api/v1"
-SCHEDULES="/config/schedules.json"
diff --git a/packages/cardano-services/environments/.env.mainnet b/packages/cardano-services/environments/.env.mainnet
@@ -1,5 +1,3 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
-METADATA_FETCH_MODE="smash"
 SMASH_URL="https://smash.cardano-mainnet.iohk.io/api/v1"
-SCHEDULES="/config/schedules.json"
 TOKEN_METADATA_SERVER_URL="https://tokens.cardano.org"
diff --git a/packages/cardano-services/environments/.env.preprod b/packages/cardano-services/environments/.env.preprod
@@ -1,4 +1,3 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 OGMIOS_PORT=${OGMIOS_PORT:-1339}
-METADATA_FETCH_MODE="smash"
-SCHEDULES="/config/schedules.json"
+SMASH_URL="https://preprod-smash.world.dev.cardano.org/api/v1"
diff --git a/packages/cardano-services/environments/.env.preview b/packages/cardano-services/environments/.env.preview
@@ -1,4 +1,3 @@
 HANDLE_POLICY_IDS=${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 OGMIOS_PORT=${OGMIOS_PORT:-1340}
-METADATA_FETCH_MODE="smash"
-SCHEDULES="/config/schedules.json"
+SMASH_URL="https://preview-smash.world.dev.cardano.org/api/v1"
diff --git a/packages/cardano-services/test/cli.test.ts b/packages/cardano-services/test/cli.test.ts
@@ -544,8 +544,8 @@ describe('CLI', () => {
 
     describe('schedules', () => {
       testPgBoss('accepts a valid schedule file', 'pgboss', {
-        args: ['--schedules', 'environments/schedules.json'],
-        env: { SCHEDULES: 'environments/schedules.json' },
+        args: ['--schedules', '../../compose/schedules.json'],
+        env: { SCHEDULES: '../../compose/schedules.json' },
         expectedArgs: {
           args: { schedules: [{ cron: '0 * * * *', queue: 'pool-delist-schedule', scheduleOptions: {} }] }
         }

diff --git a/packages/e2e/docker-compose.yml b/packages/e2e/docker-compose.yml
@@ -74,10 +74,6 @@ services:
     volumes:
       - ./local-network/config/network:/config
 
-  pg-boss-worker:
-    volumes:
-      - ./schedules.json:/config/schedules.json
-
   cardano-submit-api:
     depends_on:
       local-testnet:

diff --git a/packages/e2e/schedules.json b/packages/e2e/schedules.json