@vaharoni/devops 1.1.7 → 1.1.9

package/src/libs/k8s-generate.ts

@@ -6,7 +6,7 @@ import path from "path";
 import yaml from "yaml";
 import fs from 'fs';
 import { globSync } from "glob";
-import _, { template } from 'lodash';
+import _ from 'lodash';
 import Handlebars from "handlebars";
 import { getImageData } from "./config";
 import { getImageDescendentData } from "./discovery/images";
@@ -17,6 +17,14 @@ const DB_MIGRATE_TEMPLATE_NAME = 'db-migrate';
 
 type RenderFn = (template: string) => string;
 
+function verifyNotCloudrunImage(image: string) {
+  const imageData = getImageData(image);
+  if (imageData["cloudrun"]) {
+    console.error(`Image ${image} is a cloudrun image. Cloudrun images are not supported for k8s generation`);
+    process.exit(1);
+  }
+}
+
 // = Interface
 
 export function generateImageDeployments(
@@ -24,6 +32,7 @@ export function generateImageDeployments(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const apps = getImageDescendentData(image)
     .filter((packageData) => packageData.deployment)
@@ -33,11 +42,12 @@ export function generateImageDeployments(
       return generateManifestForDeployment(projectData.rootPath, projectData.deployment!.template, renderFn);
     });
   const debug = generateDebugDeployment(monorepoEnv, image, gitSha);
-  const manifest = [debug, ...apps].join("\n---\n");
+  const manifest = [debug, ...apps].filter(Boolean).join("\n---\n");
   return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 
 export function generateWorkspaceDeployment(packageData: PackageData, monorepoEnv: string, image: string, gitSha: string) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDeployment(packageData);
   const renderFn = (template: string) => Handlebars.compile(template)(context);
@@ -50,10 +60,12 @@ export function generateDebugDeployment(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDebug();
   const renderFn = (template: string) => Handlebars.compile(template)(context);
   const debugTemplate = getImageData(image)["debug-template"];
+  if (!debugTemplate) return;
   return generateManifestsFromTemplateName(debugTemplate, renderFn).map(x => yaml.stringify(x)).join("\n---\n");
 }
 
@@ -62,6 +74,7 @@ export function generateDbMigrateJob(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDbMigrate();
   const renderFn = (template: string) => Handlebars.compile(template)(context);

package/src/libs/k8s-secrets-manager.ts

@@ -16,7 +16,7 @@ function execUpdateSecret(
   new CommandExecutor(fullCommand, { quiet: true, redactedCommand }).exec();
 }
 
-function getSecret(monorepoEnv: string, keys: string[] = []) {
+export function getMonorepoSecretObject(monorepoEnv: string, keys: string[] = []) {
   // Dots in jsonpath can only be accessed with a \ prefix
   const escapedSecretFileName = SECRET_FILE_NAME.replaceAll(".", "\\.");
   // prettier-ignore
@@ -39,7 +39,7 @@ function updateSecret(monorepoEnv: string, vars: Record<string, string>) {
     );
     process.exit(1);
   }
-  const current = getSecret(monorepoEnv);
+  const current = getMonorepoSecretObject(monorepoEnv);
   const newVars = { ...current, ...vars };
   execUpdateSecret(monorepoEnv, newVars);
 }
@@ -49,15 +49,19 @@ function deleteSecretKeys(monorepoEnv: string, keys: string[] = []) {
     console.error("Keys to delete must be provided");
     process.exit(1);
   }
-  const secretValue = getSecret(monorepoEnv);
+  const secretValue = getMonorepoSecretObject(monorepoEnv);
   keys.forEach((key) => delete secretValue[key]);
   execUpdateSecret(monorepoEnv, secretValue);
 }
 
 //= Interface (L3)
 
-export function getMonorepoSecret(monorepoEnv: string, keys: string[] = []) {
-  const value = getSecret(monorepoEnv, keys);
+export function getMonorepoSecretStr(monorepoEnv: string, keys: string[] = []) {
+  const value = getMonorepoSecretObject(monorepoEnv, keys);
+  if (Object.keys(value).length === 1) {
+    return Object.values(value)[0];
+  }
+  
   return Object.entries(value)
     .map((pair) => pair.join("="))
     .join("\n");

package/src/target-templates/lang-variants-common/python/.devops/config/images.yaml

@@ -37,11 +37,13 @@
 #                       This is also the basis for the name of the image in the registry.
 # image-template        The build process copies .devops/docker-images/<image-template>.Dockerfile and .devops/docker-images/<image-template>/ to the image. 
 # language              The language of the image. Currently only "node" and "python" are supported.
-# debug-template        Each image comes with a debug pod that can be acccessed as a console. This is the name of the template to use. Only "debug-console" is currently supported.
+# debug-template        Each image comes with a debug pod that can be acccessed as a console. This is the name of the template to use. 
+#                       Only "debug-console" is currently supported. Can be left out if the image should not have a debug pod.
 # can-db-migrate        Whether this image can be used to run DB migrations. If set to true, the image could be used to run DB migrations if any project that uses this image depends 
 #                       on the db project and if the db project changed.
 # domains               The domains for the image. This is used to generate the ingress rules. 
 #                       This can be left out if the image does not have ingress rules, such as a worker image.
+# cloudrun              If this image should be pushed to cloudrun instead of the cluster registry, set to "true".
 # applications          List of applications that use this image. There is no need to specify dependencies - they will be derived as long as they are declared in package.json.
 #
 

package/src/target-templates/lang-variants-common/typescript/.devops/docker-images/cloudrun.Dockerfile

@@ -0,0 +1,31 @@
+FROM node:24-bookworm-slim AS builder
+
+RUN apt-get update && apt-get install -y jq curl
+
+WORKDIR /app
+
+ENV NODE_ENV=production
+
+ARG MONOREPO_ENV
+ENV MONOREPO_ENV=${MONOREPO_ENV}
+RUN echo "Building for environment: $MONOREPO_ENV"
+
+RUN npm install -g bun
+
+# This assumes devops prep-build was called by the host, which creates the config/ folder with necessary env variables
+# that are needed to be statitcally resolved by devops run-many build (e.g. NEXT_PUBLIC_*)
+COPY . .
+
+# Install dependencies using bun
+RUN --mount=type=cache,target=/root/.bun/install/cache bun install
+
+# This assumes the image has only one application that has a build script which outputs to dist/
+RUN ./devops run-many build
+
+
+FROM gcr.io/distroless/nodejs24-debian12 AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+COPY --from=builder /app/dist ./dist
+EXPOSE 8080
+CMD ["dist/index.js"]

package/src/target-templates/lang-variants-common/typescript/.github/actions/deploy-image@v1/action.yaml

@@ -4,6 +4,10 @@ inputs:
   image_name:
     description: 'The image key in images.yaml'
     required: true
+outputs:
+  affected:
+    description: 'Whether the specified image is affected (computed before deploy)'
+    value: ${{ steps.check_affected.outputs.affected }}    
 runs:
   using: "composite"
   steps:

package/src/types/index.ts

@@ -11,6 +11,7 @@ export const constFileSchema = z.object({
   "image-versions-to-keep": z.number().optional(),
   "registry-base-url": z.string(),
   "registry-image-path-prefix": z.string().optional(),
+  "cloudrun-artifact-registry-repo-path": z.string().optional(),
   "extra-remote-environments": z.array(z.string()),
   "extra-local-environments": z.array(z.string()),
 })
@@ -26,7 +27,8 @@ const singleImageSchema = z.object({
   "image-template": z.string(),
   "language": z.enum(SUPPORTED_LANGUAGES),
   "domains": z.record(z.string()).optional(),
-  "debug-template": z.string(),
+  "debug-template": z.string().optional(),
+  "cloudrun": z.boolean().optional(),
   "can-db-migrate": z.boolean().optional(),
   applications: z.array(z.string()),
 });