@catladder/pipeline 1.111.3 → 1.111.5

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

@@ -8,9 +8,6 @@ exports[`matches snapshot 1`] = `
       "api ↩️ Rollback ⚠️ | dev ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/api",
           "url": "https://api.dev.test-app.pan.panter.cloud",
         },
@@ -315,9 +312,6 @@ COPY --chown=node:node .yarn /app/.yarn",
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "4 weeks",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/api",
           "on_stop": "api 🛑 Stop ⚠️ | dev ",
           "url": "https://api.dev.test-app.pan.panter.cloud",
@@ -466,9 +460,6 @@ mongodb:
       "api 🛑 Stop ⚠️ | dev ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/api",
           "url": "https://api.dev.test-app.pan.panter.cloud",
         },
@@ -753,9 +744,6 @@ mongodb:
       "api ↩️ Rollback ⚠️ | review ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/api",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -1060,9 +1048,6 @@ COPY --chown=node:node .yarn /app/.yarn",
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "2 week",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",
@@ -1211,9 +1196,6 @@ mongodb:
       "api 🛑 Stop ⚠️ | review ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/api",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -1498,9 +1480,6 @@ mongodb:
       "api ↩️ Rollback ⚠️ | prod ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/api",
           "url": "https://api.prod.test-app.pan.panter.cloud",
         },
@@ -1615,9 +1594,6 @@ mongodb:
       "api ↩️ Rollback ⚠️ | stage ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/api",
           "url": "https://api.stage.test-app.pan.panter.cloud",
         },
@@ -2025,9 +2001,6 @@ COPY --chown=node:node .yarn /app/.yarn",
         "allow_failure": true,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/api",
           "on_stop": "api 🛑 Stop ⚠️ | prod ",
           "url": "https://api.prod.test-app.pan.panter.cloud",
@@ -2165,9 +2138,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/api",
           "on_stop": "api 🛑 Stop ⚠️ | stage ",
           "url": "https://api.stage.test-app.pan.panter.cloud",
@@ -2304,9 +2274,6 @@ mongodb:
       "api 🛑 Stop ⚠️ | prod ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/api",
           "url": "https://api.prod.test-app.pan.panter.cloud",
         },
@@ -2428,9 +2395,6 @@ mongodb:
       "api 🛑 Stop ⚠️ | stage ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/api",
           "url": "https://api.stage.test-app.pan.panter.cloud",
         },

package/examples/__snapshots__/meteor-kubernetes.ts.snap

@@ -8,9 +8,6 @@ exports[`matches snapshot 1`] = `
       "web ↩️ Rollback ⚠️ | dev ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "url": "https://web.dev.my-app.pan.panter.cloud",
         },
@@ -299,9 +296,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "4 weeks",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "on_stop": "web 🛑 Stop ⚠️ | dev ",
           "url": "https://web.dev.my-app.pan.panter.cloud",
@@ -444,9 +438,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | dev ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-dev",
-          },
           "name": "dev/web",
           "url": "https://web.dev.my-app.pan.panter.cloud",
         },
@@ -725,9 +716,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | review ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
         },
@@ -1016,9 +1004,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "2 week",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "on_stop": "web 🛑 Stop ⚠️ | review ",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
@@ -1161,9 +1146,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | review ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-review",
-          },
           "name": "review/some-commit/web",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",
         },
@@ -1442,9 +1424,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | prod ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "url": "https://www.example.com",
         },
@@ -1565,9 +1544,6 @@ mongodb:
       "web ↩️ Rollback ⚠️ | stage ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "url": "https://web.stage.my-app.pan.panter.cloud",
         },
@@ -1950,9 +1926,6 @@ mongodb:
         "allow_failure": true,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "on_stop": "web 🛑 Stop ⚠️ | prod ",
           "url": "https://www.example.com",
@@ -2096,9 +2069,6 @@ mongodb:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "on_stop": "web 🛑 Stop ⚠️ | stage ",
           "url": "https://web.stage.my-app.pan.panter.cloud",
@@ -2229,9 +2199,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | prod ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-prod",
-          },
           "name": "prod/web",
           "url": "https://www.example.com",
         },
@@ -2359,9 +2326,6 @@ mongodb:
       "web 🛑 Stop ⚠️ | stage ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-my-app-stage",
-          },
           "name": "stage/web",
           "url": "https://web.stage.my-app.pan.panter.cloud",
         },

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

@@ -8,9 +8,6 @@ exports[`matches snapshot 1`] = `
       "app ↩️ Rollback ⚠️ | dev ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "url": "https://app.dev.test-app.pan.panter.cloud",
         },
@@ -199,9 +196,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "4 weeks",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "on_stop": "app 🛑 Stop ⚠️ | dev ",
           "url": "https://app.dev.test-app.pan.panter.cloud",
@@ -339,9 +333,6 @@ jobs:
       "app 🛑 Stop ⚠️ | dev ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-dev",
-          },
           "name": "dev/app",
           "url": "https://app.dev.test-app.pan.panter.cloud",
         },
@@ -602,9 +593,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | review ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -796,9 +784,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": "2 week",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
@@ -939,9 +924,6 @@ jobs:
       "app 🛑 Stop ⚠️ | review ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-review",
-          },
           "name": "review/some-commit/app",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
         },
@@ -1205,9 +1187,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | prod ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "url": "https://my-fancy-website.com",
         },
@@ -1315,9 +1294,6 @@ jobs:
       "app ↩️ Rollback ⚠️ | stage ": {
         "environment": {
           "action": "access",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "url": "https://app.stage.test-app.pan.panter.cloud",
         },
@@ -1524,9 +1500,6 @@ jobs:
         "allow_failure": true,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "on_stop": "app 🛑 Stop ⚠️ | prod ",
           "url": "https://my-fancy-website.com",
@@ -1653,9 +1626,6 @@ jobs:
         "allow_failure": false,
         "environment": {
           "auto_stop_in": undefined,
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "on_stop": "app 🛑 Stop ⚠️ | stage ",
           "url": "https://app.stage.test-app.pan.panter.cloud",
@@ -1781,9 +1751,6 @@ jobs:
       "app 🛑 Stop ⚠️ | prod ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-prod",
-          },
           "name": "prod/app",
           "url": "https://my-fancy-website.com",
         },
@@ -1898,9 +1865,6 @@ jobs:
       "app 🛑 Stop ⚠️ | stage ": {
         "environment": {
           "action": "stop",
-          "kubernetes": {
-            "namespace": "pan-test-app-stage",
-          },
           "name": "stage/app",
           "url": "https://app.stage.test-app.pan.panter.cloud",
         },

package/package.json

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

package/src/deploy/{base.ts → base/deploy.ts}

@@ -1,21 +1,17 @@
-import { getDockerImageVariables, requiresDockerBuild } from "../build/docker";
-import { SBOM_BUILD_JOB_NAME } from "../build/sbom";
-import type { Context } from "../types";
-import type { CatladderJob } from "../types/jobs";
-import { sbomDeactivated } from "./sbom";
-import { contextIsStoppable } from "./utils";
+import {
+  getDockerImageVariables,
+  requiresDockerBuild,
+} from "../../build/docker";
+import { SBOM_BUILD_JOB_NAME } from "../../build/sbom";
+import type { Context } from "../../types/context";
+import { sbomDeactivated } from "../sbom";
+import { contextIsStoppable } from "../utils";
+import { STOP_JOB_NAME } from "./stop";
+import type { JobWithoutScript } from "./types";
+import { DEPLOY_RUNNER_VARIABLES } from "./variables";
 
 export const DEPLOY_JOB_NAME = "🚀 Deploy";
-export const STOP_JOB_NAME = "🛑 Stop ⚠️";
-export const ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
 
-const DEPLOY_RUNNER_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
-  KUBERNETES_MEMORY_REQUEST: "200Mi",
-  KUBERNETES_MEMORY_LIMIT: "400Mi",
-};
-type JobWithoutScript = Omit<CatladderJob, "script">;
 export const getBaseDeploymentJob = (context: Context): JobWithoutScript => {
   const hasDocker = requiresDockerBuild(context);
   const isStoppable = contextIsStoppable(context);
@@ -102,58 +98,3 @@ export const getBaseDeploymentJob = (context: Context): JobWithoutScript => {
       : undefined,
   };
 };
-
-export const getBaseDeploymentStopJob = (
-  context: Context
-): JobWithoutScript => {
-  return {
-    name: STOP_JOB_NAME,
-    envMode: "stagePerEnv", // makes it easier to run manual tasks er env
-    needs: [], // can be executed even if the deploy job failed
-    rules: [
-      {
-        if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/", // automatic on hotfix branches
-        when: "on_success",
-        allow_failure: true,
-      },
-      {
-        when: "manual",
-        allow_failure: true,
-      },
-    ],
-    variables: {
-      ...DEPLOY_RUNNER_VARIABLES,
-      ...context.environment.jobOnlyVars.deploy.envVars,
-      GIT_STRATEGY: "none",
-    },
-    stage: "stop",
-    environment: {
-      ...context.environment.gitlabEnvironment,
-      action: "stop",
-    },
-  };
-};
-
-export const getBaseRollbackJob = (context: Context): JobWithoutScript => {
-  return {
-    name: ROLLBACK_JOB_NAME,
-    envMode: "stagePerEnv", // makes it easier to run manual tasks er env
-    needs: [], // can be executed even if the deploy job failed
-    rules: [
-      {
-        when: "manual",
-        allow_failure: true,
-      },
-    ],
-    variables: {
-      ...DEPLOY_RUNNER_VARIABLES,
-      ...context.environment.jobOnlyVars.deploy.envVars,
-      GIT_STRATEGY: "none",
-    },
-    stage: "rollback",
-    environment: {
-      ...context.environment.gitlabEnvironment,
-      action: "access",
-    },
-  };
-};

package/src/deploy/base/index.ts

@@ -0,0 +1,3 @@
+export * from "./deploy";
+export * from "./rollback";
+export * from "./stop";

package/src/deploy/base/rollback.ts

@@ -0,0 +1,29 @@
+import type { Context } from "../../types/context";
+import type { JobWithoutScript } from "./types";
+import { DEPLOY_RUNNER_VARIABLES } from "./variables";
+
+export const ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
+
+export const getBaseRollbackJob = (context: Context): JobWithoutScript => {
+  return {
+    name: ROLLBACK_JOB_NAME,
+    envMode: "stagePerEnv", // makes it easier to run manual tasks er env
+    needs: [], // can be executed even if the deploy job failed
+    rules: [
+      {
+        when: "manual",
+        allow_failure: true,
+      },
+    ],
+    variables: {
+      ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
+      GIT_STRATEGY: "none",
+    },
+    stage: "rollback",
+    environment: {
+      ...context.environment.gitlabEnvironment,
+      action: "access",
+    },
+  };
+};

package/src/deploy/base/stop.ts

@@ -0,0 +1,35 @@
+import type { Context } from "../../types/context";
+import type { JobWithoutScript } from "./types";
+import { DEPLOY_RUNNER_VARIABLES } from "./variables";
+export const STOP_JOB_NAME = "🛑 Stop ⚠️";
+
+export const getBaseDeploymentStopJob = (
+  context: Context
+): JobWithoutScript => {
+  return {
+    name: STOP_JOB_NAME,
+    envMode: "stagePerEnv", // makes it easier to run manual tasks er env
+    needs: [], // can be executed even if the deploy job failed
+    rules: [
+      {
+        if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/", // automatic on hotfix branches
+        when: "on_success",
+        allow_failure: true,
+      },
+      {
+        when: "manual",
+        allow_failure: true,
+      },
+    ],
+    variables: {
+      ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
+      GIT_STRATEGY: "none",
+    },
+    stage: "stop",
+    environment: {
+      ...context.environment.gitlabEnvironment,
+      action: "stop",
+    },
+  };
+};

package/src/deploy/base/types.ts

@@ -0,0 +1,3 @@
+import type { CatladderJob } from "../../types/jobs";
+
+export type JobWithoutScript = Omit<CatladderJob, "script">;

package/src/deploy/base/variables.ts

@@ -0,0 +1,6 @@
+export const DEPLOY_RUNNER_VARIABLES = {
+  KUBERNETES_CPU_REQUEST: "0.5",
+  KUBERNETES_CPU_LIMIT: "1",
+  KUBERNETES_MEMORY_REQUEST: "200Mi",
+  KUBERNETES_MEMORY_LIMIT: "400Mi",
+};

package/src/deploy/kubernetes/deployJob.ts

@@ -29,9 +29,7 @@ export const createKubernetesDeployJobs = (
   }
 
   const kubeValues = createKubeValues(context);
-  const kubernetesEnvironment = {
-    namespace: context.environment.envVars.KUBE_NAMESPACE,
-  };
+
   const shared = {
     image: getRunnerImage("kubernetes"),
     variables: {
@@ -83,9 +81,6 @@ export const createKubernetesDeployJobs = (
         ...getDependencyTrackUploadScript(context),
         "echo deployment successful 😻",
       ],
-      environment: {
-        kubernetes: kubernetesEnvironment,
-      },
     }),
     merge({}, baseStopJob, shared, {
       script: [
@@ -93,16 +88,10 @@ export const createKubernetesDeployJobs = (
         "kubernetesDelete",
         ...getDependencyTrackDeleteScript(context),
       ],
-      environment: {
-        kubernetes: kubernetesEnvironment,
-      },
     }),
 
     merge({}, baseRollbackJob, shared, {
       script: [...connectContext, "kubernetesRollback"],
-      environment: {
-        kubernetes: kubernetesEnvironment,
-      },
     }),
   ];
 };

package/src/types/gitlab-types.ts

@@ -53,9 +53,6 @@ export type GitlabJobImage =
 export type GitlabEnvironment = {
   url: string;
   name: string;
-  kubernetes?: {
-    namespace?: string;
-  };
   action?: "stop" | "start" | "prepare" | "access"; // defaults to start
   on_stop?: string; // other job to run on stop
   auto_stop_in?: string;

package/dist/deploy/base.d.ts

@@ -1,10 +0,0 @@
-import type { Context } from "../types";
-import type { CatladderJob } from "../types/jobs";
-export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-declare type JobWithoutScript = Omit<CatladderJob, "script">;
-export declare const getBaseDeploymentJob: (context: Context) => JobWithoutScript;
-export declare const getBaseDeploymentStopJob: (context: Context) => JobWithoutScript;
-export declare const getBaseRollbackJob: (context: Context) => JobWithoutScript;
-export {};