@catladder/pipeline 1.101.3 → 1.102.0

package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap

@@ -55,7 +55,7 @@ exports[`matches snapshot 1`] = `
           "HOST_CANONICAL": "api.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -388,7 +388,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           "HOST_CANONICAL": "api.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -510,7 +510,7 @@ mongodb:
           "HOST_CANONICAL": "api.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -811,7 +811,7 @@ mongodb:
           "HOST_CANONICAL": "api.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-api",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -1144,7 +1144,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           "HOST_CANONICAL": "api.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-api",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -1266,7 +1266,7 @@ mongodb:
           "HOST_CANONICAL": "api.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-api",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -1567,7 +1567,7 @@ mongodb:
           "HOST_CANONICAL": "api.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1684,7 +1684,7 @@ mongodb:
           "HOST_CANONICAL": "api.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -2108,7 +2108,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           "HOST_CANONICAL": "api.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -2242,7 +2242,7 @@ mongodb:
           "HOST_CANONICAL": "api.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -2364,7 +2364,7 @@ mongodb:
           "HOST_CANONICAL": "api.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",
@@ -2486,7 +2486,7 @@ mongodb:
           "HOST_CANONICAL": "api.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "api",
           "KUBE_APP_NAME_PREFIX": "",

package/examples/__snapshots__/rails-k8s-with-worker.ts.snap

@@ -54,7 +54,7 @@ exports[`matches snapshot 1`] = `
           "HOST_CANONICAL": "app.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -269,7 +269,7 @@ jobs:
           "HOST_CANONICAL": "app.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -384,7 +384,7 @@ jobs:
           "HOST_CANONICAL": "app.dev.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -662,7 +662,7 @@ jobs:
           "HOST_CANONICAL": "app.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-app",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -880,7 +880,7 @@ jobs:
           "HOST_CANONICAL": "app.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-app",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -998,7 +998,7 @@ jobs:
           "HOST_CANONICAL": "app.mr1234.review.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "mr1234-app",
           "KUBE_APP_NAME_PREFIX": "mr1234-",
@@ -1279,7 +1279,7 @@ jobs:
           "HOST_CANONICAL": "app.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1389,7 +1389,7 @@ jobs:
           "HOST_CANONICAL": "app.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1610,7 +1610,7 @@ jobs:
           "HOST_CANONICAL": "app.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1733,7 +1733,7 @@ jobs:
           "HOST_CANONICAL": "app.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1848,7 +1848,7 @@ jobs:
           "HOST_CANONICAL": "app.prod.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",
@@ -1963,7 +1963,7 @@ jobs:
           "HOST_CANONICAL": "app.stage.test-app.pan.panter.cloud",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "KUBE_APP_NAME": "app",
           "KUBE_APP_NAME_PREFIX": "",

package/examples/__snapshots__/wait-for-other-deploy.ts.snap

@@ -172,7 +172,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -461,7 +461,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -818,7 +818,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -1107,7 +1107,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -1481,7 +1481,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -1529,7 +1529,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -1813,7 +1813,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",
@@ -1865,7 +1865,7 @@ exports[`matches snapshot 1`] = `
           "HOST": "unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
-          "KUBERNETES_MEMORY_LIMIT": "200Mi",
+          "KUBERNETES_MEMORY_LIMIT": "400Mi",
           "KUBERNETES_MEMORY_REQUEST": "200Mi",
           "ROOT_URL": "https://unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INFO_BUILD_TIME","BUILD_INFO_CURRENT_VERSION","HOST","ROOT_URL"]",

package/examples/custom-deploy.ts

@@ -13,6 +13,9 @@ const config: Config = {
       deploy: {
         type: "custom",
         requiresDocker: true,
+        jobVars: {
+          secret: ["DEPLOY_API_KEY"],
+        },
         script: ["echo 'would deploy'"],
         stopScript: ["echo 'would stop'"],
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.101.3",
+  "version": "1.102.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/build/base/createBuildJob.ts

@@ -27,6 +27,7 @@ export const createBuildJob = (
         ...RUNNER_BUILD_RESOURCE_VARIABLES,
         ...(variables ?? {}),
         ...context.environment.envVars,
+        ...context.environment.jobOnlyVars.build.envVars,
         ...(context.componentConfig.build.extraVars ?? {}),
       },
 

package/src/build/custom/testJob.ts

@@ -29,6 +29,7 @@ export const createCustomTestJobs = (context: Context): CatladderJob[] => {
     variables: {
       APP_PATH: context.componentConfig.dir,
       ...RUNNER_CUSTOM_TEST_VARIABLES,
+      ...context.environment.jobOnlyVars.build.envVars,
       ...(buildConfig.extraVars ?? {}),
     },
     services: buildConfig.jobServices,

package/src/build/node/testJob.ts

@@ -18,6 +18,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
     variables: {
       APP_PATH: context.componentConfig.dir,
       ...NODE_RUNNER_BUILD_VARIABLES,
+      ...context.environment.jobOnlyVars.build.envVars,
       ...(buildConfig.extraVars ?? {}),
     },
     stage: "test",

package/src/build/rails/build.ts

@@ -18,7 +18,10 @@ export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
 
   return [
     createDockerBuildJobBase(context, {
-      variables: context.componentConfig.build.extraVars,
+      variables: {
+        ...context.environment.jobOnlyVars.build.envVars,
+        ...context.componentConfig.build.extraVars,
+      },
       // custom script
       script: [
         gitlabDockerLogin,

package/src/build/rails/test.ts

@@ -11,7 +11,10 @@ export const createRailsTestJobs = (context: Context): CatladderJob[] => {
   const buildConfig = context.componentConfig.build;
 
   const base: Omit<CatladderJob, "script" | "name"> = {
-    variables: buildConfig.extraVars ?? {},
+    variables: {
+      ...context.environment.jobOnlyVars.build.envVars,
+      ...(buildConfig.extraVars ?? {}),
+    },
     stage: "test",
     needs: [],
     envMode: "none",

package/src/build/types.ts

@@ -1,4 +1,4 @@
-import type { GitlabJobImage, GitlabJobService } from "../types";
+import type { EnvVars, GitlabJobImage, GitlabJobService } from "../types";
 
 import type { CatladderJob } from "../types/jobs";
 
@@ -17,8 +17,16 @@ export type BuildConfigBase = {
    * command to run on the image to start the app (e.g. yarn start)
    */
   startCommand?: string;
+
+  /**
+   * vars that only exist in the build jobs.
+   * Can curently not reference other variables from other components
+   */
+  jobVars?: EnvVars;
   /**
    * additional env vars for the buid jobs
+   *
+   * @deprecated use jobVars
    */
   extraVars?: Record<string, string>;
   /**

package/src/context/getEnvironment.ts

@@ -10,8 +10,12 @@ export const getEnvironment = async (
   env: string,
   commitInfo?: CommitInfo
 ): Promise<Environment> => {
-  const { envVars, secretEnvVarKeys, host, url } =
-    await getEnvironmentVariables(config, componentName, env, commitInfo);
+  const variables = await getEnvironmentVariables(
+    config,
+    componentName,
+    env,
+    commitInfo
+  );
 
   const envContext = getEnvironmentContext(
     config,
@@ -24,17 +28,15 @@ export const getEnvironment = async (
 
   return {
     envType,
-    host,
-    url,
+
     gitlabEnvironment: {
       name: envContext.gitlabEnvironmentName,
-      url,
+      url: variables.url,
     },
     fullName: envContext.fullName,
     slugPrefix: envContext.environmentSlugPrefix,
     slug: envContext.environmentSlug,
     shortName: env,
-    envVars,
-    secretEnvVarKeys,
+    ...variables,
   };
 };

package/src/context/getEnvironmentVariables.ts

@@ -1,6 +1,10 @@
-import { isObject, merge } from "lodash";
+import { merge } from "lodash";
 import { DEPLOY_TYPES } from "../deploy";
-import type { CommitInfo, Context } from "../types";
+import type {
+  CommitInfo,
+  Context,
+  EnvironmentEnvVarPart as EnvironmentVariables,
+} from "../types";
 import type { Config, DevLocalEnvConfig } from "../types/config";
 
 import { getEnvironmentContext } from "./getEnvironmentContext";
@@ -8,6 +12,12 @@ import {
   resolveReferences,
   translateLegacyFromComponents,
 } from "./resolveReferences";
+import {
+  stringListToSecreteEnvVarList,
+  makeSecretEnvVarMapping,
+  stringifyValues,
+} from "./utils/envVars";
+import { transformJobOnlyVars } from "./transformJobOnlyVars";
 
 export type SecretEnvVar = {
   key: string;
@@ -20,12 +30,7 @@ export const getEnvironmentVariables = async (
   env: string,
   commitInfo?: CommitInfo,
   alreadyVisited: Record<string, Record<string, boolean>> = {} // to prevent endless loop
-): Promise<{
-  envVars: Record<string, string>;
-  secretEnvVarKeys: SecretEnvVar[];
-  host: string;
-  url: string;
-}> => {
+): Promise<EnvironmentVariables> => {
   const environmentContext = getEnvironmentContext(
     config,
     env,
@@ -33,7 +38,8 @@ export const getEnvironmentVariables = async (
     commitInfo
   );
 
-  const { envConfigRaw, deployConfigRaw, envType } = environmentContext;
+  const { envConfigRaw, deployConfigRaw, buildConfigRaw, envType } =
+    environmentContext;
 
   const basePredefinedVariables = {
     ENV_SHORT: env,
@@ -90,31 +96,24 @@ export const getEnvironmentVariables = async (
     : [];
 
   const secretEnvVarKeys: SecretEnvVar[] = [
-    ...(envConfigRaw.vars?.secret ?? []).map((key) => ({ key })),
+    ...stringListToSecreteEnvVarList(envConfigRaw.vars?.secret ?? []),
     ...additionalSecretKeys,
   ];
-  const secretEnvVars = Object.fromEntries(
-    secretEnvVarKeys.map(({ key }) => [
-      key,
-      `$${getSecretVarName(env, componentName, key)}`,
-    ])
+  const secretEnvVars = makeSecretEnvVarMapping(
+    env,
+    componentName,
+    secretEnvVarKeys
   );
-
   // this is deprecated, we now support: $componentname:FOO
   const legacyFromComponents = envConfigRaw.vars?.fromComponents ?? {};
-  const publicEnvVarsRawWithLegasyFromComponents = merge(
+  const publicEnvVarsRawWithLegacyFromComponents = merge(
     {},
     translateLegacyFromComponents(legacyFromComponents),
     publicEnvVarsRaw
   );
 
-  const publicEnvVarsRawSanitized = Object.fromEntries(
-    Object.entries(publicEnvVarsRawWithLegasyFromComponents).map(
-      ([key, value]) => [
-        key,
-        isObject(value) ? JSON.stringify(value) : `${value}`,
-      ]
-    )
+  const publicEnvVarsRawSanitized = stringifyValues(
+    publicEnvVarsRawWithLegacyFromComponents
   );
 
   const envVarsRaw = addIndexVar({
@@ -141,6 +140,19 @@ export const getEnvironmentVariables = async (
   return {
     envVars,
     secretEnvVarKeys,
+    jobOnlyVars: {
+      build: await transformJobOnlyVars(
+        env,
+        componentName,
+        (buildConfigRaw && buildConfigRaw.jobVars) || null
+      ),
+      deploy: await transformJobOnlyVars(
+        env,
+        componentName,
+        (deployConfigRaw && deployConfigRaw.jobVars) || null
+      ),
+    },
+
     host,
     url,
   };

package/src/context/transformJobOnlyVars.ts

@@ -0,0 +1,42 @@
+import type { EnvironmentEnvVars } from "..";
+import type { EnvVars } from "../types/config";
+import {
+  makeSecretEnvVarMapping,
+  stringListToSecreteEnvVarList,
+  stringifyValues,
+} from "./utils/envVars";
+
+/**
+ * transform EnvVars for environment.
+ *
+ * currently does not resolve references and is only used for additional job-only-vars
+ * @param vars
+ * @returns
+ */
+export const transformJobOnlyVars = async (
+  env: string,
+  componentName: string,
+  vars: EnvVars | null
+): Promise<EnvironmentEnvVars> => {
+  if (!vars) {
+    return {
+      envVars: {},
+      secretEnvVarKeys: [],
+    };
+  }
+
+  const publicVars = stringifyValues(vars?.public ?? {});
+  const secretEnvVarKeys = stringListToSecreteEnvVarList(vars?.secret ?? []);
+  const deployJobOnlySecretEnvVars = vars?.secret
+    ? makeSecretEnvVarMapping(env, componentName, secretEnvVarKeys)
+    : {};
+
+  const envVars = {
+    ...deployJobOnlySecretEnvVars,
+    ...publicVars,
+  };
+  return {
+    envVars,
+    secretEnvVarKeys,
+  };
+};

package/src/context/utils/envVars.ts

@@ -0,0 +1,26 @@
+import { isObject } from "lodash";
+import type { SecretEnvVar } from "../getEnvironmentVariables";
+import { getSecretVarName } from "../getEnvironmentVariables";
+
+export const stringifyValues = (obj: Record<string, unknown>) =>
+  Object.fromEntries(
+    Object.entries(obj).map(([key, value]) => [
+      key,
+      isObject(value) ? JSON.stringify(value) : `${value}`,
+    ])
+  );
+
+export const stringListToSecreteEnvVarList = (keys: string[]): SecretEnvVar[] =>
+  keys.map((key) => ({ key }));
+export const makeSecretEnvVarMapping = (
+  env: string,
+  componentName: string,
+  secretEnvVars: SecretEnvVar[]
+) => {
+  return Object.fromEntries(
+    secretEnvVars.map(({ key }) => [
+      key,
+      `$${getSecretVarName(env, componentName, key)}`,
+    ])
+  );
+};

package/src/deploy/base.ts

@@ -11,7 +11,7 @@ const DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
   KUBERNETES_MEMORY_REQUEST: "200Mi",
-  KUBERNETES_MEMORY_LIMIT: "200Mi",
+  KUBERNETES_MEMORY_LIMIT: "400Mi",
 };
 type JobWithoutScript = Omit<CatladderJob, "script">;
 export const getBaseDeploymentJob = (context: Context): JobWithoutScript => {
@@ -76,6 +76,7 @@ export const getBaseDeploymentJob = (context: Context): JobWithoutScript => {
       ...DEPLOY_RUNNER_VARIABLES,
       ...context.environment.envVars,
       ...(hasDocker ? getDockerImageVariables(context) : {}),
+      ...context.environment.jobOnlyVars.deploy.envVars,
       ...(context.componentConfig.deploy
         ? context.componentConfig.deploy.extraVars ?? {}
         : {}),
@@ -115,6 +116,7 @@ export const getBaseDeploymentStopJob = (
     ],
     variables: {
       ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
       GIT_STRATEGY: "none",
     },
     stage: "stop",
@@ -138,6 +140,7 @@ export const getBaseRollbackJob = (context: Context): JobWithoutScript => {
     ],
     variables: {
       ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
       GIT_STRATEGY: "none",
     },
     stage: "rollback",

package/src/deploy/types/base.ts

@@ -1,3 +1,5 @@
+import type { EnvVars } from "../../types/config";
+
 export type DeployConfigBase = {
   /**
    * whether to deploy automatically or manual. If not defined, these rules apply:
@@ -17,8 +19,16 @@ export type DeployConfigBase = {
    */
   jobTags?: string[];
 
+  /**
+   * vars that only exist in the deploy job.
+   * Can curently not reference other variables from other components
+   */
+  jobVars?: EnvVars;
+
   /**
    * additional env vars for the deploy job
+   *
+   * @deprecated use deploy.jobVars for deploy job specific variables
    */
   extraVars?: Record<string, string>;
 };