@catladder/pipeline 1.35.0 → 1.36.2

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-35-0-f4f484a8" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-36-2-31ffc00e" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/index.js

@@ -39,6 +39,16 @@ var __read = this && this.__read || function (o, n) {
   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));
+};
+
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -158,7 +168,11 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   }
 
   var publicEnvVarsRaw = (_h = (_g = mergedConfig.vars) === null || _g === void 0 ? void 0 : _g.public) !== null && _h !== void 0 ? _h : {};
-  var secretEnvVarKeys = (_k = (_j = mergedConfig.vars) === null || _j === void 0 ? void 0 : _j.secret) !== null && _k !== void 0 ? _k : [];
+  var additionalSecretKeys = componentConfig.deploy ? deploy_1.DEPLOY_TYPES[componentConfig.deploy.type].additionalSecretKeys( // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  componentConfig.deploy) : [];
+
+  var secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_k = (_j = mergedConfig.vars) === null || _j === void 0 ? void 0 : _j.secret) !== null && _k !== void 0 ? _k : []), false), __read(additionalSecretKeys), false);
+
   var secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
     return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
   })); // this is deprecated, we now support: $componentname:FOO

package/dist/deploy/custom/index.d.ts

@@ -1 +1,2 @@
-export * from "./deployJob";
+import { DeployTypeDefinition } from "..";
+export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom">;

package/dist/deploy/custom/index.js

@@ -1,22 +1,16 @@
 "use strict";
 
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-
 exports.__esModule = true;
+exports.CUSTOM_DEPLOY_TYPE = void 0;
+
+var deployJob_1 = require("./deployJob");
 
-__exportStar(require("./deployJob"), exports);
+exports.CUSTOM_DEPLOY_TYPE = {
+  jobs: deployJob_1.createCustomDeployJobs,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: function () {
+    return [];
+  }
+};

package/dist/deploy/index.d.ts

@@ -1,13 +1,13 @@
 import { Context } from "../types/context";
 import { CatladderJob } from "../types/jobs";
-import { DeployConfig } from "./types";
+import { DeployConfigGeneric, DeployConfigType } from "./types";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export declare type DeployTypes = { [type in DeployConfig["type"]]: {
+export declare type DeployTypeDefinition<T extends DeployConfigType> = {
   jobs: (context: Context) => CatladderJob[];
-  defaults: () => Partial<Extract<DeployConfig, {
-    type: type;
-  }>>;
-} };
+  defaults: () => Partial<DeployConfigGeneric<T>>;
+  additionalSecretKeys: (config: DeployConfigGeneric<T>) => string[];
+};
+export declare type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
 export declare const DEPLOY_TYPES: DeployTypes;

package/dist/deploy/index.js

@@ -31,16 +31,6 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 
 exports.DEPLOY_TYPES = {
-  kubernetes: {
-    jobs: kubernetes_1.createKubernetesDeployJobs,
-    defaults: function () {
-      return {};
-    }
-  },
-  custom: {
-    jobs: custom_1.createCustomDeployJobs,
-    defaults: function () {
-      return {};
-    }
-  }
+  kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
+  custom: custom_1.CUSTOM_DEPLOY_TYPE
 };

package/dist/deploy/kubernetes/additionalSecretKeys.d.ts

@@ -0,0 +1,2 @@
+import { DeployConfigKubernetes } from "../types";
+export declare const additionalKubernetesSecretKeys: (config: DeployConfigKubernetes) => string[];

package/dist/deploy/kubernetes/additionalSecretKeys.js

@@ -0,0 +1,27 @@
+"use strict";
+
+exports.__esModule = true;
+exports.additionalKubernetesSecretKeys = void 0;
+
+var additionalKubernetesSecretKeys = function (config) {
+  var _a, _b, _c, _d;
+
+  var keys = [];
+
+  if ((_b = (_a = config.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) {
+    keys.push("MONGODB_ROOT_PASSWORD");
+
+    if (config.values.mongodb.architecture === "replicaset") {
+      keys.push("MONGODB_REPLICASET_KEY");
+    }
+  }
+
+  if ((_d = (_c = config.values) === null || _c === void 0 ? void 0 : _c.cloudsql) === null || _d === void 0 ? void 0 : _d.enabled) {
+    keys.push("POSTGRESQL_PASSWORD");
+    keys.push("cloudsqlProxyCredentials");
+  }
+
+  return keys;
+};
+
+exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;

package/dist/deploy/kubernetes/deployJob.js

@@ -60,20 +60,14 @@ var __1 = require("../..");
 
 var runner_1 = require("../../runner");
 
-var utils_1 = require("../../utils");
-
 var base_1 = require("../base");
 
 var types_1 = require("../types");
 
-var cloudsql_1 = require("./cloudsql");
-
-var mongodb_1 = require("./mongodb");
-
-var processSecretsAsFiles_1 = require("./processSecretsAsFiles");
+var kubeValues_1 = require("./kubeValues");
 
 var createKubernetesDeployJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+  var _a, _b;
 
   var deployConfig = context.componentConfig.deploy;
 
@@ -86,58 +80,7 @@ var createKubernetesDeployJobs = function (context) {
     throw new Error("deploy config is not kubernetes");
   }
 
-  var allEnvVars = context.environment.envVars;
-  /**
-   * separate by secrets and public.
-   * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
-   */
-
-  var env = Object.entries(allEnvVars).reduce(function (acc, _a) {
-    var _b, _c;
-
-    var _d;
-
-    var _e = __read(_a, 2),
-        key = _e[0],
-        value = _e[1];
-
-    if ((_d = String(value)) === null || _d === void 0 ? void 0 : _d.startsWith("$CL_")) {
-      acc.secret = __assign(__assign({}, acc.secret), (_b = {}, _b[key] = value, _b));
-      return acc;
-    }
-
-    acc.public = __assign(__assign({}, acc.public), (_c = {}, _c[key] = value, _c));
-    return acc;
-  }, {
-    secret: {},
-    public: {}
-  });
-  var defaultAppConfig = {
-    host: context.environment.host,
-    command: context.componentConfig.build.startCommand,
-    livenessProbe: {
-      httpGet: {
-        path: (_c = (_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.application) === null || _b === void 0 ? void 0 : _b.healthRoute) !== null && _c !== void 0 ? _c : "__health"
-      }
-    },
-    readinessProbe: {
-      httpGet: {
-        path: (_f = (_e = (_d = deployConfig.values) === null || _d === void 0 ? void 0 : _d.application) === null || _e === void 0 ? void 0 : _e.healthRoute) !== null && _f !== void 0 ? _f : "__health"
-      }
-    },
-    startupProbe: {
-      httpGet: {
-        path: (_j = (_h = (_g = deployConfig.values) === null || _g === void 0 ? void 0 : _g.application) === null || _h === void 0 ? void 0 : _h.healthRoute) !== null && _j !== void 0 ? _j : "__health"
-      }
-    }
-  };
-
-  var defaultKubeValues = __assign(__assign({
-    application: defaultAppConfig,
-    env: env
-  }, ((_l = (_k = deployConfig.values) === null || _k === void 0 ? void 0 : _k.cloudsql) === null || _l === void 0 ? void 0 : _l.enabled) ? (0, cloudsql_1.createCloudsqlBaseConfig)(context) : {}), ((_o = (_m = deployConfig.values) === null || _m === void 0 ? void 0 : _m.mongodb) === null || _o === void 0 ? void 0 : _o.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
-
-  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, deployConfig.values));
+  var kubeValues = (0, kubeValues_1.createKubeValues)(context);
   var kubernetesEnvironment = {
     namespace: context.environment.envVars.KUBE_NAMESPACE
   };
@@ -152,9 +95,9 @@ var createKubernetesDeployJobs = function (context) {
         forceQuotes: true
       }),
       HELM_GITLAB_CHART_NAME: "the-panter-chart",
-      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_p = deployConfig.additionalHelmArgs) !== null && _p !== void 0 ? _p : []), false).join(" "),
+      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_a = deployConfig.additionalHelmArgs) !== null && _a !== void 0 ? _a : []), false).join(" "),
       COMPONENT_NAME: context.componentName,
-      BUILD_ID: (_q = context.commitInfo) === null || _q === void 0 ? void 0 : _q.buildId
+      BUILD_ID: (_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildId
     })
   };
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);

package/dist/deploy/kubernetes/index.d.ts

@@ -1 +1,2 @@
-export * from "./deployJob";
+import { DeployTypeDefinition } from "..";
+export declare const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<"kubernetes">;

package/dist/deploy/kubernetes/index.js

@@ -1,22 +1,16 @@
 "use strict";
 
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
+exports.__esModule = true;
+exports.KUBERNETES_DEPLOY_TYPE = void 0;
 
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
+var additionalSecretKeys_1 = require("./additionalSecretKeys");
 
-exports.__esModule = true;
+var deployJob_1 = require("./deployJob");
 
-__exportStar(require("./deployJob"), exports);
+exports.KUBERNETES_DEPLOY_TYPE = {
+  jobs: deployJob_1.createKubernetesDeployJobs,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys
+};

package/dist/deploy/kubernetes/kubeEnv.d.ts

@@ -0,0 +1,10 @@
+import { Context } from "../../types";
+/**
+ * separate by secrets and public.
+ * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
+ */
+
+export declare const createKubeEnv: (context: Context) => {
+  secret: Record<string, string>;
+  public: Record<string, string>;
+};

package/dist/deploy/kubernetes/kubeEnv.js

@@ -0,0 +1,90 @@
+"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;
+};
+
+exports.__esModule = true;
+exports.createKubeEnv = void 0;
+
+var types_1 = require("../types");
+
+var shouldGoIntoSecrets = function (key, value) {
+  var _a;
+
+  if ((_a = String(value)) === null || _a === void 0 ? void 0 : _a.includes("$CL_")) {
+    return true;
+  }
+
+  return false;
+};
+/**
+ * separate by secrets and public.
+ * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
+ */
+
+
+var createKubeEnv = function (context) {
+  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+    // should not happen
+    throw new Error("deploy config is not kubernetes");
+  }
+
+  var allEnvVars = context.environment.envVars;
+  var env = Object.entries(allEnvVars).reduce(function (acc, _a) {
+    var _b, _c;
+
+    var _d = __read(_a, 2),
+        key = _d[0],
+        value = _d[1];
+
+    if (shouldGoIntoSecrets(key, value)) {
+      acc.secret = __assign(__assign({}, acc.secret), (_b = {}, _b[key] = value, _b));
+      return acc;
+    }
+
+    acc.public = __assign(__assign({}, acc.public), (_c = {}, _c[key] = value, _c));
+    return acc;
+  }, {
+    secret: {},
+    public: {}
+  });
+  return env;
+};
+
+exports.createKubeEnv = createKubeEnv;

package/dist/deploy/kubernetes/kubeValues.d.ts

@@ -0,0 +1,136 @@
+import { Context } from "../../types/context";
+export declare const createKubeValues: (context: Context) => never[] | ({
+  application: {
+    redirects?: ({
+      host: string;
+    } & Record<string, unknown>)[] | undefined;
+    hostAliases?: string[] | undefined;
+    replicas?: number | undefined;
+    autoscale?: import("..").KubernetesAutoscale | undefined;
+    updateStrategy?: import("..").KubernetesUpdateStrategy | undefined;
+    resources?: import("..").KubernetesResourcesDef | undefined;
+    healthRoute?: string | undefined;
+    startupProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    readinessProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    livenessProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    worker?: import("..").KubernetesWorkerDef | undefined;
+  } & Record<string, unknown>;
+  env: {
+    secret: Record<string, string>;
+    public: Record<string, string>;
+  };
+} & {
+  cloudsql?: {
+    enabled: boolean;
+    instanceId?: string | undefined;
+    projectId?: string | undefined;
+    region?: string | undefined;
+  } | undefined;
+  mongodb?: import("..").DeployConfigMongodb | undefined;
+  mailhog?: {
+    enabled: boolean;
+  } | undefined;
+  jobs?: Record<string, {
+    command: string;
+    hook?: string | undefined;
+  } & Record<string, unknown>> | undefined;
+  cronjobs?: Record<string, {
+    schedule: string;
+    command: string;
+    concurrencyPolicy?: "Forbid" | "Allow" | "Replace" | undefined;
+  } & Record<string, unknown>> | undefined;
+  application?: ({
+    redirects?: ({
+      host: string;
+    } & Record<string, unknown>)[] | undefined;
+    hostAliases?: string[] | undefined;
+    replicas?: number | undefined;
+    autoscale?: import("..").KubernetesAutoscale | undefined;
+    updateStrategy?: import("..").KubernetesUpdateStrategy | undefined;
+    resources?: import("..").KubernetesResourcesDef | undefined;
+    healthRoute?: string | undefined;
+    startupProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    readinessProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    livenessProbe?: {
+      httpGet?: {
+        path?: string | undefined;
+        port?: number | undefined;
+        httpHeaders?: {
+          name: string;
+          value: string;
+        }[] | undefined;
+        failureThreshold?: number | undefined;
+        timeoutSeconds?: number | undefined;
+        periodSeconds?: number | undefined;
+        successThreshold?: number | undefined;
+      } | undefined;
+    } | undefined;
+    worker?: import("..").KubernetesWorkerDef | undefined;
+  } & Record<string, unknown>) | undefined;
+  secretsAsFile?: string[] | undefined;
+} & Record<string, unknown>);

package/dist/deploy/kubernetes/kubeValues.js

@@ -0,0 +1,62 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createKubeValues = void 0;
+
+var lodash_1 = require("lodash");
+
+var utils_1 = require("../../utils");
+
+var types_1 = require("../types");
+
+var cloudsql_1 = require("./cloudsql");
+
+var kubeEnv_1 = require("./kubeEnv");
+
+var mongodb_1 = require("./mongodb");
+
+var processSecretsAsFiles_1 = require("./processSecretsAsFiles");
+
+var createKubeValues = function (context) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+
+  var deployConfig = context.componentConfig.deploy;
+
+  if (deployConfig === false) {
+    return [];
+  }
+
+  if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
+    // should not happen
+    throw new Error("deploy config is not kubernetes");
+  }
+
+  var env = (0, kubeEnv_1.createKubeEnv)(context);
+  var defaultAppConfig = {
+    host: context.environment.host,
+    command: context.componentConfig.build.startCommand,
+    livenessProbe: {
+      httpGet: {
+        path: (_c = (_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.application) === null || _b === void 0 ? void 0 : _b.healthRoute) !== null && _c !== void 0 ? _c : "__health"
+      }
+    },
+    readinessProbe: {
+      httpGet: {
+        path: (_f = (_e = (_d = deployConfig.values) === null || _d === void 0 ? void 0 : _d.application) === null || _e === void 0 ? void 0 : _e.healthRoute) !== null && _f !== void 0 ? _f : "__health"
+      }
+    },
+    startupProbe: {
+      httpGet: {
+        path: (_j = (_h = (_g = deployConfig.values) === null || _g === void 0 ? void 0 : _g.application) === null || _h === void 0 ? void 0 : _h.healthRoute) !== null && _j !== void 0 ? _j : "__health"
+      }
+    }
+  };
+  var defaultKubeValues = (0, lodash_1.merge)({
+    application: defaultAppConfig,
+    env: env
+  }, ((_l = (_k = deployConfig.values) === null || _k === void 0 ? void 0 : _k.cloudsql) === null || _l === void 0 ? void 0 : _l.enabled) ? (0, cloudsql_1.createCloudsqlBaseConfig)(context) : {}, ((_o = (_m = deployConfig.values) === null || _m === void 0 ? void 0 : _m.mongodb) === null || _o === void 0 ? void 0 : _o.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
+  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, deployConfig.values));
+  return kubeValues;
+};
+
+exports.createKubeValues = createKubeValues;

package/dist/deploy/kubernetes/mongodb.d.ts

@@ -2,14 +2,27 @@ import { Context } from "../..";
 export declare const createMongodbBaseConfig: (context: Context) => {
   mongodb: {
     enabled: boolean;
+    auth: {
+      enabled: boolean;
+      rootPassword: string;
+      replicaSetKey: string;
+    };
+    persistence: {
+      storageClass: string;
+    };
     backup: {
       enabled: boolean;
+      hostToBackup: string;
+      pvcToBackup: string;
+      image: string;
+      schedule: string;
+      volumeSnapshotClass: string;
     };
   };
-  "mongodb-replicaset": {
-    replicas: number;
-    persistentVolume: {
-      storageClass: string;
+  env: {
+    secret: {
+      MONGO_OPLOG_URL?: string | undefined;
+      MONGO_URL: string;
     };
   };
 };