@catladder/pipeline 0.0.0-feat-meteor-6f506099 → 0.0.0-fix-migrate-string-cmd-4e99e207

package/dist/build/base/createBuildJob.js

@@ -65,30 +65,34 @@ exports.createBuildJob = void 0;
 
 var lodash_1 = require("lodash");
 
+var __1 = require("../..");
+
 var defaults_1 = require("../../defaults");
 
 var utils_1 = require("../../utils");
 
 var constants_1 = require("./constants");
 
+var getBuildInfo_1 = require("./getBuildInfo");
+
 var createBuildJob = function (context, _a) {
   var _b, _c;
 
   var script = _a.script,
       def = __rest(_a, ["script"]);
 
-  var buildInfo = [". getCommitInfo", "echo '{\"id\":\"'$BUILD_ID'\",\"commit\":\"'$BUILD_COMMIT'\",\"tag\":\"'$BUILD_TAG'\",\"time\":\"'$BUILD_TIME'\"}' > ".concat(context.componentConfig.dir, "/__build_info.json")];
   return {
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
     job: (0, lodash_1.merge)({
+      image: (0, __1.getRunnerImage)("jobs-default"),
       needs: [],
       cache: [],
       variables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
       retry: defaults_1.BASE_RETRY,
       interruptible: true,
       stage: "build",
-      script: __spreadArray(__spreadArray(__spreadArray([], __read(buildInfo), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
+      script: __spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
       artifacts: {
         paths: [context.componentConfig.dir + "/__build_info.json"]
       }

package/dist/build/base/getBuildInfo.d.ts

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

package/dist/build/base/getBuildInfo.js

@@ -0,0 +1,12 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getBuildInfo = void 0;
+
+var getBuildInfo = function (context) {
+  var _a, _b;
+
+  return ["echo '{\"id\":\"".concat((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.buildId, "\",\"time\":\"").concat((_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildTime, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
+};
+
+exports.getBuildInfo = getBuildInfo;

package/dist/build/docker.js

@@ -75,6 +75,7 @@ var createDockerBuildJob = function (context, _a) {
       command: ["--tls=false"]
     }],
     variables: __assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
+      DOCKER_BUILDKIT: "1",
       DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
       DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
       APP_DIR: context.componentConfig.dir,
@@ -83,12 +84,12 @@ var createDockerBuildJob = function (context, _a) {
       DOCKER_DIR: ".",
       IMAGE_TAG: "$CI_COMMIT_SHA",
       DOCKER_DRIVER: "overlay2",
-      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.componentName,
-      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/" + context.componentName + "/cache:cache"
+      IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.environment.shortName + "/" + context.componentName,
+      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName
     })
   };
   return __assign(__assign({}, base), {
-    script: __spreadArray(__spreadArray([], __read(script), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker pull $CACHE_IMAGE || true", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile .", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
+    script: __spreadArray(__spreadArray([], __read(script), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
   });
 };
 

package/dist/build/index.js

@@ -48,7 +48,7 @@ exports.BUILD_TYPES = {
     jobs: node_1.createStorybookJobs,
     defaults: function () {
       return {
-        buildCommand: ["yarn storybook", "mv ./storybook-out /dist"]
+        buildCommand: ["yarn build-storybook -o ./dist"]
       };
     }
   },

package/dist/build/node/buildJob.js

@@ -64,6 +64,8 @@ var types_1 = require("../types");
 
 var cache_1 = require("./cache");
 
+var constants_2 = require("./constants");
+
 var yarn_1 = require("./yarn");
 
 var createNodeBuildJobs = function (context) {
@@ -77,6 +79,7 @@ var createNodeBuildJobs = function (context) {
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
+    variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
     script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {

package/dist/build/node/cache.js

@@ -46,7 +46,7 @@ var getNodeCache = function (context) {
   var componentIsInWorkspace = (_a = context.yarnInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
   return [{
     // if component is in a shared workspace, use workspace cache. use individual cache else
-    key: componentIsInWorkspace ? "node-modules-workspace" : context.componentName + "-node-modules",
+    key: componentIsInWorkspace ? "node-modules-workspace" : context.componentConfig.dir + "-node-modules",
     policy: "pull-push",
     paths: __spreadArray([".yarn"], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.yarnInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");

package/dist/build/node/constants.js

@@ -6,5 +6,5 @@ exports.NODE_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
   KUBERNETES_MEMORY_REQUEST: "512Mi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
+  KUBERNETES_MEMORY_LIMIT: "3Gi"
 };

package/dist/build/node/meteor.js

@@ -54,6 +54,8 @@ exports.createMeteorBuildJobs = void 0;
 
 var path_1 = require("path");
 
+var runner_1 = require("../../runner");
+
 var constants_1 = require("../base/constants");
 
 var createBuildJob_1 = require("../base/createBuildJob");
@@ -84,6 +86,7 @@ var createMeteorBuildJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
+    image: (0, runner_1.getRunnerImage)("jobs-meteor"),
     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),
     artifacts: {
       paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]

package/dist/build/tests/storybook.test.js

@@ -168,7 +168,13 @@ describe("storybook build", function () {
             type: "storybook"
           },
           deploy: {
-            type: "kubernetes"
+            type: "kubernetes",
+            cluster: {
+              name: "production",
+              projectId: "bla",
+              region: "europe",
+              type: "gcloud"
+            }
           }
         }
       }

package/dist/build/types.d.ts

@@ -1,5 +1,12 @@
 export declare type BuildConfigBase = {
+  /**
+   * command to run on the image to start the app (e.g. yarn start)
+   */
   startCommand?: string;
+  /**
+   * additional env vars for the buid jobs
+   */
+
   extraVars?: Record<string, string>;
   /**
    * define the build command
@@ -46,7 +53,6 @@ export declare type BuildConfigNodeStatic = BuildConfigNodeBase & {
 };
 export declare type BuildConfigMeteor = BuildConfigNodeBase & {
   type: "meteor";
-  startCommand: "node main.js";
 };
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";

package/dist/catladder-gitlab.js

@@ -15,7 +15,7 @@ var _a = process.env,
     CI_COMMIT_TAG = _a.CI_COMMIT_TAG,
     CI_COMMIT_BRANCH = _a.CI_COMMIT_BRANCH,
     CI_DEFAULT_BRANCH = _a.CI_DEFAULT_BRANCH;
-var isDefaultBranch = CI_COMMIT_BRANCH == CI_DEFAULT_BRANCH;
+var isDefaultBranch = Boolean(CI_DEFAULT_BRANCH) && CI_COMMIT_BRANCH === CI_DEFAULT_BRANCH;
 var isHotfixBranch = false; // TODO:  $CI_COMMIT_BRANCH =~ /^[0-9]+\.([0-9]+|x)\.x$/
 
 var isMergeRequest = Boolean(CI_MERGE_REQUEST_ID);

package/dist/config/configruedEnvs.test.js

@@ -5,6 +5,12 @@ exports.__esModule = true;
 var _1 = require(".");
 
 describe("getAllEnvsByTrigger", function () {
+  var cluster = {
+    type: "gcloud",
+    name: "mega-cluster",
+    projectId: "super-google-project",
+    region: "ch-blabla"
+  };
   var SIMPLE_CONFIG = {
     appName: "my-app",
     customerName: "pan",
@@ -15,7 +21,8 @@ describe("getAllEnvsByTrigger", function () {
           type: "node"
         },
         deploy: {
-          type: "kubernetes"
+          type: "kubernetes",
+          cluster: cluster
         }
       },
       app2: {
@@ -24,7 +31,8 @@ describe("getAllEnvsByTrigger", function () {
           type: "node"
         },
         deploy: {
-          type: "kubernetes"
+          type: "kubernetes",
+          cluster: cluster
         },
         env: {
           dev2: {
@@ -47,7 +55,8 @@ describe("getAllEnvsByTrigger", function () {
           type: "node"
         },
         deploy: {
-          type: "kubernetes"
+          type: "kubernetes",
+          cluster: cluster
         },
         env: {
           dev: false,

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "feat-meteor-6f506099" || "";
+exports.PIPELINE_IMAGE_TAG = "fix-migrate-string-cmd-4e99e207" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/index.d.ts

@@ -1,5 +1,6 @@
 import { Config } from "../types/config";
 import { CommitInfo, Context, Environment, YarnInfo } from "../types/context";
 export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
+export declare const getSecretVarNameForContext: (context: Context, key: string) => string;
 export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, skipReferences?: boolean) => Environment;
 export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, yarnInfo?: YarnInfo | undefined) => Context;

package/dist/context/index.js

@@ -46,9 +46,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 };
 
 exports.__esModule = true;
-exports.createContext = exports.getEnvironment = exports.getSecretVarName = void 0;
-
-var lodash_1 = require("lodash");
+exports.createContext = exports.getEnvironment = exports.getSecretVarNameForContext = exports.getSecretVarName = void 0;
 
 var slugify_1 = __importDefault(require("slugify"));
 
@@ -58,6 +56,8 @@ var deploy_1 = require("../deploy");
 
 var config_1 = require("../types/config");
 
+var utils_1 = require("../utils");
+
 var sanitizeForEnVar = function (s) {
   return s.replace(/-/g, "_");
 };
@@ -69,9 +69,15 @@ var getSecretVarName = function (env, componentName, key) {
 
 exports.getSecretVarName = getSecretVarName;
 
+var getSecretVarNameForContext = function (context, key) {
+  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
+};
+
+exports.getSecretVarNameForContext = getSecretVarNameForContext;
+
 var getEnvironment = function (config, componentName, env, commitInfo, skipReferences // to prevent infinit loop
 ) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
   if (skipReferences === void 0) {
     skipReferences = false;
@@ -90,7 +96,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, skipRefer
     throw new Error("env is disabled: " + env);
   }
 
-  var mergedConfig = (0, lodash_1.merge)({}, defaultConfig, envConfig); // env type: if its set manually, use that, otherwise use the known env types
+  var mergedConfig = (0, utils_1.mergeWithMergingArrays)(defaultConfig, envConfig); // env type: if its set manually, use that, otherwise use the known env types
 
   var basePredefinedVariables = {
     ENV_SHORT: env,
@@ -105,27 +111,30 @@ var getEnvironment = function (config, componentName, env, commitInfo, skipRefer
   var environmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
   var environmentSlug = envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.refSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
   var predefinedVariables;
-  var hostname;
+  var host;
   var url;
 
   if (envType === "local") {
     var devLocalConfig = mergedConfig;
     var port = (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000;
-    hostname = "localhost:" + port;
-    url = "http://" + hostname;
+    host = "localhost:" + port;
+    url = "http://" + host;
     predefinedVariables = {
       ROOT_URL: url,
       PORT: port.toString()
     };
   } else {
-    var KUBE_NAMESPACE = "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
     var RELEASE_NAME = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
     var componentSlug = (0, slugify_1["default"])(componentName);
     var envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.refSlug, ".").concat(env) : env;
-    var HOST_CANONICAL = "".concat(config.appName, "-").concat(componentSlug, ".").concat(envInUrl, ".").concat(config.customerName, ".panter.cloud");
-    hostname = (_e = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.hostname) !== null && _e !== void 0 ? _e : HOST_CANONICAL;
-    var url_1 = "https://".concat(hostname);
-    var KUBE_APP_NAME = envType === "review" && commitInfo ? "".concat(componentName, "-").concat(commitInfo.refSlug) : componentName;
+    var domainCanonical = (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy) && ((_e = mergedConfig.deploy.cluster) === null || _e === void 0 ? void 0 : _e.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
+    config.domainCanonical || "panter.cloud";
+    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical);
+    host = (_f = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.host) !== null && _f !== void 0 ? _f : HOST_CANONICAL;
+    var url_1 = "https://".concat(host); // FIXME: move to kube specific jobs
+
+    var KUBE_APP_NAME = envType === "review" && commitInfo ? "".concat(commitInfo.refSlug, "-").concat(componentName) : componentName;
+    var KUBE_NAMESPACE = (0, deploy_1.getKubernetesNamespace)(config, env);
     predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
       HOST_CANONICAL: HOST_CANONICAL,
       ROOT_URL: url_1,
@@ -135,12 +144,12 @@ var getEnvironment = function (config, componentName, env, commitInfo, skipRefer
     });
   }
 
-  var publicEnvVars = (_g = (_f = mergedConfig.vars) === null || _f === void 0 ? void 0 : _f.public) !== null && _g !== void 0 ? _g : {};
-  var secretEnvVarKeys = (_j = (_h = mergedConfig.vars) === null || _h === void 0 ? void 0 : _h.secret) !== null && _j !== void 0 ? _j : [];
+  var publicEnvVars = (_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 secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
     return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
   }));
-  var referencedRaw = (_l = (_k = mergedConfig.vars) === null || _k === void 0 ? void 0 : _k.fromComponents) !== null && _l !== void 0 ? _l : {};
+  var referencedRaw = (_m = (_l = mergedConfig.vars) === null || _l === void 0 ? void 0 : _l.fromComponents) !== null && _m !== void 0 ? _m : {};
   var referenced = skipReferences ? {} : Object.entries(referencedRaw).reduce(function (acc, _a) {
     var _b = __read(_a, 2),
         otherApp = _b[0],
@@ -161,7 +170,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, skipRefer
 
   return {
     envType: envType,
-    hostname: hostname,
+    host: host,
     fullName: environmentName,
     slug: environmentSlug,
     shortName: env,
@@ -188,7 +197,7 @@ var createContext = function (config, componentName, env, commitInfo, yarnInfo)
 
 
   var envConfig = (_b = (_a = rawConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-  var componentConfigWithoutDefaults = (0, lodash_1.merge)({}, rawConfig, envConfig); // fill in defaults of build and deploy
+  var componentConfigWithoutDefaults = (0, utils_1.mergeWithMergingArrays)(rawConfig, envConfig); // fill in defaults of build and deploy
 
   var defaults = componentConfigWithoutDefaults.deploy ? {
     build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(),
@@ -197,7 +206,7 @@ var createContext = function (config, componentName, env, commitInfo, yarnInfo)
     build: {},
     deploy: {}
   };
-  var componentConfig = (0, lodash_1.merge)({}, defaults, componentConfigWithoutDefaults);
+  var componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
   return {
     fullConfig: config,
     componentConfig: componentConfig,

package/dist/deploy/base.js

@@ -26,11 +26,18 @@ var DEPLOY_RUNNER_VARIABLES = {
 };
 
 var getBaseDeploymentJob = function (context) {
+  var _a;
+
   var environment = {
     name: context.environment.fullName,
     url: context.environment.url
   };
-  var autoStop = context.environment.envType === "review" ? "2 weeks" : context.environment.envType === "dev" ? "3 weeks" : undefined;
+  var autoStop = context.environment.envType === "review" ? "2 weeks" : context.environment.envType === "dev" ? "3 weeks" : undefined; // automatically run deploy job, unless its prod and stage is active
+
+  var autoDeploy = context.environment.envType !== "prod" ? true // is not stage, auto deploy
+  : ((_a = context.componentConfig.env) === null || _a === void 0 ? void 0 : _a.stage) === false ? true // is prod, but no staging, auto deploy
+  : false; // manually deploy
+
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
@@ -43,10 +50,10 @@ var getBaseDeploymentJob = function (context) {
       artifacts: false
     }],
     job: {
-      rules: [context.environment.envType === "prod" ? {
-        when: "manual"
-      } : {
+      rules: [autoDeploy ? {
         when: "on_success"
+      } : {
+        when: "manual"
       }],
       stage: "deploy",
       dependencies: [],

package/dist/deploy/index.d.ts

@@ -1,11 +1,13 @@
 import { GitlabJobs } from "../types/gitlab-types";
 import { Context } from "../types/context";
 import { DeployConfig } from "./types";
+export * from "./kubernetes";
+export * from "./types";
+export * from "./utils";
 export declare type DeployTypes = { [type in DeployConfig["type"]]: {
   jobs: (context: Context) => GitlabJobs;
   defaults: () => Partial<Extract<DeployConfig, {
     type: type;
   }>>;
 } };
-export * from "./types";
 export declare const DEPLOY_TYPES: DeployTypes;

package/dist/deploy/index.js

@@ -22,8 +22,12 @@ exports.DEPLOY_TYPES = void 0;
 
 var kubernetes_1 = require("./kubernetes");
 
+__exportStar(require("./kubernetes"), exports);
+
 __exportStar(require("./types"), exports);
 
+__exportStar(require("./utils"), exports);
+
 exports.DEPLOY_TYPES = {
   kubernetes: {
     jobs: kubernetes_1.createKubernetesDeployJobs,

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

@@ -0,0 +1,6 @@
+import { Context } from "../..";
+export declare const createCloudsqlBaseConfig: (context: Context) => {
+  cloudsql: {
+    proxyCredentials: string;
+  };
+};

package/dist/deploy/kubernetes/cloudsql.js

@@ -0,0 +1,16 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createCloudsqlBaseConfig = void 0;
+
+var __1 = require("../..");
+
+var createCloudsqlBaseConfig = function (context) {
+  return {
+    cloudsql: {
+      proxyCredentials: "$".concat((0, __1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
+    }
+  };
+};
+
+exports.createCloudsqlBaseConfig = createCloudsqlBaseConfig;

package/dist/deploy/kubernetes/deployJob.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));
+};
+
 exports.__esModule = true;
 exports.createKubernetesDeployJobs = void 0;
 
@@ -54,7 +64,15 @@ var js_yaml_1 = require("js-yaml");
 
 var mongodb_1 = require("./mongodb");
 
+var cloudsql_1 = require("./cloudsql");
+
+var __1 = require("../..");
+
+var utils_1 = require("../../utils");
+
 var createKubernetesDeployJobs = function (context) {
+  var _a, _b, _c, _d, _e, _f;
+
   var deployConfig = context.componentConfig.deploy;
 
   if (deployConfig === false) {
@@ -75,11 +93,13 @@ var createKubernetesDeployJobs = function (context) {
   var env = Object.entries(allEnvVars).reduce(function (acc, _a) {
     var _b, _c;
 
-    var _d = __read(_a, 2),
-        key = _d[0],
-        value = _d[1];
+    var _d;
+
+    var _e = __read(_a, 2),
+        key = _e[0],
+        value = _e[1];
 
-    if (value === null || value === void 0 ? void 0 : value.startsWith("$CL_")) {
+    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;
     }
@@ -91,15 +111,15 @@ var createKubernetesDeployJobs = function (context) {
     public: {}
   });
 
-  var defaultKubeValues = __assign({
+  var defaultKubeValues = __assign(__assign({
     application: {
-      hostname: context.environment.hostname,
+      host: context.environment.host,
       command: context.componentConfig.build.startCommand
     },
     env: env
-  }, (0, mongodb_1.createMongodbBaseConfig)(context));
+  }, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, cloudsql_1.createCloudsqlBaseConfig)(context) : {}), ((_d = (_c = deployConfig.values) === null || _c === void 0 ? void 0 : _c.mongodb) === null || _d === void 0 ? void 0 : _d.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
 
-  var kubeValues = (0, lodash_1.merge)({}, defaultKubeValues, deployConfig.values);
+  var kubeValues = (0, utils_1.mergeWithMergingArrays)(defaultKubeValues, deployConfig.values);
   var kubernetesEnvironment = {
     namespace: context.environment.envVars.KUBE_NAMESPACE
   };
@@ -115,25 +135,29 @@ var createKubernetesDeployJobs = function (context) {
           forceQuotes: true
         }),
         HELM_GITLAB_CHART_NAME: "the-panter-chart",
-        HELM_ARGS: deployConfig.additionalHelmArgs,
+        HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_e = deployConfig.additionalHelmArgs) !== null && _e !== void 0 ? _e : []), false).join(" "),
         COMPONENT_NAME: context.componentName,
+        BUILD_ID: (_f = context.commitInfo) === null || _f === void 0 ? void 0 : _f.buildId,
         // TODO: unify with docker build stage
+        IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
         IMAGE_TAG: "$CI_COMMIT_SHA"
       })
     }
   };
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
+  var clusterName = "kube-".concat(context.environment.fullName);
+  var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
   return [(0, lodash_1.merge)({}, baseDeploymentJob, shared, {
     job: {
-      script: ["kubernetesEnsureNamespace", "kubernetesCreateSecret", "kubernetesDeploy"],
+      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false),
       environment: {
         kubernetes: kubernetesEnvironment
       }
     }
   }), (0, lodash_1.merge)({}, baseStopJob, shared, {
     job: {
-      script: ["kubernetesDelete"],
+      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false),
       environment: {
         kubernetes: kubernetesEnvironment
       }

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

@@ -12,7 +12,4 @@ export declare const createMongodbBaseConfig: (context: Context) => {
       storageClass: string;
     };
   };
-} | {
-  mongodb?: undefined;
-  "mongodb-replicaset"?: undefined;
 };

package/dist/deploy/kubernetes/mongodb.js

@@ -4,9 +4,7 @@ exports.__esModule = true;
 exports.createMongodbBaseConfig = void 0;
 
 var createMongodbBaseConfig = function (context) {
-  var _a, _b;
-
-  return context.componentConfig.deploy && ((_b = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? {
+  return {
     mongodb: {
       enabled: true,
       backup: {
@@ -19,7 +17,7 @@ var createMongodbBaseConfig = function (context) {
         storageClass: ["prod", "stage"].includes(context.environment.envType) ? "fast" : "standard"
       }
     }
-  } : {};
+  };
 };
 
 exports.createMongodbBaseConfig = createMongodbBaseConfig;