@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-1a40efc0

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

@@ -1,6 +1,8 @@
+import type { BuildConfig } from "../../build";
 import type { EnvironmentContext } from "../../types/environmentContext";
+import type { DeployConfigKubernetes } from "../types";
 export declare const additionalKubernetesSecretKeys: ({
   deployConfigRaw
-}: EnvironmentContext<any, "kubernetes">) => {
+}: EnvironmentContext<BuildConfig, DeployConfigKubernetes>) => {
   key: string;
 }[];

package/dist/deploy/kubernetes/additionalSecretKeys.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.additionalKubernetesSecretKeys = void 0;
 var additionalKubernetesSecretKeys = function (_a) {
   var _b, _c, _d, _e;

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

@@ -1,13 +1,14 @@
-import type { Context } from "../../../types";
-export declare const hasKubernetesCloudSQL: (context: Context) => boolean | undefined;
-declare type CloudSqlValues = {
+import type { ComponentContext } from "../../../types";
+import type { VariableValue } from "../../../variables/VariableValue";
+export declare const hasKubernetesCloudSQL: (context: ComponentContext) => boolean | undefined;
+type CloudSqlValues = {
   enabled: boolean;
   proxyCredentials: string;
   instanceConnectionName: string;
-  fullDbName: string;
+  fullDbName: VariableValue;
   dbUser: string;
 };
-export declare const createKubernetesCloudsqlBaseValues: (context: Context) => {
+export declare const createKubernetesCloudsqlBaseValues: (context: ComponentContext) => {
   cloudsql: CloudSqlValues;
 };
 export {};

package/dist/deploy/kubernetes/cloudSql/index.js

@@ -1,47 +1,40 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
 var context_1 = require("../../../context");
 var utils_1 = require("../../cloudSql/utils");
 var types_1 = require("../../types");
 var hasKubernetesCloudSQL = function (context) {
-  var _a, _b;
-  if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
-    return (_b = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled;
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
+    return (_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled;
   }
   return false;
 };
 exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
 var createKubernetesCloudsqlBaseValues = function (context) {
-  var _a, _b, _c, _d, _e;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
     throw new Error("cannot get cloud sql config");
   }
-  var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
+  var config = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql;
   if (!config) {
     throw new Error("cannot get cloud sql config");
   }
   var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
-  if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
-    var instanceConnectionName = "".concat((_b = config.projectId) !== null && _b !== void 0 ? _b : "skynet-164509", ":").concat((_c = config.region) !== null && _c !== void 0 ? _c : "europe-west6", ":").concat((_d = config.instanceId) !== null && _d !== void 0 ? _d : context.environment.envVars.KUBE_NAMESPACE);
+  if (config.type === "unmanaged") {
     return {
       cloudsql: {
         enabled: config.enabled,
-        dbUser: "postgres",
-        instanceConnectionName: instanceConnectionName,
-        proxyCredentials: proxyCredentials,
-        fullDbName: context.environment.envVars.KUBE_APP_NAME
-      }
-    };
-  } else if (config.type === "unmanaged") {
-    return {
-      cloudsql: {
-        enabled: config.enabled,
-        dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
+        dbUser: (_c = config.dbUser) !== null && _c !== void 0 ? _c : "postgres",
         instanceConnectionName: config.instanceConnectionName,
         proxyCredentials: proxyCredentials,
-        fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
+        fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.name)
       }
     };
   } else {

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

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createKubernetesDeployJobs: (context: Context) => CatladderJob[];
+export declare const createKubernetesDeployJobs: (context: ComponentContext) => CatladderJob[];

package/dist/deploy/kubernetes/deployJob.js

@@ -41,48 +41,49 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createKubernetesDeployJobs = void 0;
-var js_yaml_1 = require("js-yaml");
+var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
 var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var kubeValues_1 = require("./kubeValues");
-var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
+var bashYaml_1 = require("../../bash/bashYaml");
+var gitlab_1 = require("../../utils/gitlab");
+var ALL_VALUES_FILE = "__all_values.yml";
 var createKubernetesDeployJobs = function (context) {
   var _a, _b, _c;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
   }
-  var kubeValues = (0, kubeValues_1.createKubeValues)(context);
-  var shared = {
-    image: (0, runner_1.getRunnerImage)("kubernetes"),
+  var shared = __assign(__assign({
+    image: (0, runner_1.getRunnerImage)("kubernetes")
+  }, deployConfig.debug ? {
+    artifacts: {
+      paths: [ALL_VALUES_FILE // debug
+      ],
+      when: "always"
+    }
+  } : {}), {
     variables: __assign(__assign({}, context.environment.envVars), {
       RELEASE_NAME: context.environment.fullName,
       HELM_EXPERIMENTAL_OCI: "1",
-      KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
-      KUBE_VALUES: (0, js_yaml_1.dump)(kubeValues, {
-        lineWidth: -1,
-        quotingType: "'",
-        forceQuotes: true
-      }),
-      HELM_GITLAB_CHART_NAME: (_a = deployConfig.chartName) !== null && _a !== void 0 ? _a : "/helm-charts/the-panter-chart",
-      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_b = deployConfig.additionalHelmArgs) !== null && _b !== void 0 ? _b : []), false).join(" "),
-      COMPONENT_NAME: context.componentName,
-      BUILD_ID: (_c = context.commitInfo) === null || _c === void 0 ? void 0 : _c.buildId
+      KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.name),
+      HELM_GITLAB_CHART_NAME: (_b = deployConfig.chartName) !== null && _b !== void 0 ? _b : "/helm-charts/the-panter-chart",
+      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : []), false).join(" "),
+      COMPONENT_NAME: context.name
     })
-  };
+  });
   var clusterName = "kube-".concat(context.environment.fullName);
   var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, getEnvironmentVariables_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, base_1.createDeployementJobs)(context, {
     deploy: __assign(__assign({}, shared), {
-      script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
+      script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), __read((0, gitlab_1.collapseableSection)("writeallvalues", "Write " + ALL_VALUES_FILE + " for helm deployment")((0, bashYaml_1.writeBashYamlToFileScript)((0, kubeValues_1.createKubeValues)(context), ALL_VALUES_FILE))), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
     }),
     stop: __assign(__assign({}, shared), {
       script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)

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

@@ -1,3 +1,3 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigKubernetes, DeployTypeDefinition } from "..";
 export * from "./cloudSql";
-export declare const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<"kubernetes">;
+export declare const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigKubernetes>;

package/dist/deploy/kubernetes/index.js

@@ -2,12 +2,16 @@
 
 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];
-    }
-  });
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function () {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
 } : function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   o[k2] = m[k];
@@ -15,15 +19,49 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
 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 __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));
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
   };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.KUBERNETES_DEPLOY_TYPE = void 0;
 var slugify_1 = __importDefault(require("slugify"));
 var __1 = require("..");
+var BashExpression_1 = require("../../bash/BashExpression");
 var additionalSecretKeys_1 = require("./additionalSecretKeys");
 var deployJob_1 = require("./deployJob");
 __exportStar(require("./cloudSql"), exports);
@@ -39,22 +77,21 @@ exports.KUBERNETES_DEPLOY_TYPE = {
       fullConfig = _a.fullConfig,
       deployConfigRaw = _a.deployConfigRaw,
       env = _a.env,
-      envType = _a.envType,
-      commitInfo = _a.commitInfo;
-    var KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
-    var KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
+      reviewSlug = _a.reviewSlug,
+      envType = _a.envType;
+    var KUBE_APP_NAME_PREFIX = envType === "review" && reviewSlug ? reviewSlug.concat("-") : "";
+    var KUBE_APP_NAME = KUBE_APP_NAME_PREFIX.concat(componentName);
     var KUBE_NAMESPACE = (0, __1.getKubernetesNamespace)(fullConfig, env);
-    var componentSlug = (0, slugify_1["default"])(componentName);
-    var envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
+    var componentSlug = (0, slugify_1.default)(componentName);
     var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.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
     fullConfig.domainCanonical || "panter.cloud";
-    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+    var HOSTNAME_INTERNAL = (0, BashExpression_1.joinBashExpressions)(__spreadArray(__spreadArray([componentSlug], __read(envType === "review" && reviewSlug ? [reviewSlug] : []), false), [env, fullConfig.appName, fullConfig.customerName, domainCanonical], false), "."); // default for kubernetes and rest
     return {
       KUBE_NAMESPACE: KUBE_NAMESPACE,
       KUBE_APP_NAME: KUBE_APP_NAME,
       KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
-      HOST_CANONICAL: HOST_CANONICAL
+      HOSTNAME_INTERNAL: HOSTNAME_INTERNAL
     };
   }
 };

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

@@ -1,9 +1,10 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
+import type { VariableValue } from "../../variables/VariableValue";
 /**
  * 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>;
+export declare const createKubeEnv: (context: ComponentContext) => {
+  secret: Record<string, VariableValue>;
+  public: Record<string, VariableValue>;
 };

package/dist/deploy/kubernetes/kubeEnv.js

@@ -32,11 +32,14 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createKubeEnv = void 0;
 var types_1 = require("../types");
 var shouldGoIntoSecrets = function (key, value) {
   var _a;
+  if (!value) return false;
   if ((_a = String(value)) === null || _a === void 0 ? void 0 : _a.includes("$CL_")) {
     return true;
   }
@@ -47,7 +50,8 @@ var shouldGoIntoSecrets = function (key, value) {
  * 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")) {
+  var _a;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
   }
@@ -57,11 +61,11 @@ var createKubeEnv = function (context) {
     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));
+    if (shouldGoIntoSecrets(key, value === null || value === void 0 ? void 0 : value.toString())) {
+      acc.secret = __assign(__assign({}, acc.secret), (_b = {}, _b[key] = value !== null && value !== void 0 ? value : "", _b));
       return acc;
     }
-    acc.public = __assign(__assign({}, acc.public), (_c = {}, _c[key] = value, _c));
+    acc.public = __assign(__assign({}, acc.public), (_c = {}, _c[key] = value !== null && value !== void 0 ? value : "", _c));
     return acc;
   }, {
     secret: {},

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

@@ -1,8 +1,8 @@
-import type { Context } from "../../types/context";
-export declare const createKubeValues: (context: Context) => never[] | ({
+import type { ComponentContext } from "../../types/context";
+export declare const createKubeValues: (context: ComponentContext) => never[] | ({
   env: {
-    secret: Record<string, string>;
-    public: Record<string, string>;
+    secret: Record<string, import("../..").VariableValue>;
+    public: Record<string, import("../..").VariableValue>;
   };
   application: false | import("../types/base").AllowUnknownProps<{
     command?: string | undefined;
@@ -62,7 +62,7 @@ export declare const createKubeValues: (context: Context) => never[] | ({
     } | undefined;
   }> | undefined;
 } & {
-  cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQL | undefined;
+  cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQLUnmanaged | undefined;
   mongodb?: import("../types").DeployConfigMongodb | undefined;
   mailhog?: {
     enabled: boolean;
@@ -73,7 +73,6 @@ export declare const createKubeValues: (context: Context) => never[] | ({
   mapServiceUrlToEnv?: {
     [envVar: string]: string;
   } | undefined;
-  secretsAsFile?: string[] | undefined;
   jobs: {
     [k: string]: false | import("../types/base").AllowUnknownProps<{
       command: string;

package/dist/deploy/kubernetes/kubeValues.js

@@ -40,7 +40,9 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createKubeValues = void 0;
 var lodash_1 = require("lodash");
 var utils_1 = require("../../utils");
@@ -48,7 +50,6 @@ 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 createAppConfig = function (context, application) {
   if (application === false) {
     return {
@@ -61,7 +62,7 @@ var createAppConfig = function (context, application) {
     rest = __rest(_a, ["healthRoute", "command"]);
   return (0, utils_1.mergeWithMergingArrays)({
     host: context.environment.host,
-    command: command !== null && command !== void 0 ? command : context.componentConfig.build.startCommand,
+    command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
     livenessProbe: {
       httpGet: {
         path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"
@@ -79,10 +80,8 @@ var createAppConfig = function (context, application) {
     }
   },
   // default
-  rest // merge rest in
-  );
+  rest);
 };
-
 var removeFalsy = function (record) {
   if (!record) return undefined;
   return Object.fromEntries(Object.entries(record).filter(function (_a) {
@@ -92,9 +91,9 @@ var removeFalsy = function (record) {
   }));
 };
 var createKubeValues = function (context) {
-  var _a, _b;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if (!deployConfig) {
     return [];
   }
   if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
@@ -104,21 +103,20 @@ var createKubeValues = function (context) {
   var values = deployConfig.values;
   // we remove the application config because it can be just the value `false` which is a convenience feature, but not supported in the helm chart
   // we only merge the rest of the values in
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  var _c = values !== null && values !== void 0 ? values : {},
-    application = _c.application,
-    jobs = _c.jobs,
-    cronjobs = _c.cronjobs,
-    rest = __rest(_c, ["application", "jobs", "cronjobs"]);
+  var _d = values !== null && values !== void 0 ? values : {},
+    application = _d.application,
+    jobs = _d.jobs,
+    cronjobs = _d.cronjobs,
+    rest = __rest(_d, ["application", "jobs", "cronjobs"]);
   var env = (0, kubeEnv_1.createKubeEnv)(context);
   var defaultKubeValues = (0, lodash_1.merge)({
     env: env,
     application: createAppConfig(context, application)
-  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
-  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
+  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
+  var kubeValues = (0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
     jobs: removeFalsy(jobs),
     cronjobs: removeFalsy(cronjobs)
-  }, rest)));
+  }, rest));
   return kubeValues;
 };
 exports.createKubeValues = createKubeValues;

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

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
-export declare const createMongodbBaseConfig: (context: Context) => {
+import type { ComponentContext } from "../../types/context";
+export declare const createMongodbBaseConfig: (context: ComponentContext) => {
   mongodb: {
     enabled: boolean;
     auth: {

package/dist/deploy/kubernetes/mongodb.js

@@ -10,7 +10,9 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createMongodbBaseConfig = void 0;
 var lodash_1 = require("lodash");
 var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
@@ -31,15 +33,15 @@ var getMongodbReplicasetHost = function (context, index) {
   return getMongodbHost(context, "".concat(fullAppname, "-mongodb-").concat(index, ".").concat(fullAppname, "-mongodb-headless"));
 };
 var createMongodbUrl = function (context, dbName) {
-  var _a, _b;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c, _d;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
     throw new Error("can only createMongodbUrl on supported deploys");
   }
-  var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   var queryParams = undefined;
   var hosts = "";
   if ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset") {
-    hosts = (0, lodash_1.range)(0, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _b !== void 0 ? _b : 2).map(function (i) {
+    hosts = (0, lodash_1.range)(0, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _d !== void 0 ? _d : 2).map(function (i) {
       return getMongodbReplicasetHost(context, i);
     }).join(",");
     queryParams = "replicaSet=rs0&authSource=admin";
@@ -50,11 +52,11 @@ var createMongodbUrl = function (context, dbName) {
   return "mongodb://".concat(getCredentialString(context)).concat(hosts, "/").concat(dbName).concat(queryParams ? "?".concat(queryParams) : "");
 };
 var createMongoBackupDefaultConfig = function (context) {
-  var _a;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
-  var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   var fullAppName = context.environment.envVars.KUBE_APP_NAME;
   var backupEnabled = ["prod", "stage"].includes(context.environment.envType);
   var hostToBackup;
@@ -79,11 +81,11 @@ var createMongoBackupDefaultConfig = function (context) {
   };
 };
 var createMongodbBaseConfig = function (context) {
-  var _a, _b;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c, _d;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
-  var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   return {
     mongodb: {
       enabled: true,
@@ -99,7 +101,7 @@ var createMongodbBaseConfig = function (context) {
     },
     env: {
       secret: __assign({
-        MONGO_URL: createMongodbUrl(context, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _b !== void 0 ? _b : "app")
+        MONGO_URL: createMongodbUrl(context, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _d !== void 0 ? _d : "app")
       }, (mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset" ? {
         MONGO_OPLOG_URL: createMongodbUrl(context, "local")
       } // oplog only works with replicasets

package/dist/deploy/sbom.d.ts

@@ -1,4 +1,4 @@
-import type { Context } from "../types/context";
-export declare const sbomDeactivated: (context: Context) => boolean;
-export declare const getDependencyTrackUploadScript: (context: Context) => string[];
-export declare const getDependencyTrackDeleteScript: (context: Context) => string[];
+import { type ComponentContext } from "../types/context";
+export declare const sbomDeactivated: (context: ComponentContext) => boolean;
+export declare const getDependencyTrackUploadScript: (context: ComponentContext) => string[];
+export declare const getDependencyTrackDeleteScript: (context: ComponentContext) => string[];

package/dist/deploy/sbom.js

@@ -1,17 +1,20 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
 var sbom_1 = require("../build/sbom");
+var context_1 = require("../types/context");
 var sbomDeactivated = function (context) {
-  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false;
+  return (0, context_1.componentContextIsStandaloneBuild)(context) && context.build.config.type === "custom" && context.build.config.sbom === false;
 };
 exports.sbomDeactivated = sbomDeactivated;
 var getDependencyTrackUploadScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo Uploading SBOM to Dependency Track", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Uploading SBOM to Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
 var getDependencyTrackDeleteScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo Disabling component in Dependency Track", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Disabling component in Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.url, "\" || true")];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

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

@@ -1,5 +1,5 @@
 import type { EnvVars } from "../../types/config";
-export declare type DeployConfigBase = {
+export type DeployConfigBase = {
   /**
    * whether to deploy automatically or manual. If not defined, these rules apply:
    * - prod: manual
@@ -21,10 +21,10 @@ export declare type DeployConfigBase = {
    */
   jobVars?: EnvVars;
   /**
-   * additional env vars for the deploy job
+   * additional vars only for the runner.
+   * Also if you use services: that require env vars, you need to set them here.
    *
-   * @deprecated use deploy.jobVars for deploy job specific variables
    */
-  extraVars?: Record<string, string>;
+  runnerVariables?: Record<string, string>;
 };
-export declare type AllowUnknownProps<T extends Record<string, unknown>> = T & Record<string, unknown>;
+export type AllowUnknownProps<T extends Record<string, unknown>> = T & Record<string, unknown>;

package/dist/deploy/types/base.js

@@ -1,3 +1,5 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,7 +1,7 @@
+import type { WithCacheConfig } from "../../build";
 import type { GitlabJobImage } from "../../types";
-import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
-export declare type DeployConfigCustom = {
+export type DeployConfigCustom = {
   /**
    * custom deploy types allow you to specify custom commands to deploy your app
    */
@@ -26,8 +26,4 @@ export declare type DeployConfigCustom = {
    * image to use
    */
   jobImage?: GitlabJobImage;
-  /**
-   * customize cache for the job
-   */
-  jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase & WithCacheConfig;