@certik/skynet 0.10.29 → 0.10.32

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.10.32
+
+- Changed deploy to add a SKYNET_DEPLOYED_AT variable to ensure new deployment would always be triggered in nomad
+
+## 0.10.31
+
+- `api` app bug fix
+
+## 0.10.30
+
+- Changed `api` app deployment to service type for rolling updates
+
 ## 0.10.29
 
 - Added `serve.instances` parameter to `api` library to support multiple instances

package/api.js

@@ -110,7 +110,7 @@ ${getSelectorDesc(selector)}
 
   const { verbose, ...selectorFlags } = cli.flags;
 
-  if (!serve.count || serve.count === 1) {
+  if (!serve.instances || serve.instances === 1) {
     await useLock({ name: getJobName(name, selectorFlags), ttl: 50, verbose });
   }
 

package/app.js

@@ -655,7 +655,13 @@ function api({ name, routes, serve, beforeListen, env = {}, region = "us-east-1"
         selector,
         region,
         env,
-        schedule: "@minutely",
+        type: "service",
+        restart: {
+          attempts: 3,
+          delay: "15s",
+          mode: "fail",
+          interval: "30m",
+        },
         count: serve.instances,
         cpu: serve.cpu,
         mem: serve.mem,

package/deploy.d.ts

@@ -14,6 +14,8 @@ type CreateDeployBaseParams = {
   selector: Selector | undefined,
   env: Env | undefined,
   region: string | undefined,
+  type: string | undefined,
+  count: number | undefined,
   check: Check,
 }
 

package/deploy.js

@@ -52,12 +52,13 @@ const genConfig = ({
   mem,
   service,
   additionalEnv = [],
+  type = "batch",
   region = "us-east-1",
   isProduction,
 }) => `job "${jobName}" {
   datacenters = ["${region}"]
 
-  type = "batch"
+  type = "${type}"
 
   ${
     cron
@@ -373,6 +374,13 @@ function createModeDeploy({
       delta: { cpu: deltaCpu, mem: deltaMem },
     };
 
+    // added an always changing env var
+    // to ensure new deployment always triggers
+    env = {
+      ...env,
+      SKYNET_DEPLOYED_AT: new Date().toISOString(),
+    };
+
     // by default use delta cpu/mem settings
     const { cpu, mem } = modeResouces[mode] || modeResouces.delta;
 
@@ -523,6 +531,7 @@ function createDeploy({
   bin = "bin/indexer",
   selector = {},
   region = "us-east-1",
+  type = "batch",
   env = {},
   count,
   check,
@@ -552,6 +561,13 @@ function createDeploy({
       cron = cmdSchedule;
     }
 
+    // added an always changing env var
+    // to ensure new deployment always triggers
+    env = {
+      ...env,
+      SKYNET_DEPLOYED_AT: new Date().toISOString(),
+    };
+
     const nomadJobDefinition = genConfig({
       jobName,
       cron: INTERVAL_ALIASES[cron] || cron,
@@ -560,6 +576,7 @@ function createDeploy({
       workingDirectory,
       additionalEnv: env,
       region,
+      type,
       cmd: `${bin} ${args}`,
       cpu,
       mem,

package/examples/api

@@ -64,6 +64,7 @@ const app = api({
     apiKey: process.env.EXAMPLE_API_KEY,
     cpu: 600,
     mem: 200,
+    instances: 3, // run 3 instances
   },
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.29",
+  "version": "0.10.32",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",