@catladder/pipeline 1.98.2 → 1.99.1

package/examples/kubernetes-with-mongodb.ts

@@ -0,0 +1,49 @@
+import type { Config } from "../src";
+import { createAllPipelines } from "./__utils__/helpers";
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    api: {
+      dir: "api",
+      build: {
+        type: "node",
+      },
+      deploy: {
+        type: "kubernetes",
+        cluster: {
+          name: "some-cluster-name",
+          region: "europe-west6",
+          projectId: "some-project-id",
+          type: "gcloud",
+          domainCanonical: "panter.cloud",
+        },
+
+        values: {
+          application: {
+            command: "node main.js",
+          },
+          mongodb: {
+            enabled: true,
+            architecture: "replicaset",
+            persistence: {
+              storageClass: "premium-rwo",
+            },
+            tolerations: [
+              {
+                key: "mongodb",
+                operator: "Equal",
+                value: "true",
+                effect: "NoSchedule",
+              },
+            ],
+          },
+        },
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

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

package/src/build/node/buildJob.ts

@@ -7,7 +7,7 @@ import { join } from "path";
 import { isOfBuildType } from "../types";
 import { getNextCache, getNodeCache, getYarnCache } from "./cache";
 import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
-import { getYarnInstall, getYarnInstallCommand } from "./yarn";
+import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
 import type { CatladderJob } from "../../types/jobs";
 
 export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
@@ -55,13 +55,8 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
             cache: [...getYarnCache(context, "pull")],
             variables: {
               // only required for non static
-              YARN_INSTALL: getYarnInstallCommand(context, {
-                prodOnly: true,
-              }),
-              YARN_INSTALL_WITHOUT_SCRIPTS: getYarnInstallCommand(context, {
-                prodOnly: true,
-                noScripts: true,
-              }),
+              DOCKER_COPY_AND_INSTALL_APP:
+                getDockerAppCopyAndBuildScript(context),
               DOCKER_COPY_WORKSPACE_FILES:
                 context.packageManagerInfo?.pathsToCopyInDocker
                   .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)

package/src/build/node/yarn.ts

@@ -1,33 +1,16 @@
 import type { Context } from "../../types";
 
-export const getYarnInstallCommand = (
-  context: Context,
-  options?: {
-    prodOnly?: boolean;
-    noScripts?: boolean;
-  }
-) => {
+const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
+
+// FIXME: check why and when rebuild is needed
+const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
+
+const getYarnInstallCommand = (context: Context) => {
   if (context.packageManagerInfo?.isClassic) {
-    return `yarn install --frozen-lockfile ${
-      options?.prodOnly ? "--production" : ""
-    } ${options?.noScripts ? "--ignore-scripts" : ""}`;
+    return YARN_INSTALL_CLASSIC;
   }
-  // is modern
 
-  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
-  // trying to import those fail on this version
-  const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) =>
-    context.packageManagerInfo?.version.startsWith(v)
-  );
-  return options?.prodOnly
-    ? `${options?.noScripts ? "YARN_ENABLE_SCRIPTS=false " : ""}${
-        doesNotShipWithBuiltInPlugins
-          ? "yarn plugin import workspace-tools && "
-          : " "
-      }yarn workspaces focus --production && yarn rebuild` // needs yarn plugin import workspace-tools
-    : `${
-        options?.noScripts ? "YARN_ENABLE_SCRIPTS=false " : ""
-      }yarn install --immutable`;
+  return `yarn install --immutable`;
 };
 
 export const ensureNodeVersion = (context: Context) => [
@@ -38,3 +21,33 @@ export const getYarnInstall = (context: Context) => [
   ...ensureNodeVersion(context),
   getYarnInstallCommand(context),
 ];
+
+const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
+
+export const getDockerAppCopyAndBuildScript = (context: Context) => {
+  if (context.packageManagerInfo?.isClassic) {
+    return `
+RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
+${DOCKER_COPY_FILES}
+RUN ${YARN_INSTALL_CLASSIC} --production 
+    `.trim();
+  }
+
+  // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
+  // trying to import those fail on this version
+  const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) =>
+    context.packageManagerInfo?.version.startsWith(v)
+  );
+  const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
+    ? "RUN yarn plugin import workspace-tools"
+    : "";
+
+  // copy first everything and then install
+  // rebuild first does not work as it will run postinstall and that might require files in the app
+  return `
+${DOCKER_COPY_FILES}
+${maybeAddWorkspaceToolsCommand}
+RUN ${YARN_BERRY_PROD_REBUILD}
+
+    `.trim();
+};

package/src/deploy/types/kubernetes.ts

@@ -98,6 +98,19 @@ export type KubernetesWorkerDef = {
   };
 };
 
+type KubernetesTolerationExists = {
+  operator: "Exists";
+};
+
+type KubernetesTolerationEqual = {
+  operator: "Equal";
+  value: string;
+};
+
+export type KubernetesToleration = {
+  key: string;
+  effect: "NoSchedule" | "PreferNoSchedule" | "NoExecute";
+} & (KubernetesTolerationEqual | KubernetesTolerationExists);
 export type DeployConfigMongodbBase = {
   enabled?: boolean;
   dbName?: string;
@@ -113,6 +126,7 @@ export type DeployConfigMongodbBase = {
     size?: string;
   };
   resources?: KubernetesResourcesDef;
+  tolerations?: KubernetesToleration[];
 };
 
 export type DeployConfigMongodbStandalone = {

package/src/pipeline/packageManager.ts

@@ -29,11 +29,12 @@ export const getPackageManagerInfo = async (
     ? join(workspaceRoot, "yarn.lock")
     : join(component.dir, "yarn.lock");
   const configFiles = [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"]; // ".yarn" is yarn 2 folder
-  const rcFiles = (
-    componentIsInWorkspace
-      ? configFiles
-      : configFiles.map((f) => join(component.dir, f))
-  ).filter((f) => existsSync(f));
+  // copy all those configFiles from workspace root and/or component folder
+
+  const configFilePaths = [
+    ...configFiles,
+    ...configFiles.map((f) => join(component.dir, f)),
+  ].filter((f) => existsSync(f));
 
   // get all folders that this workspace depend on
   // we will later copy them into the docker build
@@ -50,7 +51,7 @@ export const getPackageManagerInfo = async (
     packageJson,
     ...(workspacePackageJson ? [workspacePackageJson] : []),
     lockFile,
-    ...rcFiles,
+    ...configFilePaths,
     ...workspaceDependencies,
   ];
   return {