@catladder/pipeline 1.146.2 → 1.148.0

package/src/build/rails/test.ts

@@ -11,7 +11,7 @@ export const createRailsTestJobs = (
     return [];
   }
 
-  const buildConfig = context.componentConfig.build;
+  const buildConfig = context.build.config;
 
   const base: Omit<CatladderJob, "script" | "name"> = {
     variables: {
@@ -45,7 +45,7 @@ export const createRailsTestJobs = (
           image:
             buildConfig.audit?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
               "gem install bundler-audit",
               "bundle audit check",
@@ -65,7 +65,7 @@ export const createRailsTestJobs = (
           image:
             buildConfig.lint?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...bundlerInstall,
             ...(ensureArray(buildConfig.lint?.command) ?? [
               "bundle exec rubocop",
@@ -83,7 +83,7 @@ export const createRailsTestJobs = (
           image:
             buildConfig.test?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...bundlerInstall,
             ...(ensureArray(buildConfig.test?.command) ?? [
               "bundle exec rspec",

package/src/build/sbom.ts

@@ -6,14 +6,14 @@ export const SBOM_BUILD_JOB_NAME = "🧾 sbom";
 export const SBOM_FILE = "__sbom.json";
 
 export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
-  const buildConfig = context.componentConfig.build;
+  const buildConfig = context.build.config;
 
   const defaultImage = "aquasec/trivy:0.38.3";
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.buildContext.packageManagerInfo?.componentIsInWorkspace
+      context.build.packageManagerInfo?.componentIsInWorkspace
         ? "."
-        : context.buildContext.dir
+        : context.build.dir
     }`,
   ];
 

package/src/build/types.ts

@@ -58,28 +58,6 @@ export type BuildConfigBase = {
    */
   buildCommand?: string | string[] | null;
 
-  /**
-   * customize docker build
-   */
-  docker?: {
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsBegin?: string[];
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsEnd?: string[];
-  };
-
   /**
    * customize lint, set false to disable
    */
@@ -132,11 +110,13 @@ export type BuildConfigNodeBase = BuildConfigBase & {
 
 export type BuildConfigNode = {
   type: "node";
+  docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
 
 export type BuildConfigNodeStatic = BuildConfigNodeBase & {
   type: "node-static";
   startCommand?: never;
+  docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
 };
 
 export type BuildConfigMeteor = BuildConfigNodeBase & {
@@ -146,23 +126,58 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
    * This is only required if you have custom scripts in your image
    */
   installScripts?: boolean;
+  docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
 };
 
-export type BuildConfigCustomDocker = BuildConfigBase["docker"] &
-  (
-    | {
-        /**
-         * use the built-in nginx image for simple static apps
-         */
-        type: "nginx";
-      }
-    | {
-        /**
-         * custom docker build, expect that a Dockerfile in your directory
-         */
-        type: "custom";
-      }
-  );
+type BuildConfigDockerWithAdditions = {
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
+   *
+   */
+  additionsBegin?: string[];
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
+   *
+   */
+  additionsEnd?: string[];
+};
+
+type BuildConfigDockerBuiltInNode = {
+  type: "node";
+} & BuildConfigDockerWithAdditions;
+
+type BuildConfigDockerBuiltInMeteor = {
+  type: "meteor";
+} & BuildConfigDockerWithAdditions;
+
+type BuildConfigDockerBuiltInNgninx = {
+  /**
+   * use the built-in nginx image for simple static apps
+   */
+  type: "nginx";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltIn =
+  | BuildConfigDockerBuiltInNgninx
+  | BuildConfigDockerBuiltInNode
+  | BuildConfigDockerBuiltInMeteor;
+
+type BuildConfigDockerCustom = {
+  /**
+   * custom docker build, expect that a Dockerfile in your directory
+   */
+  type: "custom";
+};
+
+export type BuildConfigDocker =
+  | BuildConfigDockerBuiltIn
+  | BuildConfigDockerCustom;
+
+/**
+ * @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
+ */
+export type BuildConfigCustomDocker =
+  | BuildConfigDockerCustom
+  | BuildConfigDockerBuiltInNgninx;
 
 export type BuildConfigCustom = Omit<
   BuildConfigBase,
@@ -175,7 +190,7 @@ export type BuildConfigCustom = Omit<
    */
   jobServices?: Services;
 
-  docker: BuildConfigCustomDocker;
+  docker: BuildConfigDocker;
 
   /**
    * custom lint, disabled when not set

package/src/context/getLabels.ts

@@ -14,7 +14,7 @@ export const getLabels = (context: ComponentContext) => {
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.environment.shortName),
-    "build-type": sanitize(context.componentConfig.build?.type),
+    "build-type": sanitize(context.build.config?.type),
     ...(context.fullConfig.meta?.labels ?? {}),
   };
   return labels;

package/src/context/index.ts

@@ -1,3 +1,4 @@
+import { isFunction } from "lodash";
 import { BUILD_TYPES } from "../build";
 import type { BuildConfig, BuildConfigType } from "../build/types";
 import { DEPLOY_TYPES } from "../deploy";
@@ -56,20 +57,35 @@ export const createComponentContext = async (
     componentConfigWithoutDefaults,
   );
 
-  return {
+  const environment = await getEnvironment(ctx);
+  const { deploy, build, customJobs, dir } = componentConfig;
+  const context: Omit<ComponentContext, "customJobs"> = {
     fullConfig: ctx.config,
     componentConfig,
-    buildContext: {
-      dir: componentConfig.dir,
+
+    build: {
+      dir: dir,
       packageManagerInfo: ctx.packageManagerInfo,
-      config: componentConfig.build,
+      config: build,
     },
+    deploy: deploy
+      ? {
+          config: deploy,
+        }
+      : null,
     componentName: ctx.componentName,
-    environment: await getEnvironment(ctx),
+    environment,
     packageManagerInfo: ctx.packageManagerInfo,
     pipelineType: ctx.pipelineType,
     trigger: ctx.trigger,
   };
+  const resolvedCustomJobs = isFunction(customJobs)
+    ? customJobs(context)
+    : customJobs;
+  return {
+    ...context,
+    customJobs: resolvedCustomJobs,
+  };
 };
 
 /**

package/src/deploy/base/deploy.ts

@@ -37,11 +37,11 @@ export const createDeployJob = (
         ? "4 weeks"
         : undefined;
 
+  const deployConfig = context.deploy?.config;
+
   // if auto or manual is configured explicitly, use that
   const whenDeployDefined =
-    context.componentConfig.deploy && context.componentConfig.deploy.when
-      ? context.componentConfig.deploy.when
-      : undefined;
+    deployConfig && deployConfig.when ? deployConfig.when : undefined;
   // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
   const whenDeployDefault =
     context.environment.envType !== "prod"
@@ -64,8 +64,8 @@ export const createDeployJob = (
       ...(sbomDeactivated(context)
         ? []
         : [{ job: SBOM_BUILD_JOB_NAME, artifacts: true }]),
-      ...(context.componentConfig.deploy
-        ? context.componentConfig.deploy.waitFor?.map((c) => ({
+      ...(deployConfig
+        ? deployConfig.waitFor?.map((c) => ({
             componentName: c,
             job: DEPLOY_JOB_NAME,
             artifacts: false,
@@ -91,17 +91,13 @@ export const createDeployJob = (
       ...context.environment.envVars,
       ...(hasDocker ? getDockerImageVariables(context) : {}),
       ...context.environment.jobOnlyVars.deploy.envVars,
-      ...(context.componentConfig.deploy
-        ? context.componentConfig.deploy.extraVars ?? {}
-        : {}),
+      ...(deployConfig ? deployConfig.extraVars ?? {} : {}),
       ...jobDefinition.variables,
     },
     runnerVariables: {
       ...DEPLOY_RUNNER_VARIABLES,
       ...(jobDefinition.runnerVariables ?? {}),
-      ...(context.componentConfig.deploy
-        ? context.componentConfig.deploy.runnerVariables ?? {}
-        : {}),
+      ...(deployConfig ? deployConfig.runnerVariables ?? {} : {}),
     },
     environment: isStoppable
       ? {
@@ -109,8 +105,6 @@ export const createDeployJob = (
           auto_stop_in: autoStop,
         }
       : undefined,
-    jobTags: context.componentConfig.deploy
-      ? context.componentConfig.deploy.jobTags
-      : undefined,
+    jobTags: deployConfig ? deployConfig.jobTags : undefined,
   };
 };

package/src/deploy/cloudRun/artifactsRegistry.ts

@@ -5,18 +5,16 @@ import { allowFailureInScripts } from "../../utils/gitlab";
 import { isOfDeployType } from "../types";
 import { removeFirstLinesFromCommandOutput } from "./utils/removeFirstLinesFromCommandOutput";
 
-export const getArtifactsRegistryHost = ({
-  componentConfig: { deploy },
-}: ComponentContext) => {
-  if (!isOfDeployType(deploy, "google-cloudrun")) {
+export const getArtifactsRegistryHost = (context: ComponentContext) => {
+  if (!isOfDeployType(context.deploy?.config, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  return `${deploy.region}-docker.pkg.dev`;
+  return `${context.deploy.config.region}-docker.pkg.dev`;
 };
 
 export const getArtifactsRegistryDockerUrl = (context: ComponentContext) => {
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
 
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
@@ -102,10 +100,7 @@ export const getDeleteUnusedImagesCommands = (
   context: ComponentContext,
   keep = 0,
 ) => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/src/deploy/cloudRun/cloudRunRevisions.ts

@@ -12,7 +12,8 @@ const getListRevisionsCommand = (
   },
 ) => {
   const serviceName = getServiceName(context);
-  const deployConfig = context.componentConfig.deploy;
+
+  const deployConfig = context.deploy?.config;
 
   if (!deployConfig || !isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
@@ -37,10 +38,7 @@ export const getDeleteUnusedRevisionsCommands = (
   context: ComponentContext,
   keep: number,
 ) => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/src/deploy/cloudRun/createJobs/cloudRunServices.ts

@@ -25,7 +25,7 @@ export const getServiceDeployScript = (
   const customConfig = service !== true ? service : undefined;
   const command =
     service !== true
-      ? service?.command ?? context.componentConfig.build.startCommand
+      ? service?.command ?? context.build.config.startCommand
       : undefined;
 
   const commandArray = command

package/src/deploy/cloudRun/createJobs/common.ts

@@ -1,4 +1,4 @@
-import type { ComponentContext } from "../../../types/context";
+import type { Context } from "../../../types/context";
 
 import { isOfDeployType } from "../../types";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
@@ -29,8 +29,8 @@ export const makeLabelString = (obj: Record<string, unknown>) =>
     .map(([key, value]) => `${key}=${value}`)
     .join(",");
 
-export const getCloudRunDeployConfig = (context: ComponentContext) => {
-  const deployConfig = context.componentConfig.deploy;
+export const getCloudRunDeployConfig = (context: Context) => {
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -38,7 +38,7 @@ export const getCloudRunDeployConfig = (context: ComponentContext) => {
   return deployConfig;
 };
 
-export function getCommonCloudRunArgs(context: ComponentContext) {
+export function getCommonCloudRunArgs(context: Context) {
   const deployConfig = getCloudRunDeployConfig(context);
   return {
     project: deployConfig.projectId,
@@ -46,7 +46,7 @@ export function getCommonCloudRunArgs(context: ComponentContext) {
   };
 }
 
-export function getCommonDeployArgs(context: ComponentContext) {
+export function getCommonDeployArgs(context: Context) {
   const commonArgs = getCommonCloudRunArgs(context);
   const deployConfig = getCloudRunDeployConfig(context);
   return {

package/src/deploy/cloudRun/createJobs/index.ts

@@ -12,10 +12,7 @@ import { getCloudRunStopScripts } from "./getCloudRunStopScripts";
 export const createGoogleCloudRunDeployJobs = (
   context: ComponentContext,
 ): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/src/deploy/custom/deployJob.ts

@@ -12,16 +12,14 @@ import { isOfDeployType } from "../types";
 export const createCustomDeployJobs = (
   context: ComponentContext,
 ): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
+
   if (!isOfDeployType(deployConfig, "custom")) {
     // should not happen
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  const yarnInstall = getYarnInstall(context.buildContext, {
+  const yarnInstall = getYarnInstall(context.build, {
     noCustomPostInstall: true,
   });
   return createDeployementJobs(context, {
@@ -29,7 +27,7 @@ export const createCustomDeployJobs = (
       image: deployConfig.jobImage ?? getRunnerImage("jobs-default"),
       cache: deployConfig.jobCache ?? [],
       script: [
-        `cd ${context.componentConfig.dir}`,
+        `cd ${context.build.dir}`,
         ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
         ...deployConfig.script,
         ...getDependencyTrackUploadScript(context),

package/src/deploy/dockerTag/deployJob.ts

@@ -8,10 +8,7 @@ import { isOfDeployType } from "../types";
 export const createDockerTagDeployJobs = (
   context: ComponentContext,
 ): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "dockerTag")) {
     // should not happen
     throw new Error("deploy config is not dockerTag");
@@ -19,7 +16,7 @@ export const createDockerTagDeployJobs = (
   const tag = deployConfig.tag;
   return createDeployementJobs(context, {
     deploy: {
-      ...getDockerJobBaseProps(context),
+      ...getDockerJobBaseProps(),
       script: [
         ...gitlabDockerLogin(context),
         `docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG`,

package/src/deploy/kubernetes/cloudSql/index.ts

@@ -5,8 +5,10 @@ import { getFullDbName } from "../../cloudSql/utils";
 import { isOfDeployType } from "../../types";
 
 export const hasKubernetesCloudSQL = (context: ComponentContext) => {
-  if (isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
-    return context.componentConfig.deploy.values?.cloudsql?.enabled;
+  const deployConfig = context.deploy?.config;
+
+  if (isOfDeployType(deployConfig, "kubernetes")) {
+    return deployConfig.values?.cloudsql?.enabled;
   }
   return false;
 };
@@ -24,11 +26,12 @@ export const createKubernetesCloudsqlBaseValues = (
 ): {
   cloudsql: CloudSqlValues;
 } => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  const deployConfig = context.deploy?.config;
+  if (!isOfDeployType(deployConfig, "kubernetes")) {
     throw new Error("cannot get cloud sql config");
   }
 
-  const config = context.componentConfig.deploy.values?.cloudsql;
+  const config = deployConfig.values?.cloudsql;
 
   if (!config) {
     throw new Error("cannot get cloud sql config");

package/src/deploy/kubernetes/deployJob.ts

@@ -17,10 +17,7 @@ const ALL_VALUES_FILE = "__all_values.yml";
 export const createKubernetesDeployJobs = (
   context: ComponentContext,
 ): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");

package/src/deploy/kubernetes/kubeEnv.ts

@@ -15,7 +15,7 @@ const shouldGoIntoSecrets = (key: string, value: string | undefined) => {
  * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
  */
 export const createKubeEnv = (context: ComponentContext) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
   }

package/src/deploy/kubernetes/kubeValues.ts

@@ -28,7 +28,7 @@ const createAppConfig = (
   return mergeWithMergingArrays(
     {
       host: context.environment.host,
-      command: command ?? context.componentConfig.build.startCommand,
+      command: command ?? context.build.config.startCommand,
       livenessProbe: {
         httpGet: {
           path: healthRoute ?? "__health",
@@ -57,8 +57,8 @@ const removeFalsy = <T>(record?: Record<string, false | T>) => {
 };
 
 export const createKubeValues = (context: ComponentContext) => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
+  const deployConfig = context.deploy?.config;
+  if (!deployConfig) {
     return [];
   }
   if (!isOfDeployType(deployConfig, "kubernetes")) {

package/src/deploy/kubernetes/mongodb.ts

@@ -23,10 +23,10 @@ const getMongodbReplicasetHost = (context: ComponentContext, index: number) => {
   );
 };
 const createMongodbUrl = (context: ComponentContext, dbName: string) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("can only createMongodbUrl on supported deploys");
   }
-  const mongodbConfig = context.componentConfig.deploy.values?.mongodb;
+  const mongodbConfig = context.deploy?.config.values?.mongodb;
 
   let queryParams: string | undefined = undefined;
 
@@ -47,10 +47,10 @@ const createMongodbUrl = (context: ComponentContext, dbName: string) => {
   }`;
 };
 const createMongoBackupDefaultConfig = (context: ComponentContext) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
-  const mongodbConfig = context.componentConfig.deploy.values?.mongodb;
+  const mongodbConfig = context.deploy?.config.values?.mongodb;
   const fullAppName = context.environment.envVars.KUBE_APP_NAME;
   const backupEnabled = ["prod", "stage"].includes(context.environment.envType);
 
@@ -84,10 +84,10 @@ const createMongoBackupDefaultConfig = (context: ComponentContext) => {
   };
 };
 export const createMongodbBaseConfig = (context: ComponentContext) => {
-  if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+  if (!isOfDeployType(context.deploy?.config, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
-  const mongodbConfig = context.componentConfig.deploy.values?.mongodb;
+  const mongodbConfig = context.deploy?.config.values?.mongodb;
 
   return {
     mongodb: {

package/src/deploy/sbom.ts

@@ -2,8 +2,7 @@ import type { ComponentContext } from "../types/context";
 import { SBOM_FILE } from "../build/sbom";
 
 export const sbomDeactivated = (context: ComponentContext) =>
-  context.componentConfig.build.type === "custom" &&
-  context.componentConfig.build.sbom === false;
+  context.build.config.type === "custom" && context.build.config.sbom === false;
 
 export const getDependencyTrackUploadScript = (
   context: ComponentContext,

package/src/deploy/types/index.ts

@@ -21,8 +21,8 @@ export type DeployConfigGeneric<T extends DeployConfigType> = Extract<
 >;
 
 export const isOfDeployType = <T extends Array<DeployConfigType>>(
-  t: DeployConfig | false,
+  t: DeployConfig | false | null | undefined,
   ...types: T
 ): t is Extract<DeployConfig, { type: T[number] }> => {
-  return t && types.includes(t.type);
+  return t && types.includes(t.type) ? true : false;
 };

package/src/deploy/utils.ts

@@ -18,7 +18,7 @@ export const getKubernetesNamespace = (
 };
 
 export const contextIsStoppable = (context: ComponentContext) => {
-  const deployConfig = context.componentConfig.deploy;
+  const deployConfig = context.deploy?.config;
   if (isOfDeployType(deployConfig, "kubernetes")) {
     return true;
   }

package/src/pipeline/createJobsForComponent.ts

@@ -23,21 +23,17 @@ const injectDefaultVarsInCustomJobs = (
     ...job,
   }));
 const getCustomJobs = (context: ComponentContext) => {
-  if (!context.componentConfig.customJobs) {
+  if (!context.customJobs) {
     return [];
   }
-  const rawJobs = isFunction(context.componentConfig.customJobs)
-    ? context.componentConfig.customJobs(context)
-    : context.componentConfig.customJobs;
+  const rawJobs = context.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 const createRawJobs = (context: Context): CatladderJob[] => {
-  const buildJobs =
-    BUILD_TYPES[context.componentConfig.build.type].jobs(context);
-  const deployJobs =
-    context.componentConfig.deploy !== false
-      ? DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context)
-      : [];
+  const buildJobs = BUILD_TYPES[context.build.config.type].jobs(context);
+  const deployJobs = context.deploy?.config
+    ? DEPLOY_TYPES[context.deploy?.config.type].jobs(context)
+    : [];
 
   const customJobs = getCustomJobs(context);
   return [...buildJobs, ...deployJobs, ...customJobs];