@catladder/pipeline 3.42.1 → 3.44.0

package/dist/build/node/meteor.js

@@ -61,7 +61,7 @@ var createMeteorBuildJobs = function (context) {
       variables: {
         METEOR_DISABLE_OPTIMISTIC_CACHING: "1" // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
       },
-      script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false)
+      script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ["meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false)
     } : undefined,
     dockerBuild: {
       script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v3-42-1-f2cd0c89" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v3-44-0-43fec1e1" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/cloudRun/createJobs/cloudRunWorkerPools.d.ts

@@ -0,0 +1,4 @@
+import type { ComponentContext } from "../../../types/context";
+import type { DeployConfigCloudRunWorkerPool } from "../../types/googleCloudRun";
+export declare const getWorkerPoolDeployScript: (context: ComponentContext, workerPool: DeployConfigCloudRunWorkerPool, nameSuffix: string) => string;
+export declare const getWorkerPoolDeleteScript: (context: ComponentContext, workerPoolSuffix: string) => string[];

package/dist/deploy/cloudRun/createJobs/cloudRunWorkerPools.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWorkerPoolDeleteScript = exports.getWorkerPoolDeployScript = void 0;
+var getLabels_1 = require("../../../context/getLabels");
+var createArgsString_1 = require("../utils/createArgsString");
+var getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
+var getServiceName_1 = require("../utils/getServiceName");
+var common_1 = require("./common");
+var constants_1 = require("./constants");
+var volumes_1 = require("./volumes");
+var getWorkerPoolDeployScript = function (context, workerPool, nameSuffix) {
+  var _a, _b, _c, _d;
+  var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var command = workerPool.command;
+  var commandArray = Array.isArray(command) ? command : command.split(" ");
+  var fullWorkerPoolName = "".concat(serviceName, "-").concat(nameSuffix);
+  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
+    command: '"' + commandArray.join(",") + '"',
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(workerPool.args)
+  }, commonDeployArgs), {
+    image: (_a = workerPool.image) !== null && _a !== void 0 ? _a : commonDeployArgs.image,
+    labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+      "cloud-run-worker-pool-name": fullWorkerPoolName
+    })),
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
+    instances: (_b = workerPool.instances) !== null && _b !== void 0 ? _b : 1,
+    cpu: (_c = workerPool.cpu) !== null && _c !== void 0 ? _c : 1,
+    memory: (_d = workerPool.memory) !== null && _d !== void 0 ? _d : "512Mi",
+    "vpc-connector": workerPool.vpcConnector,
+    "vpc-egress": workerPool.vpcEgress,
+    network: workerPool.network,
+    subnet: workerPool.subnet,
+    gpu: workerPool.gpu,
+    "gpu-type": workerPool.gpuType
+  })], __read((0, volumes_1.createVolumeConfig)(workerPool.volumes, "worker-pool")), false));
+  // Worker pools are in beta and require the beta command
+  return "".concat((0, common_1.gcloudRunCmd)("beta"), " worker-pools deploy ").concat(fullWorkerPoolName, " ").concat(argsString);
+};
+exports.getWorkerPoolDeployScript = getWorkerPoolDeployScript;
+var getWorkerPoolDeleteScript = function (context, workerPoolSuffix) {
+  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var fullWorkerPoolName = "".concat(serviceName, "-").concat(workerPoolSuffix);
+  return ["".concat((0, common_1.gcloudRunCmd)("beta"), " worker-pools delete ").concat(fullWorkerPoolName, " ").concat(commonArgsString)];
+};
+exports.getWorkerPoolDeleteScript = getWorkerPoolDeleteScript;

package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js

@@ -45,14 +45,15 @@ var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccount
 var cloudRunJobs_1 = require("./cloudRunJobs");
 var onDeploy_1 = require("./execute/onDeploy");
 var cloudRunServices_1 = require("./cloudRunServices");
+var cloudRunWorkerPools_1 = require("./cloudRunWorkerPools");
 var common_1 = require("./common");
 var constants_1 = require("./constants");
 var schedules_1 = require("./execute/schedules");
 function getCloudRunDeployScripts(context) {
-  var _a;
+  var _a, _b;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read((0, schedules_1.getCreateScheduleScript)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
     var _b = __read(_a, 2),
       _ = _b[0],
@@ -63,6 +64,16 @@ function getCloudRunDeployScripts(context) {
       name = _b[0],
       service = _b[1];
     return (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name);
+  })), false), __read(Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(function (_a) {
+    var _b = __read(_a, 2),
+      _ = _b[0],
+      workerPool = _b[1];
+    return workerPool !== false && workerPool !== null;
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      workerPool = _b[1];
+    return (0, cloudRunWorkerPools_1.getWorkerPoolDeployScript)(context, workerPool, name);
   })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;

package/dist/deploy/cloudRun/createJobs/getCloudRunStopScripts.js

@@ -42,11 +42,12 @@ var cloudRunJobs_1 = require("./cloudRunJobs");
 var onDeploy_1 = require("./execute/onDeploy");
 var schedules_1 = require("./execute/schedules");
 var cloudRunServices_1 = require("./cloudRunServices");
+var cloudRunWorkerPools_1 = require("./cloudRunWorkerPools");
 var common_1 = require("./common");
 function getCloudRunStopScripts(context) {
-  var _a;
+  var _a, _b;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
     var _b = __read(_a, 2),
       _ = _b[0],
       service = _b[1];
@@ -55,6 +56,15 @@ function getCloudRunStopScripts(context) {
     var _b = __read(_a, 1),
       name = _b[0];
     return (0, cloudRunServices_1.getServiceDeleteScript)(context, name);
+  })), false), __read(Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(function (_a) {
+    var _b = __read(_a, 2),
+      _ = _b[0],
+      workerPool = _b[1];
+    return workerPool !== false && workerPool !== null;
+  }).flatMap(function (_a) {
+    var _b = __read(_a, 1),
+      name = _b[0];
+    return (0, cloudRunWorkerPools_1.getWorkerPoolDeleteScript)(context, name);
   })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop")), false), __read((0, schedules_1.getDeleteSchedulesScript)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false);
 }
 exports.getCloudRunStopScripts = getCloudRunStopScripts;

package/dist/deploy/cloudRun/createJobs/volumes.d.ts

@@ -1,3 +1,3 @@
 import type { DeployConfigCloudRunVolumes } from "../../types";
 import type { keyValuesArg } from "../utils/createArgsString";
-export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job") => keyValuesArg[];
+export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job" | "worker-pool") => keyValuesArg[];

package/dist/deploy/types/googleCloudRun.d.ts

@@ -323,6 +323,43 @@ export type DeployConfigCloudRunWithVolumes = {
   volumes?: DeployConfigCloudRunVolumes;
 };
 export type DeployConfigCloudRunJob = DeployConfigCloudRunJobNormal | DeployConfigCloudRunJobWithSchedule;
+export type DeployConfigCloudRunWorkerPool = {
+  /**
+   * command / entrypoint for the worker pool
+   */
+  command: string | string[];
+  /**
+   * number of instances to run. Defaults to 1.
+   * Worker pools do not support autoscaling.
+   */
+  instances?: number;
+  /**
+   * CPU limit. Defaults to 1
+   */
+  cpu?: Cpu;
+  /**
+   * memory limit. Defaults to 512Mi
+   */
+  memory?: Memory;
+  /**
+   * the image to use. Defaults to the image from the build.
+   */
+  image?: string;
+  /**
+   * args to pass to the command
+   */
+  args?: string[];
+  /**
+   * Number of GPUs to use. Defaults to 0
+   *
+   * This is a preview feature and not all regions support it.
+   */
+  gpu?: number;
+  /**
+   * gpu type to use. Refer to https://cloud.google.com/run/docs/configuring/services/gpu#gcloud for defaults
+   */
+  gpuType?: string;
+} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
 export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
   /**
    * cloud run deployment.
@@ -353,6 +390,14 @@ export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
   jobs?: {
     [name: string]: DeployConfigCloudRunJob | false | null;
   };
+  /**
+   * deploy worker pools for continuous background work.
+   * Worker pools are cost-effective alternatives to services for background processing.
+   * They don't have a load balanced endpoint and don't support autoscaling.
+   */
+  workerPools?: {
+    [name: string]: DeployConfigCloudRunWorkerPool | false | null;
+  };
   /**
    * add cloudSql
    */